commit d209c0b4249c4cac5d0616a104384f225e90c938
author Harshmeet Singh <harshmeet.singh@bigswitch.com> Tue Jan 28 09:48:58 2014 -0600
committer Harshmeet Singh <harshmeet.singh@bigswitch.com> Tue Jan 28 09:48:58 2014 -0600
tree 2f8619e5fe7737d044266ab83950dc5c13343240
parent 3630919ed4fb5e0f4315a3875e852ed4f33d59cf

changes in build icmp packet api to accomodate ip identification, icmp checksum and icmp data

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index b9fa51f..d6fa850 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -292,9 +292,11 @@
                       ip_dst='192.168.0.2',
                       ip_tos=0,
                       ip_ttl=64,
+                      ip_id=1,  
                       icmp_type=8,
-                      icmp_code=0
-                      ):
+                      icmp_code=0,
+                      icmp_checksum=None,
+                      icmp_data="0"):
     """
     Return a simple ICMP packet
 
@@ -309,8 +311,11 @@
     @param ip_dst IP destination
     @param ip_tos IP ToS
     @param ip_ttl IP TTL
+    @param ip_id IP Identification
     @param icmp_type ICMP type
     @param icmp_code ICMP code
+    @param icmp_checksum ICMP checksum    
+    @param icmp_data ICMP data
 
     Generates a simple ICMP ECHO REQUEST.  Users
     shouldn't assume anything about this packet other than that
@@ -323,12 +328,14 @@
     if (dl_vlan_enable):
         pkt = scapy.Ether(dst=eth_dst, src=eth_src)/ \
             scapy.Dot1Q(prio=vlan_pcp, id=0, vlan=vlan_vid)/ \
-            scapy.IP(src=ip_src, dst=ip_dst, ttl=ip_ttl, tos=ip_tos)/ \
-            scapy.ICMP(type=icmp_type, code=icmp_code)
+            scapy.IP(src=ip_src, dst=ip_dst, ttl=ip_ttl, tos=ip_tos, id=ip_id)/ \
+            scapy.ICMP(type=icmp_type, code=icmp_code, chksum=icmp_checksum)/ \
+            icmp_data
     else:
         pkt = scapy.Ether(dst=eth_dst, src=eth_src)/ \
-            scapy.IP(src=ip_src, dst=ip_dst, ttl=ip_ttl, tos=ip_tos)/ \
-            scapy.ICMP(type=icmp_type, code=icmp_code)
+            scapy.IP(src=ip_src, dst=ip_dst, ttl=ip_ttl, tos=ip_tos, id=ip_id)/ \
+            scapy.ICMP(type=icmp_type, code=icmp_code, chksum=icmp_checksum)/ \
+            icmp_data
 
     pkt = pkt/("0" * (pktlen - len(pkt)))