X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv6_sweep_ping.py;h=cf7dc9e6bc51cdec3bb76e7ba5ced90e3820a88f;hp=c79b74d76067f6a9ba5de39852b459a5f2a06f9f;hb=ae7411c745d47a70bb36c3d5cb6b2907f5697e57;hpb=b92a827b1c7f48da4214e992e5503ebe1c182416 diff --git a/resources/traffic_scripts/ipv6_sweep_ping.py b/resources/traffic_scripts/ipv6_sweep_ping.py index c79b74d760..cf7dc9e6bc 100755 --- a/resources/traffic_scripts/ipv6_sweep_ping.py +++ b/resources/traffic_scripts/ipv6_sweep_ping.py @@ -68,12 +68,10 @@ def main(): ether = rxq.recv(ignore=sent_packets) if ether is None: - rxq._proc.terminate() raise RuntimeError( 'ICMPv6 echo reply seq {0} Rx timeout'.format(echo_seq)) if not ether.haslayer(IPv6): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no IPv6 received {0}'.format( ether.__repr__())) @@ -81,7 +79,6 @@ def main(): ipv6 = ether['IPv6'] if not ipv6.haslayer(ICMPv6EchoReply): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no IPv6 ICMP received {0}'.format( ipv6.__repr__())) @@ -89,9 +86,8 @@ def main(): icmpv6 = ipv6['ICMPv6 Echo Reply'] if icmpv6.id != echo_id or icmpv6.seq != echo_seq: - rxq._proc.terminate() 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)) @@ -99,11 +95,9 @@ def main(): del icmpv6.cksum tmp = ICMPv6EchoReply(str(icmpv6)) if tmp.cksum != cksum: - rxq._proc.terminate() raise RuntimeError( 'Invalid checksum {0} should be {1}'.format(cksum, tmp.cksum)) - rxq._proc.terminate() sys.exit(0) if __name__ == "__main__":