diff options
author | Stefan Kobza <skobza@cisco.com> | 2016-02-13 00:25:23 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2016-02-15 12:43:25 +0000 |
commit | 84c45de446b69f83df919a91bc684da910824d6f (patch) | |
tree | 2f85c7f81bfed4e15938f00e059e54fcda4030f8 /resources/traffic_scripts/ipv6_ns.py | |
parent | c662f5045a4812540fcc11006ae865351090035b (diff) |
Remove multiprocessing from PacketVerifier, tune tests.
Change-Id: I37b171c50bad97255a42d6f9426f749055357380
Signed-off-by: Stefan Kobza <skobza@cisco.com>
Diffstat (limited to 'resources/traffic_scripts/ipv6_ns.py')
-rwxr-xr-x | resources/traffic_scripts/ipv6_ns.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/resources/traffic_scripts/ipv6_ns.py b/resources/traffic_scripts/ipv6_ns.py index dd1adad39e..cfdca41ec9 100755 --- a/resources/traffic_scripts/ipv6_ns.py +++ b/resources/traffic_scripts/ipv6_ns.py @@ -49,18 +49,15 @@ def main(): # receive ICMPv6 neighbor advertisement message 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(ICMPv6ND_NA): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no ICMPv6 ND-NA received {0}'.format( ipv6.__repr__())) @@ -69,12 +66,10 @@ def main(): # verify target address if icmpv6_na.tgt != dst_ip: - rxq._proc.terminate() raise RuntimeError('Invalid target address {0} should be {1}'.format( icmpv6_na.tgt, dst_ip)) if not icmpv6_na.haslayer(ICMPv6NDOptDstLLAddr): - rxq._proc.terminate() raise RuntimeError( 'Missing Destination Link-Layer Address option in ICMPv6 ' + 'Neighbor Advertisement {0}'.format(icmpv6_na.__repr__())) @@ -84,7 +79,6 @@ def main(): # verify destination link-layer address field if dst_ll_addr.lladdr != dst_mac: - rxq._proc.terminate() raise RuntimeError('Invalid lladdr {0} should be {1}'.format( dst_ll_addr.lladdr, dst_mac)) @@ -93,11 +87,9 @@ def main(): del icmpv6_na.cksum tmp = ICMPv6ND_NA(str(icmpv6_na)) 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__": |