X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipv4_ping_ttl_check.py;h=2f1ea258ea99b70c8f2a94274cfead6c86a562a4;hp=2fd9d552ea0d8bec9778f365f4c8a0c7f486116e;hb=c8d76a16533edac586a98d2842932804709fea30;hpb=da15035461569ea175aabbac1df735cd5598b0b3

diff --git a/resources/traffic_scripts/ipv4_ping_ttl_check.py b/resources/traffic_scripts/ipv4_ping_ttl_check.py
index 2fd9d552ea..2f1ea258ea 100755
--- a/resources/traffic_scripts/ipv4_ping_ttl_check.py
+++ b/resources/traffic_scripts/ipv4_ping_ttl_check.py
@@ -21,17 +21,14 @@ 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))
 
 
 def ckeck_packets_equal(pkt_send, pkt_recv):
-    pkt_send_raw = str(pkt_send)
-    pkt_recv_raw = str(pkt_recv)
+    pkt_send_raw = auto_pad(pkt_send)
+    pkt_recv_raw = auto_pad(pkt_recv)
     if pkt_send_raw != pkt_recv_raw:
         print "Sent:     {}".format(pkt_send_raw.encode('hex'))
         print "Received: {}".format(pkt_recv_raw.encode('hex'))
@@ -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,29 +53,24 @@ 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(create_gratuitous_arp_request(src_mac, src_ip))
-if dst_if_defined:
+src_if.send_pkt(str(create_gratuitous_arp_request(src_mac, src_ip)))
+if is_dst_tg:
     dst_if = Interface(dst_if_name)
-    dst_if.send_pkt(create_gratuitous_arp_request(dst_mac, dst_ip))
+    dst_if.send_pkt(str(create_gratuitous_arp_request(dst_mac, dst_ip)))
 
-pkt_req_send = auto_pad(Ether(src=src_mac, dst=first_hop_mac) /
-                        IP(src=src_ip, dst=dst_ip) /
-                        ICMP())
-pkt_req_send = Ether(pkt_req_send)
+pkt_req_send = (Ether(src=src_mac, dst=first_hop_mac) /
+                      IP(src=src_ip, dst=dst_ip) /
+                      ICMP())
 src_if.send_pkt(pkt_req_send)
 
-if dst_if_defined:
-    try:
-        pkt_req_recv = dst_if.recv_pkt()
-    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()
@@ -89,27 +78,18 @@ if dst_if_defined:
     del pkt_req_send_mod[IP].chksum  # update checksum
     ckeck_packets_equal(pkt_req_send_mod[IP], pkt_req_recv[IP])
 
-    pkt_resp_send = auto_pad(Ether(src=dst_mac, dst=pkt_req_recv.src) /
-                             IP(src=dst_ip, dst=src_ip) /
-                             ICMP(type=0))  # echo-reply
-    pkt_resp_send = Ether(pkt_resp_send)
+    pkt_resp_send = (Ether(src=dst_mac, dst=pkt_req_recv.src) /
+                           IP(src=dst_ip, dst=src_ip) /
+                           ICMP(type=0))  # echo-reply
     dst_if.send_pkt(pkt_resp_send)
 
-try:
-    pkt_resp_recv = src_if.recv_pkt()
-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()