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=cd332d0391d44671550382b5b40740796ee0ff74;hb=da8aebf2e722f2c441a03b300de71f9143d010a3;hpb=8120dcdc84da7ff1dee097240bc1ecf18914397c diff --git a/resources/traffic_scripts/ipv4_sweep_ping.py b/resources/traffic_scripts/ipv4_sweep_ping.py index cd332d0391..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, checksum_equal + 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) @@ -97,7 +97,7 @@ def main(): 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')