From 7b0389d8a3a44a8351cb8195d1f308e48a2b087b Mon Sep 17 00:00:00 2001
From: wangshengjun <wangshengjun@asterfusion.com>
Date: Sat, 10 Aug 2019 02:28:15 +0800
Subject: [PATCH] [dhcp_relay] Only call 'wait_until_iface_ready' once for each
 interface (#3317)

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
---
 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2 b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
index bf50abe4f053..fd7c3ff95bc0 100644
--- a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
+++ b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
@@ -29,12 +29,19 @@ function wait_until_iface_ready
 
 
 # Wait for all interfaces to be up and ready
-{% for (name, prefix) in INTERFACE|pfx_filter %}
+{% for name in PORT %}
+{% if name in INTERFACE %}
 wait_until_iface_ready ${PORT_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+{% for name in VLAN %}
+{% if name in VLAN_INTERFACE %}
 wait_until_iface_ready ${VLAN_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
-{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
+{% for name in PORTCHANNEL %}
+{% if name in PORTCHANNEL_INTERFACE %}
 wait_until_iface_ready ${LAG_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
+