X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv6_sweep_ping.py;h=80fdda532abe83338ea615423438eb514a3bf14f;hp=c1fe7d3f703f20e932766313ff5d23fdca968ac2;hb=86f35c2c60a680b58fca27d9298dd53d02e0138f;hpb=84c45de446b69f83df919a91bc684da910824d6f

diff --git a/resources/traffic_scripts/ipv6_sweep_ping.py b/resources/traffic_scripts/ipv6_sweep_ping.py
index c1fe7d3f70..80fdda532a 100755
--- a/resources/traffic_scripts/ipv6_sweep_ping.py
+++ b/resources/traffic_scripts/ipv6_sweep_ping.py
@@ -15,11 +15,13 @@
 
 """Traffic script for IPv6 sweep ping."""
 
-import sys
 import logging
 import os
+import sys
+
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from resources.libraries.python.PacketVerifier import RxQueue, TxQueue
+from resources.libraries.python.PacketVerifier import RxQueue, TxQueue, \
+    checksum_equal
 from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
 from scapy.layers.inet6 import IPv6, ICMPv6ND_NA, ICMPv6NDOptDstLLAddr
 from scapy.layers.inet6 import ICMPv6EchoRequest, ICMPv6EchoReply
@@ -50,19 +52,19 @@ def main():
     # send ICMPv6 neighbor advertisement message
     sent_packets = []
     pkt_send = (Ether(src=src_mac, dst=dst_mac) /
-                      IPv6(src=src_ip, dst=dst_ip) /
-                      ICMPv6ND_NA(tgt=src_ip, R=0) /
-                      ICMPv6NDOptDstLLAddr(lladdr=src_mac))
+                IPv6(src=src_ip, dst=dst_ip) /
+                ICMPv6ND_NA(tgt=src_ip, R=0) /
+                ICMPv6NDOptDstLLAddr(lladdr=src_mac))
     sent_packets.append(pkt_send)
     txq.send(pkt_send)
 
     # send ICMPv6 echo request with incremented data length and receive ICMPv6
     # echo reply
-    for echo_seq in range(start_size, end_size+1, step):
+    for echo_seq in range(start_size, end_size + 1, step):
         pkt_send = (Ether(src=src_mac, dst=dst_mac) /
-                          IPv6(src=src_ip, dst=dst_ip) /
-                          ICMPv6EchoRequest(id=echo_id, seq=echo_seq,
-                                            data=data[0:echo_seq]))
+                    IPv6(src=src_ip, dst=dst_ip) /
+                    ICMPv6EchoRequest(id=echo_id, seq=echo_seq,
+                                      data=data[0:echo_seq]))
         sent_packets.append(pkt_send)
         txq.send(pkt_send)
 
@@ -87,18 +89,21 @@ def main():
 
         if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
             raise RuntimeError(
-                'Invalid ICMPv6 echo reply received ID {0} seq {1} should be ' +
+                'Invalid ICMPv6 echo reply received ID {0} seq {1} should be '
                 'ID {2} seq {3}, {0}'.format(icmpv6.id, icmpv6.seq, echo_id,
                                              echo_seq))
 
         cksum = icmpv6.cksum
         del icmpv6.cksum
         tmp = ICMPv6EchoReply(str(icmpv6))
-        if tmp.cksum != cksum:
+        if not checksum_equal(tmp.cksum, cksum):
             raise RuntimeError(
                 'Invalid checksum {0} should be {1}'.format(cksum, tmp.cksum))
 
+        sent_packets.remove(pkt_send)
+
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()