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, 43 insertions, 20 deletions

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 2e44e913aa..2eea8e6f1b 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -580,28 +580,41 @@ class InterfaceUtil(object):
             return {}
 
     @staticmethod
-    def create_subinterface(node, interface, sub_id, outer_vlan_id,
-                            inner_vlan_id, type_subif):
-        """Create sub-interface on node.
+    def create_subinterface(node, interface, sub_id, outer_vlan_id=None,
+                            inner_vlan_id=None, type_subif=None):
+        """Create sub-interface on node. It is possible to set required
+        sub-interface type and VLAN tag(s).
 
         :param node: Node to add sub-interface.
         :param interface: Interface name on which create sub-interface.
         :param sub_id: ID of the sub-interface to be created.
-        :param outer_vlan_id: Outer VLAN ID.
-        :param inner_vlan_id: Inner VLAN ID.
-        :param type_subif: Type of sub-interface.
+        :param outer_vlan_id: Optional outer VLAN ID.
+        :param inner_vlan_id: Optional inner VLAN ID.
+        :param type_subif: Optional type of sub-interface. Values supported by
+        VPP: [no_tags] [one_tag] [two_tags] [dot1ad] [exact_match] [default_sub]
         :type node: dict
         :type interface: str or int
         :type sub_id: int
         :type outer_vlan_id: int
         :type inner_vlan_id: int
         :type type_subif: str
-        :return: name and index of created sub-interface
+        :return: Name and index of created sub-interface.
         :rtype: tuple
+        :raises RuntimeError: If it is not possible to create sub-interface.
         """
 
+        outer_vlan_id = 'outer_vlan_id {0}'.format(outer_vlan_id)\
+            if outer_vlan_id else ''
+
+        inner_vlan_id = 'inner_vlan_id {0}'.format(inner_vlan_id)\
+            if inner_vlan_id else ''
+
+        if type_subif is None:
+            type_subif = ''
+
         if isinstance(interface, basestring):
-            sw_if_index = Topology.get_interface_sw_index(node, interface)
+            iface_key = Topology.get_interface_by_name(node, interface)
+            sw_if_index = Topology.get_interface_sw_index(node, iface_key)
         else:
             sw_if_index = interface
 
@@ -617,10 +630,10 @@ class InterfaceUtil(object):
             logger.trace('Created subinterface with index {}'
                          .format(sw_subif_index))
         else:
-            raise RuntimeError('Unable to create subinterface on node {}'
+            raise RuntimeError('Unable to create sub-interface on node {}'
                                .format(node['host']))
 
-        with VatTerminal(node) as vat:
+        with VatTerminal(node, json_param=False) as vat:
             vat.vat_terminal_exec_cmd('exec show interfaces')
 
         name = '{}.{}'.format(interface, sub_id)
diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py
index db550f0640..af4735fdf8 100644
--- a/resources/libraries/python/L2Util.py
+++ b/resources/libraries/python/L2Util.py
@@ -280,33 +280,43 @@ class L2Util(object):
         return data
 
     @staticmethod
-    def l2_tag_rewrite(node, interface, tag_rewrite_method, tag1_id=None):
-        """Rewrite tags in frame.
+    def l2_vlan_tag_rewrite(node, interface, tag_rewrite_method,
+                            push_dot1q=True, tag1_id=None, tag2_id=None):
+        """Rewrite tags in ethernet frame.
 
         :param node: Node to rewrite tags.
         :param interface: Interface on which rewrite tags.
         :param tag_rewrite_method: Method of tag rewrite.
+        :param push_dot1q: Optional parameter to disable to push dot1q tag
+         instead of dot1ad.
         :param tag1_id: Optional tag1 ID for VLAN.
+        :param tag2_id: Optional tag2 ID for VLAN.
         :type node: dict
         :type interface: str or int
-        :type tag_rewrite_method : str
+        :type tag_rewrite_method: str
+        :type push_dot1q: bool
         :type tag1_id: int
+        :type tag2_id: int
         """
-        if tag1_id is None:
-            tag1_id = ''
-        else:
-            tag1_id = 'tag1 {0}'.format(tag1_id)
+        push_dot1q = 'push_dot1q 0' if not push_dot1q else ''
+
+        tag1_id = 'tag1 {0}'.format(tag1_id) if tag1_id else ''
+        tag2_id = 'tag2 {0}'.format(tag2_id) if tag2_id else ''
+
         if isinstance(interface, basestring):
-            sw_if_index = Topology.get_interface_sw_index(node, interface)
+            iface_key = Topology.get_interface_by_name(node, interface)
+            sw_if_index = Topology.get_interface_sw_index(node, iface_key)
         else:
             sw_if_index = interface
 
         with VatTerminal(node) as vat:
-            vat.vat_terminal_exec_cmd_from_template("l2_tag_rewrite.vat",
+            vat.vat_terminal_exec_cmd_from_template("l2_vlan_tag_rewrite.vat",
                                                     sw_if_index=sw_if_index,
                                                     tag_rewrite_method=
                                                     tag_rewrite_method,
-                                                    tag1_optional=tag1_id)
+                                                    push_dot1q=push_dot1q,
+                                                    tag1_optional=tag1_id,
+                                                    tag2_optional=tag2_id)
 
     @staticmethod
     def delete_bridge_domain_vat(node, bd_id):