X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv4_sweep_ping.py;h=f7ce5cd943f5c78b52a534b478095f540043e4da;hb=705d285dff5ef8f678a0f89f2afed91eec7e6966;hp=5005345250317221d3dfaf2e87c0367bb5da2bbf;hpb=84c45de446b69f83df919a91bc684da910824d6f;p=csit.git diff --git a/resources/traffic_scripts/ipv4_sweep_ping.py b/resources/traffic_scripts/ipv4_sweep_ping.py index 5005345250..f7ce5cd943 100755 --- a/resources/traffic_scripts/ipv4_sweep_ping.py +++ b/resources/traffic_scripts/ipv4_sweep_ping.py @@ -83,7 +83,7 @@ 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)) @@ -93,8 +93,11 @@ def main(): if tmp.chksum != chksum: raise RuntimeError( 'Invalid checksum {0} should be {1}'.format(chksum, tmp.chksum)) - recv_payload_len = ipv4.len - 20 - 8 - load = tmp['Raw'].load[0:recv_payload_len] + + if 'Raw' in icmpv4: + load = icmpv4['Raw'].load + else: + load = [] if load != data[0:echo_seq]: raise RuntimeError( 'Received ICMP payload does not match sent payload')