From 47d9b26063b43186614df5588c125363e4a01cf1 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lfqlee314@gmail.com>
Date: Mon, 28 Feb 2022 15:42:02 -0800
Subject: [PATCH] Revert "[swss]: Wait for vlan intf to start ndppd (#10036)"
 (#10085)

This reverts commit 91204879dfe8399e61ebff4c184b8df4c1da3109.

#10036 breaks ndppd functionality
---
 dockers/docker-orchagent/Dockerfile.j2       |  1 +
 dockers/docker-orchagent/docker-init.j2      |  1 -
 dockers/docker-orchagent/ndppd.conf          |  9 ++++++
 dockers/docker-orchagent/supervisord.conf.j2 | 25 ----------------
 dockers/docker-orchagent/wait_for_link.sh.j2 | 30 --------------------
 5 files changed, 10 insertions(+), 56 deletions(-)
 create mode 100644 dockers/docker-orchagent/ndppd.conf
 delete mode 100644 dockers/docker-orchagent/wait_for_link.sh.j2

diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 3c04ff7c13..5e403213c1 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -68,6 +68,7 @@ RUN apt-get purge -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", "tunnel_packet_handler.py", "/usr/bin/"]
 COPY ["orchagent.sh", "swssconfig.sh", "buffermgrd.sh", "/usr/bin/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
diff --git a/dockers/docker-orchagent/docker-init.j2 b/dockers/docker-orchagent/docker-init.j2
index 52a1c4717c..ff543c2349 100755
--- a/dockers/docker-orchagent/docker-init.j2
+++ b/dockers/docker-orchagent/docker-init.j2
@@ -18,7 +18,6 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/ndppd.conf.j2,/etc/ndppd.conf \
     -t /usr/share/sonic/templates/critical_processes.j2,/etc/supervisor/critical_processes \
     -t /usr/share/sonic/templates/supervisord.conf.j2,/etc/supervisor/conf.d/supervisord.conf
-    -t /usr/share/sonic/templates/wait_for_link.sh.j2,/usr/bin/wait_for_link.sh \
 "
 VLAN=$(sonic-cfggen $CFGGEN_PARAMS)
 
diff --git a/dockers/docker-orchagent/ndppd.conf b/dockers/docker-orchagent/ndppd.conf
new file mode 100644
index 0000000000..b9dbc293ed
--- /dev/null
+++ b/dockers/docker-orchagent/ndppd.conf
@@ -0,0 +1,9 @@
+[program:ndppd]
+command=/usr/sbin/ndppd
+priority=7
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=vlanmgrd:running
diff --git a/dockers/docker-orchagent/supervisord.conf.j2 b/dockers/docker-orchagent/supervisord.conf.j2
index 7954fa7fa6..7cd31a1132 100644
--- a/dockers/docker-orchagent/supervisord.conf.j2
+++ b/dockers/docker-orchagent/supervisord.conf.j2
@@ -299,28 +299,3 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=swssconfig:exited
 {%- endif %}
-
-{% if is_fabric_asic == 0 %}
-[program:ndppd]
-command=/usr/sbin/ndppd
-priority=7
-autostart=false
-autorestart=unexpected
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=wait_for_link:exited
-{%- endif %}
-
-{% if is_fabric_asic == 0 %}
-[program:wait_for_link]
-command=/usr/bin/wait_for_link.sh
-priority=7
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=swssconfig:exited
-{%- endif %}
diff --git a/dockers/docker-orchagent/wait_for_link.sh.j2 b/dockers/docker-orchagent/wait_for_link.sh.j2
deleted file mode 100644
index 980b472b3e..0000000000
--- a/dockers/docker-orchagent/wait_for_link.sh.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-VLAN_TABLE_PREFIX="VLAN_TABLE"
-
-function wait_until_iface_ready
-{
-    TABLE_PREFIX=$1
-    IFACE=$2
-
-    echo "Waiting until interface $IFACE is ready..."
-
-    # Wait for the interface to come up
-    # (i.e., interface is present in STATE_DB and state is "ok")
-    while true; do
-        RESULT=$(sonic-db-cli STATE_DB HGET "${TABLE_PREFIX}|${IFACE}" "state" 2> /dev/null)
-        if [ x"$RESULT" == x"ok" ]; then
-            break
-        fi
-
-        sleep 1
-    done
-
-    echo "Interface ${IFACE} is ready!"
-}
-
-
-# Wait for all interfaces to be up and ready
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-wait_until_iface_ready ${VLAN_TABLE_PREFIX} {{ name }}
-{% endfor %}