aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuraj Sloboda <jsloboda@cisco.com>2016-02-22 13:22:23 +0100
committerGerrit Code Review <gerrit@fd.io>2016-02-23 14:12:38 +0000
commitc8d76a16533edac586a98d2842932804709fea30 (patch)
tree99f2f702bc74f0b7b4e6453580f1c7cc5c507c09
parentae7411c745d47a70bb36c3d5cb6b2907f5697e57 (diff)
Remove Interface.close, rename script argument
Change-Id: I5da20a12f801264821890e6516899344456576a8 Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
-rw-r--r--resources/libraries/python/PacketVerifier.py4
-rw-r--r--resources/libraries/robot/ipv4.robot2
-rwxr-xr-xresources/traffic_scripts/arp_request.py2
-rwxr-xr-xresources/traffic_scripts/ipv4_ping_ttl_check.py46
4 files changed, 13 insertions, 41 deletions
diff --git a/resources/libraries/python/PacketVerifier.py b/resources/libraries/python/PacketVerifier.py
index 19d6aaf53f..9af14e3dce 100644
--- a/resources/libraries/python/PacketVerifier.py
+++ b/resources/libraries/python/PacketVerifier.py
@@ -291,10 +291,6 @@ class Interface(object):
def recv_pkt(self, timeout=3):
return self.rxq.recv(timeout, self.sent_packets)
- def close(self):
- #self.rxq._proc.terminate()
- pass
-
def create_gratuitous_arp_request(src_mac, src_ip):
"""Creates scapy representation of gratuitous ARP request"""
diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot
index 4ed0181d52..d122932c89 100644
--- a/resources/libraries/robot/ipv4.robot
+++ b/resources/libraries/robot/ipv4.robot
@@ -68,7 +68,7 @@
| | ${args}= | Traffic Script Gen Arg | ${to_port} | ${from_port} | ${src_mac}
| | | ... | ${dst_mac} | ${src_ip} | ${dst_ip}
| | ${args}= | Catenate | ${args} | --hops ${hops} | --first_hop_mac ${adj_int['mac_address']}
-| | | ... | --is_dst_defined ${is_dst_tg}
+| | | ... | --is_dst_tg ${is_dst_tg}
| | Run Traffic Script On Node | ipv4_ping_ttl_check.py | ${from_node} | ${args}
| Ipv4 icmp echo sweep
diff --git a/resources/traffic_scripts/arp_request.py b/resources/traffic_scripts/arp_request.py
index 86a4c015cd..94d5deabe7 100755
--- a/resources/traffic_scripts/arp_request.py
+++ b/resources/traffic_scripts/arp_request.py
@@ -101,8 +101,6 @@ def arp_request_test():
except RuntimeError as ex:
print 'Error occurred: {}'.format(ex)
- finally:
- interface.close()
return test_passed
diff --git a/resources/traffic_scripts/ipv4_ping_ttl_check.py b/resources/traffic_scripts/ipv4_ping_ttl_check.py
index 54b6aa1ef5..2f1ea258ea 100755
--- a/resources/traffic_scripts/ipv4_ping_ttl_check.py
+++ b/resources/traffic_scripts/ipv4_ping_ttl_check.py
@@ -21,9 +21,6 @@ from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
def check_ttl(ttl_begin, ttl_end, ttl_diff):
if ttl_begin != ttl_end + ttl_diff:
- src_if.close()
- if dst_if_defined:
- dst_if.close()
raise Exception(
"TTL changed from {} to {} but decrease by {} expected"
.format(ttl_begin, ttl_end, hops))
@@ -39,18 +36,15 @@ def ckeck_packets_equal(pkt_send, pkt_recv):
Ether(pkt_send_raw).show2()
print "Received:"
Ether(pkt_recv_raw).show2()
- src_if.close()
- if dst_if_defined:
- dst_if.close()
raise Exception("Sent packet doesn't match received packet")
args = TrafficScriptArg(['src_mac', 'dst_mac', 'src_ip', 'dst_ip',
- 'hops', 'first_hop_mac', 'is_dst_defined'])
+ 'hops', 'first_hop_mac', 'is_dst_tg'])
src_if_name = args.get_arg('tx_if')
dst_if_name = args.get_arg('rx_if')
-dst_if_defined = True if args.get_arg('is_dst_defined') == 'True' else False
+is_dst_tg = True if args.get_arg('is_dst_tg') == 'True' else False
src_mac = args.get_arg('src_mac')
first_hop_mac = args.get_arg('first_hop_mac')
@@ -59,12 +53,12 @@ src_ip = args.get_arg('src_ip')
dst_ip = args.get_arg('dst_ip')
hops = int(args.get_arg('hops'))
-if dst_if_defined and (src_if_name == dst_if_name):
+if is_dst_tg and (src_if_name == dst_if_name):
raise Exception("Source interface name equals destination interface name")
src_if = Interface(src_if_name)
src_if.send_pkt(str(create_gratuitous_arp_request(src_mac, src_ip)))
-if dst_if_defined:
+if is_dst_tg:
dst_if = Interface(dst_if_name)
dst_if.send_pkt(str(create_gratuitous_arp_request(dst_mac, dst_ip)))
@@ -73,16 +67,10 @@ pkt_req_send = (Ether(src=src_mac, dst=first_hop_mac) /
ICMP())
src_if.send_pkt(pkt_req_send)
-if dst_if_defined:
- try:
- pkt_req_recv = dst_if.recv_pkt()
- if pkt_req_recv is None:
- raise Exception('Timeout waiting for packet')
- except:
- src_if.close()
- if dst_if_defined:
- dst_if.close()
- raise
+if is_dst_tg:
+ pkt_req_recv = dst_if.recv_pkt()
+ if pkt_req_recv is None:
+ raise Exception('Timeout waiting for packet')
check_ttl(pkt_req_send[IP].ttl, pkt_req_recv[IP].ttl, hops)
pkt_req_send_mod = pkt_req_send.copy()
@@ -95,23 +83,13 @@ if dst_if_defined:
ICMP(type=0)) # echo-reply
dst_if.send_pkt(pkt_resp_send)
-try:
- pkt_resp_recv = src_if.recv_pkt()
- if pkt_resp_recv is None:
- raise Exception('Timeout waiting for packet')
-except:
- src_if.close()
- if dst_if_defined:
- dst_if.close()
- raise
+pkt_resp_recv = src_if.recv_pkt()
+if pkt_resp_recv is None:
+ raise Exception('Timeout waiting for packet')
-if dst_if_defined:
+if is_dst_tg:
check_ttl(pkt_resp_send[IP].ttl, pkt_resp_recv[IP].ttl, hops)
pkt_resp_send_mod = pkt_resp_send.copy()
pkt_resp_send_mod[IP].ttl = pkt_resp_recv[IP].ttl
del pkt_resp_send_mod[IP].chksum # update checksum
ckeck_packets_equal(pkt_resp_send_mod[IP], pkt_resp_recv[IP])
-
-src_if.close()
-if dst_if_defined:
- dst_if.close()