X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv6_nd_proxy_check.py;h=1d96050cf43a045e127166685d6a09665d9d4a09;hp=c9213999ec8cb831e1bf6534c394c730d2f713ca;hb=refs%2Fchanges%2F75%2F8475%2F11;hpb=9ca5e946c7ea4b5740c257c71fe6d76eaa4206b4

diff --git a/resources/traffic_scripts/ipv6_nd_proxy_check.py b/resources/traffic_scripts/ipv6_nd_proxy_check.py
index c9213999ec..1d96050cf4 100755
--- a/resources/traffic_scripts/ipv6_nd_proxy_check.py
+++ b/resources/traffic_scripts/ipv6_nd_proxy_check.py
@@ -54,16 +54,14 @@ def imcpv6nd_solicit(tx_if, src_mac, dst_mac, src_ip, dst_ip):
 
     ether = None
     for _ in range(5):
-        while True:
-            pkt = rxq.recv(3, ignore=sent_packets)
-            if ether.haslayer(ICMPv6ND_NS):
-                # read another packet in the queue in case of ICMPv6ND_NS packet
-                continue
-            else:
-                # otherwise process the current packet
-                break
-        if pkt is not None:
-            ether = pkt
+        ether = rxq.recv(3, ignore=sent_packets)
+        if not ether:
+            continue
+        if ether.haslayer(ICMPv6ND_NS):
+            # read another packet in the queue in case of ICMPv6ND_NS packet
+            continue
+        else:
+            # otherwise process the current packet
             break
 
     if ether is None:
@@ -132,17 +130,15 @@ def ipv6_ping(src_if, dst_if, src_mac, dst_mac,
     txq.send(icmpv6_ping_pkt)
 
     ether = None
-    for _ in range(5):
-        while True:
-            pkt = rxq.recv(3)
-            if ether.haslayer(ICMPv6ND_NS):
-                # read another packet in the queue in case of ICMPv6ND_NS packet
-                continue
-            else:
-                # otherwise process the current packet
-                break
-        if pkt is not None:
-            ether = pkt
+    while True:
+        ether = rxq.recv(3)
+        if not ether:
+            continue
+        if ether.haslayer(ICMPv6ND_NS):
+            # read another packet in the queue in case of ICMPv6ND_NS packet
+            continue
+        else:
+            # otherwise process the current packet
             break
 
     if ether is None:
@@ -163,17 +159,15 @@ def ipv6_ping(src_if, dst_if, src_mac, dst_mac,
     txq.send(icmpv6_ping_pkt)
 
     ether = None
-    for _ in range(5):
-        while True:
-            pkt = rxq.recv(3)
-            if ether.haslayer(ICMPv6ND_NS):
-                # read another packet in the queue in case of ICMPv6ND_NS packet
-                continue
-            else:
-                # otherwise process the current packet
-                break
-        if pkt is not None:
-            ether = pkt
+    while True:
+        ether = rxq.recv(3)
+        if not ether:
+            continue
+        if ether.haslayer(ICMPv6ND_NS):
+            # read another packet in the queue in case of ICMPv6ND_NS packet
+            continue
+        else:
+            # otherwise process the current packet
             break
 
     if ether is None: