X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Ficmpv6_echo.py;fp=resources%2Ftraffic_scripts%2Ficmpv6_echo.py;h=9e9a952d583c614f750a242bb64492b43a5d0752;hp=c3c8d5a381406efbbd698c043113366be217686f;hb=84c45de446b69f83df919a91bc684da910824d6f;hpb=c662f5045a4812540fcc11006ae865351090035b diff --git a/resources/traffic_scripts/icmpv6_echo.py b/resources/traffic_scripts/icmpv6_echo.py index c3c8d5a381..9e9a952d58 100755 --- a/resources/traffic_scripts/icmpv6_echo.py +++ b/resources/traffic_scripts/icmpv6_echo.py @@ -58,18 +58,15 @@ def main(): # receive ICMPv6 echo reply ether = rxq.recv(2, sent_packets) if ether is None: - rxq._proc.terminate() raise RuntimeError('ICMPv6 echo reply Rx timeout') if not ether.haslayer(IPv6): - rxq._proc.terminate() raise RuntimeError('Unexpected packet with no IPv6 received {0}'.format( ether.__repr__())) ipv6 = ether['IPv6'] if not ipv6.haslayer(ICMPv6EchoReply): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no IPv6 ICMP received {0}'.format( ipv6.__repr__())) @@ -78,7 +75,6 @@ def main(): # check identifier and sequence number 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 ' + 'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq)) @@ -88,11 +84,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__":