Revert "[docker-orchagent]: Add NDP Proxy Daemon (#5517)"

This reverts commit 8c34409.

dockers/docker-orchagent/Dockerfile.j2

@@ -17,8 +17,7 @@ RUN apt-get update &&       \
         libelf1             \
         libmnl0             \
         bridge-utils        \
-        conntrack           \
-        ndppd
+        conntrack
 
 {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
 ## Fix for gcc/python not found in arm docker
@@ -61,7 +60,6 @@ RUN apt-get clean -y        && \
 
 COPY ["files/arp_update", "/usr/bin"]
 COPY ["arp_update.conf", "files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
-COPY ["ndppd.conf", "/usr/share/sonic/templates/"]
 COPY ["enable_counters.py", "/usr/bin"]
 COPY ["docker-init.sh", "orchagent.sh", "swssconfig.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

dockers/docker-orchagent/docker-init.sh

@@ -10,7 +10,6 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/ports.json.j2,/etc/swss/config.d/ports.json \
     -t /usr/share/sonic/templates/copp.json.j2,/etc/swss/config.d/00-copp.config.json \
     -t /usr/share/sonic/templates/vlan_vars.j2 \
-    -t /usr/share/sonic/templates/ndppd.conf.j2,/etc/ndppd.conf \
 "
 VLAN=$(sonic-cfggen $CFGGEN_PARAMS)
 
@@ -19,10 +18,9 @@ if [ -x /usr/share/sonic/hwsku/hwsku-init ]; then
     /usr/share/sonic/hwsku/hwsku-init
 fi
 
-# Start arp_update and NDP proxy daemon when VLAN exists
+# Start arp_update when VLAN exists
 if [ "$VLAN" != "" ]; then
     cp /usr/share/sonic/templates/arp_update.conf /etc/supervisor/conf.d/
-    cp /usr/share/sonic/templates/ndppd.conf /etc/supervisor/conf.d/
 fi
 
 exec /usr/bin/supervisord

src/sonic-config-engine/tests/test_j2files.py

@@ -171,16 +171,6 @@ def test_ipinip_multi_asic(self):
         sample_output_file = os.path.join(self.test_dir, 'multi_npu_data', utils.PYvX_DIR, 'ipinip.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
-    def test_ndppd_conf(self):
-        conf_template = os.path.join(self.test_dir, "ndppd.conf.j2")
-        vlan_interfaces_json = os.path.join(self.test_dir, "data", "ndppd", "vlan_interfaces.json")
-        expected = os.path.join(self.test_dir, "sample_output", utils.PYvX_DIR, "ndppd.conf")
-
-        argument = '-j {} -t {} > {}'.format(vlan_interfaces_json, conf_template, self.output_file)
-        self.run_script(argument)
-        assert filecmp.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
-
-
     def tearDown(self):
         try:
             os.remove(self.output_file)