X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv4_sweep_ping.py;h=7f6759724c2ea5d7c3bf017d459de2e3a19cc27f;hp=6c18f795c23b409aa5303e6873770a179f173a93;hb=a060d519d0a89574f5e75d4e8d4c142fa5687555;hpb=af2c77acfa337228ea3c4c5f2140f39124ec2ab9

diff --git a/resources/traffic_scripts/ipv4_sweep_ping.py b/resources/traffic_scripts/ipv4_sweep_ping.py
index 6c18f795c2..7f6759724c 100755
--- a/resources/traffic_scripts/ipv4_sweep_ping.py
+++ b/resources/traffic_scripts/ipv4_sweep_ping.py
@@ -20,7 +20,7 @@ import logging
 import os
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
 from resources.libraries.python.PacketVerifier import RxQueue, TxQueue,\
-    auto_pad, create_gratuitous_arp_request
+    create_gratuitous_arp_request, checksum_equal
 from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
 from scapy.layers.inet import IP, ICMP
 from scapy.all import Ether, Raw
@@ -55,10 +55,10 @@ def main():
     # send ICMP echo request with incremented data length and receive ICMP
     # echo reply
     for echo_seq in range(start_size, end_size+1, step):
-        pkt_send = auto_pad(Ether(src=src_mac, dst=dst_mac) /
-                            IP(src=src_ip, dst=dst_ip) /
-                            ICMP(id=echo_id, seq=echo_seq) /
-                            Raw(load=data[0:echo_seq]))
+        pkt_send = (Ether(src=src_mac, dst=dst_mac) /
+                    IP(src=src_ip, dst=dst_ip) /
+                    ICMP(id=echo_id, seq=echo_seq) /
+                    Raw(load=data[0:echo_seq]))
         sent_packets.append(pkt_send)
         txq.send(pkt_send)
 
@@ -83,21 +83,21 @@ def main():
 
         if icmpv4.id != echo_id or icmpv4.seq != echo_seq:
             raise RuntimeError(
-                'Invalid ICMP echo reply received ID {0} seq {1} should be ' +
+                'Invalid ICMP echo reply received ID {0} seq {1} should be ' \
                 'ID {2} seq {3}, {0}'.format(icmpv4.id, icmpv4.seq, echo_id,
                                              echo_seq))
 
         chksum = icmpv4.chksum
         del icmpv4.chksum
         tmp = ICMP(str(icmpv4))
-        if tmp.chksum != chksum:
+        if not checksum_equal(tmp.chksum, chksum):
             raise RuntimeError(
                 'Invalid checksum {0} should be {1}'.format(chksum, tmp.chksum))
 
         if 'Raw' in icmpv4:
             load = icmpv4['Raw'].load
         else:
-            load = []
+            load = ""
         if load != data[0:echo_seq]:
             raise RuntimeError(
                 'Received ICMP payload does not match sent payload')