CSIT-34: VLAN tag rewrite translate tests with x-connects - IPv4

- VLAN tag rewrite translate-1-1
- VLAN tag rewrite translate-1-2
- VLAN tag rewrite translate-2-1
- VLAN tag rewrite translate-2-2

REMARK: Negative test cases will be tagged with SKIP_PATCH after merge.

Change-Id: I76045e1416fe1a72298ccc2090cd373fac09b468
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Signed-off-by: Matej Klotton <mklotton@cisco.com>

2 files changed, 46 insertions, 13 deletions

diff --git a/resources/traffic_scripts/send_icmp_check_headers.py b/resources/traffic_scripts/send_icmp_check_headers.py
index f8f5309764..7450bd18e3 100755
--- a/resources/traffic_scripts/send_icmp_check_headers.py
+++ b/resources/traffic_scripts/send_icmp_check_headers.py
@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Traffic script that sends an ip icmp packet
-from one interface to the other.
+"""Traffic script that sends an IP ICMPv4/ICMPv6 packet from one interface
+to the other. Source and destination IP addresses and source and destination
+MAC addresses are checked in received packet.
 """
 
 import sys
diff --git a/resources/traffic_scripts/send_ip_icmp.py b/resources/traffic_scripts/send_ip_icmp.py
index 23e647f43c..140c205d4e 100755
--- a/resources/traffic_scripts/send_ip_icmp.py
+++ b/resources/traffic_scripts/send_ip_icmp.py
@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Traffic script that sends an IP ICMPv4/ICMPv6 packet
-from one interface to the other one."""
+"""Traffic script that sends an IP ICMPv4/ICMPv6 packet from one interface to
+the other one. Dot1q or Dot1ad tagging of the ethernet frame can be set.
+"""
 
 import sys
 import ipaddress
 
 from scapy.layers.inet import ICMP, IP
-from scapy.all import Ether
+from scapy.layers.l2 import Ether
+from scapy.layers.l2 import Dot1Q
 from scapy.layers.inet6 import ICMPv6EchoRequest
 from scapy.layers.inet6 import IPv6
 
@@ -61,14 +63,20 @@ def valid_ipv6(ip):
 
 def main():
     """Send IP ICMPv4/ICMPv6 packet from one traffic generator interface to
-    the other one.
+    the other one. Dot1q or Dot1ad tagging of the ethernet frame can be set.
     """
-    args = TrafficScriptArg(['src_mac', 'dst_mac', 'src_ip', 'dst_ip'])
+    args = TrafficScriptArg(['src_mac', 'dst_mac', 'src_ip', 'dst_ip'],
+                            ['encaps', 'vlan1', 'vlan2'])
 
     src_mac = args.get_arg('src_mac')
     dst_mac = args.get_arg('dst_mac')
     src_ip = args.get_arg('src_ip')
     dst_ip = args.get_arg('dst_ip')
+
+    encaps = args.get_arg('encaps')
+    vlan1 = args.get_arg('vlan1')
+    vlan2 = args.get_arg('vlan2')
+
     tx_if = args.get_arg('tx_if')
     rx_if = args.get_arg('rx_if')
 
@@ -80,15 +88,39 @@ def main():
     icmp_format = ''
     # Create empty ip ICMP packet and add padding before sending
     if valid_ipv4(src_ip) and valid_ipv4(dst_ip):
-        pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
-                   IP(src=src_ip, dst=dst_ip) /
-                   ICMP())
+        if encaps == 'Dot1q':
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
+                       Dot1Q(vlan=int(vlan1)) /
+                       IP(src=src_ip, dst=dst_ip) /
+                       ICMP())
+        elif encaps == 'Dot1ad':
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac, type=0x88A8) /
+                       Dot1Q(vlan=int(vlan1), type=0x8100) /
+                       Dot1Q(vlan=int(vlan2)) /
+                       IP(src=src_ip, dst=dst_ip) /
+                       ICMP())
+        else:
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
+                       IP(src=src_ip, dst=dst_ip) /
+                       ICMP())
         ip_format = 'IP'
         icmp_format = 'ICMP'
     elif valid_ipv6(src_ip) and valid_ipv6(dst_ip):
-        pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
-                   IPv6(src=src_ip, dst=dst_ip) /
-                   ICMPv6EchoRequest())
+        if encaps == 'Dot1q':
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
+                       Dot1Q(vlan=int(vlan1)) /
+                       IPv6(src=src_ip, dst=dst_ip) /
+                       ICMPv6EchoRequest())
+        elif encaps == 'Dot1ad':
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac, type=0x88A8) /
+                       Dot1Q(vlan=int(vlan1), type=0x8100) /
+                       Dot1Q(vlan=int(vlan2)) /
+                       IPv6(src=src_ip, dst=dst_ip) /
+                       ICMPv6EchoRequest())
+        else:
+            pkt_raw = (Ether(src=src_mac, dst=dst_mac) /
+                       IPv6(src=src_ip, dst=dst_ip) /
+                       ICMPv6EchoRequest())
         ip_format = 'IPv6'
         icmp_format = 'ICMPv6EchoRequest'
     else: