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>

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 2e44e91..2eea8e6 100644 (file)
--- 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 db550f0..af4735f 100644 (file)
--- 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):

diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot
index d8e24b8..156497e 100644 (file)
--- a/resources/libraries/robot/l2_traffic.robot
+++ b/resources/libraries/robot/l2_traffic.robot
@@ -12,14 +12,15 @@
 # limitations under the License.
 
 *** Settings ***
-| Documentation | Keywords for send and receive different types of traffic through L2 network.
+| Documentation | Keywords to send and receive different types of traffic \
+| ...           | through L2 network.
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.TrafficScriptExecutor
 
 *** Keywords ***
 | Send and receive ICMP Packet
-| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
-| | ...             | destination interface.
+| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to \
+| | ...             | destination interface. Dot1q or Dot1ad tag(s) can be set.
 | | ...
 | | ... | *Arguments:*
 | | ...
@@ -28,6 +29,9 @@
 | | ... | - dst_int - Destination interface. Type: string
 | | ... | - src_ip - Source IP address (Optional). Type: string
 | | ... | - dst_ip - Destination IP address (Optional). Type: string
+| | ... | - encaps - Encapsulation: Dot1q or Dot1ad (Optional). Type: string
+| | ... | - vlan1 - VLAN (outer) tag (Optional). Type: integer
+| | ... | - vlan2 - VLAN inner tag (Optional). Type: integer
 | | ...
 | | ... | *Return:*
 | | ...
@@ -39,15 +43,27 @@
 | | ...
 | | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} |
-| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2
+| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \|
+| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \| vlan2=220 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
+| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | ${encaps}=${EMPTY}
+| | ... | ${vlan1}=${EMPTY} | ${vlan2}=${EMPTY}
 | | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
 | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
 | | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int}
 | | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
-| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
+| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args1}= | Run Keyword Unless | '${encaps}' == '${EMPTY}' | Catenate
+| | ... | --encaps ${encaps} | --vlan1 ${vlan1}
+| | ${args2}= | Run Keyword Unless | '${vlan2}' == '${EMPTY}' | Set Variable
+| | ... | --vlan2 ${vlan2}
+| | ${args}= | Run Keyword If | '${args1}' == 'None' | Set Variable | ${args}
+| | ... | ELSE IF | '${args2}' == 'None' | Catenate | ${args} | ${args1}
+| | ... | ELSE | Catenate | ${args} | ${args1} | ${args2}
 | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
 | Send and receive ICMP Packet should failed
@@ -80,8 +96,8 @@
 | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
 | | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int}
 | | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
-| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
+| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Keyword And Expect Error | ICMP echo Rx timeout |
 | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 

diff --git a/resources/libraries/robot/tagging.robot b/resources/libraries/robot/tagging.robot
index 7d1d2fe..363ac58 100644 (file)
--- a/resources/libraries/robot/tagging.robot
+++ b/resources/libraries/robot/tagging.robot
@@ -27,27 +27,29 @@
 | | [Documentation] | *Create two subinterfaces on DUTs.*
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${DUT1} - Node to add sub-interface.
-| | ... | - ${INT1} - Interface name on which create sub-interface.
-| | ... | - ${DUT2} - Node to add sub-interface.
-| | ... | - ${INT2} - Interface name on which create sub-interface.
-| | ... | - ${SUB_ID} - ID of the sub-interface to be created.
-| | ... | - ${OUTER_VLAN_ID} - Outer VLAN ID.
-| | ... | - ${INNER_VLAN_ID} - Inner VLAN ID.
-| | ... | - ${TYPE_SUBIF} - Type of sub-interface.
+| | ... | - DUT1 - Node to add sub-interface.
+| | ... | - INT1 - Interface name on which create sub-interface.
+| | ... | - DUT2 - Node to add sub-interface.
+| | ... | - INT2 - Interface name on which create sub-interface.
+| | ... | - SUB_ID - ID of the sub-interface to be created.
+| | ... | - OUTER_VLAN_ID - Outer VLAN ID.
+| | ... | - INNER_VLAN_ID - Inner VLAN ID.
+| | ... | - TYPE_SUBIF - Type of sub-interface.
 | | ...
 | | ... | _Set testcase variables with name and index of created interfaces:_
-| | ... | - ${subif_name_1}
-| | ... | - ${subif_index_1}
-| | ... | - ${subif_name_2}
-| | ... | - ${subif_index_2}
+| | ... | - subif_name_1
+| | ... | - subif_index_1
+| | ... | - subif_name_2
+| | ... | - subif_index_2
 | | ...
+| | ${INT1_name}= | Get interface name | ${DUT1} | ${INT1}
 | | ${subif_name_1} | ${subif_index_1}= | Create subinterface | ${DUT1}
-| | ...                                 | ${INT1} | ${SUB_ID}
+| | ...                                 | ${INT1_name} | ${SUB_ID}
 | | ...                                 | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID}
 | | ...                                 | ${TYPE_SUBIF}
+| | ${INT2_name}= | Get interface name | ${DUT1} | ${INT2}
 | | ${subif_name_2} | ${subif_index_2}= | Create subinterface | ${DUT2}
-| | ...                                 | ${INT2} | ${SUB_ID}
+| | ...                                 | ${INT2_name} | ${SUB_ID}
 | | ...                                 | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID}
 | | ...                                 | ${TYPE_SUBIF}
 | | Set Interface State | ${DUT1} | ${subif_index_1} | up
@@ -62,17 +64,17 @@
 | | [Documentation] | *Create two dot1q subinterfaces on DUTs.*
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${DUT1} - Node to add sub-interface.
-| | ... | - ${INT1} - Interface name on which create VLAN sub-interface.
-| | ... | - ${DUT2} - Node to add sub-interface.
-| | ... | - ${INT2} - Interface name on which create VLAN sub-interface.
-| | ... | - ${SUB_ID} - ID of the sub-interface to be created.
+| | ... | - DUT1 - Node to add sub-interface.
+| | ... | - INT1 - Interface name on which create VLAN sub-interface.
+| | ... | - DUT2 - Node to add sub-interface.
+| | ... | - INT2 - Interface name on which create VLAN sub-interface.
+| | ... | - SUB_ID - ID of the sub-interface to be created.
 | | ...
 | | ... | _Set testcase variables with name and index of created interfaces:_
-| | ... | - ${subif_name_1}
-| | ... | - ${subif_index_1}
-| | ... | - ${subif_name_2}
-| | ... | - ${subif_index_2}
+| | ... | - subif_name_1
+| | ... | - subif_index_1
+| | ... | - subif_name_2
+| | ... | - subif_index_2
 | | ...
 | | ... | *Example:*
 | | ...
@@ -99,14 +101,14 @@
 | | [Documentation] | *Setup tag rewrite on sub-interfaces on DUTs.*
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${DUT1} - Node to rewrite tags.
-| | ... | - ${SUB_INT1} - Interface on which rewrite tags.
-| | ... | - ${DUT2} - Node to rewrite tags.
-| | ... | - ${SUB_INT2} - Interface on which rewrite tags.
-| | ... | - ${TAG_REWRITE_METHOD} - Method of tag rewrite.
-| | ...
-| | L2 tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD}
-| | L2 tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD}
+| | ... | - DUT1 - Node to rewrite tags.
+| | ... | - SUB_INT1 - Interface on which rewrite tags.
+| | ... | - DUT2 - Node to rewrite tags.
+| | ... | - SUB_INT2 - Interface on which rewrite tags.
+| | ... | - TAG_REWRITE_METHOD - Method of tag rewrite.
+| | ...
+| | L2 Vlan tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD}
+| | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD}
 
 | Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | [Arguments] | ${DUT1} | ${INT1} | ${SUB_INT1}
@@ -115,12 +117,102 @@
 | | ...             | L2-xconnect on DUTs.*
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${DUT1} - Node to add bidirectional cross-connect.
-| | ... | - ${INT1} - Interface to add to the cross-connect.
-| | ... | - ${SUB_INT1} - Sub-interface to add to the cross-connect.
-| | ... | - ${DUT2} - Node to add bidirectional cross-connect.
-| | ... | - ${INT2} - Interface to add to the cross-connect.
-| | ... | - ${SUB_INT2} - Sub-interface to add to the cross-connect.
+| | ... | - DUT1 - Node to add bidirectional cross-connect.
+| | ... | - INT1 - Interface to add to the cross-connect.
+| | ... | - SUB_INT1 - Sub-interface to add to the cross-connect.
+| | ... | - DUT2 - Node to add bidirectional cross-connect.
+| | ... | - INT2 - Interface to add to the cross-connect.
+| | ... | - SUB_INT2 - Sub-interface to add to the cross-connect.
 | | ...
 | | L2 setup xconnect on DUT | ${DUT1} | ${INT1} | ${SUB_INT1}
 | | L2 setup xconnect on DUT | ${DUT2} | ${INT2} | ${SUB_INT2}
+
+| Vlan Subinterface Created
+| | [Documentation] | Create VLAN sub-interface on DUT.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - Node to add VLAN sub-intreface. Type: dictionary
+| | ... | - interface - Interface to create VLAN sub-interface. Type: string
+| | ... | - vlan_id - VLAN ID. Type: integer
+| | ...
+| | ... | *Return:*
+| | ... | - vlan_name - VLAN sub-interface name. Type: string
+| | ... | - vlan_index - VLAN sub-interface SW index. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Vlan Subinterface Created \| ${nodes['DUT1']} \| port3 \| 100 \|
+| | ...
+| | [Arguments] | ${dut_node} | ${interface} | ${vlan_id}
+| | [Return] | ${vlan_name} | ${vlan_index}
+| | ${interface_name}= | Get interface name | ${dut_node} | ${interface}
+| | ${vlan_name} | ${vlan_index}= | Create Vlan Subinterface
+| | ... | ${dut_node} | ${interface_name} | ${vlan_id}
+
+| Tagged Subinterface Created
+| | [Documentation] | Create tagged sub-interface on DUT. Type of tagged \
+| | ... | sub-intreface depends on type_subif value:
+| | ... | - one_tag -> VLAN
+| | ... | - two_tags -> QinQ VLAN
+| | ... | - two_tags dot1ad - DOT1AD
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - Node to add VLAN sub-intreface. Type: dictionary
+| | ... | - interface - Interface to create tagged sub-interface. Type: string
+| | ... | - subif_id - Sub-interface ID. Type: integer
+| | ... | - outer_vlan_id - VLAN (outer) ID (Optional). Type: integer
+| | ... | - inner_vlan_id - VLAN inner ID (Optional). Type: integer
+| | ... | - type_subif - Sub-interface type (Optional). Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - subif_name - Sub-interface name. Type: string
+| | ... | - subif_index - Sub-interface SW index. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Tagged Subinterface Created \| ${nodes['DUT1']} \| port1 \| 10 \
+| | ... | \| outer_vlan_id=100 \| inner_vlan_id=200 \
+| | ... | \| type_subif=two_tags dot1ad \|
+| | ...
+| | [Arguments] | ${dut_node} | ${interface} | ${subif_id}
+| | ... | ${outer_vlan_id}=${None} | ${inner_vlan_id}=${None}
+| | ... | ${type_subif}=${None}
+| | [Return] | ${subif_name} | ${subif_index}
+| | ${interface_name}= | Get interface name | ${dut_node} | ${interface}
+| | ${subif_name} | ${subif_index}= | Create Subinterface
+| | ... | ${dut_node} | ${interface_name} | ${subif_id}
+| | ... | outer_vlan_id=${outer_vlan_id} | inner_vlan_id=${inner_vlan_id}
+| | ... | type_subif=${type_subif}
+
+| L2 Tag Rewrite Method Is Set On Interface
+| | [Documentation] | Set L2 tag rewrite on (sub-)interface on DUT
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - Node to set L2 tag rewrite method. Type: dictionary
+| | ... | - interface - (Sub-)interface name or SW index to set L2 tag rewrite
+| | ... | method. Type: string or integer
+| | ... | - tag_rewrite_method - Tag rewrite method. Type: string
+| | ... | - push_dot1q - True to push tags as Dot1q, False to push tags as
+| | ... | Dot1ad (Optional). Type: boolean
+| | ... | - tag1_id - VLAN tag1 ID (Optional). Type: integer
+| | ... | - tag2_id - VLAN tag2 ID (Optional). Type: integer
+| | ...
+| | ... | *Return:*
+| | ...
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT1']} \
+| | ... | \| 9 \| pop-1 \|
+| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT2']} \
+| | ... | \| 10 \| translate-1-2 \| push_dot1q=${False} \| tag1_id=10 \
+| | ... | \| tag1_id=20 \|
+| | ...
+| | [Arguments] | ${dut_node} | ${interface} | ${tag_rewrite_method}
+| | ... | ${push_dot1q}=${True} | ${tag1_id}=${None} | ${tag2_id}=${None}
+| | ${result}= | Evaluate | isinstance($interface, int)
+| | ${interface_name}= | Run Keyword If | ${result} | Set Variable | ${interface}
+| | ...                | ELSE | Get interface name | ${dut_node} | ${interface}
+| | L2 Vlan Tag Rewrite | ${dut_node} | ${interface_name} | ${tag_rewrite_method}
+| | ... | push_dot1q=${push_dot1q} | tag1_id=${tag1_id} | tag2_id=${tag2_id}

diff --git a/resources/templates/vat/create_sub_interface.vat b/resources/templates/vat/create_sub_interface.vat
index 4d7da0c..6dad081 100644 (file)
--- a/resources/templates/vat/create_sub_interface.vat
+++ b/resources/templates/vat/create_sub_interface.vat
@@ -1 +1 @@
-create_subif sw_if_index {sw_if_index} sub_id {sub_id} outer_vlan_id {outer_vlan_id} inner_vlan_id {inner_vlan_id} {type_subif}
\ No newline at end of file
+create_subif sw_if_index {sw_if_index} sub_id {sub_id} {outer_vlan_id} {inner_vlan_id} {type_subif}

diff --git a/resources/templates/vat/l2_tag_rewrite.vat b/resources/templates/vat/l2_vlan_tag_rewrite.vat
similarity index 52%
rename from resources/templates/vat/l2_tag_rewrite.vat
rename to resources/templates/vat/l2_vlan_tag_rewrite.vat
index acb4baa..1e8aa37 100644 (file)
--- a/resources/templates/vat/l2_tag_rewrite.vat
+++ b/resources/templates/vat/l2_vlan_tag_rewrite.vat
@@ -1 +1 @@
-l2_interface_vlan_tag_rewrite sw_if_index {sw_if_index} {tag_rewrite_method} {tag1_optional}
+l2_interface_vlan_tag_rewrite sw_if_index {sw_if_index} {tag_rewrite_method} {push_dot1q} {tag1_optional} {tag2_optional}

diff --git a/resources/traffic_scripts/send_icmp_check_headers.py b/resources/traffic_scripts/send_icmp_check_headers.py
index f8f5309..7450bd1 100755 (executable)
--- 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 23e647f..140c205 100755 (executable)
--- 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:

diff --git a/tests/suites/tagging/qinq_l2_xconnect.robot b/tests/suites/vlan/qinq_l2_xconnect.robot
similarity index 96%
rename from tests/suites/tagging/qinq_l2_xconnect.robot
rename to tests/suites/vlan/qinq_l2_xconnect.robot
index 968f723..35fdcde 100644 (file)
--- a/tests/suites/tagging/qinq_l2_xconnect.robot
+++ b/tests/suites/vlan/qinq_l2_xconnect.robot
@@ -34,7 +34,7 @@
 | ... | sent in both directions by TG on links to DUT1 and DUT2; on receive TG
 | ... | verifies packets for correctness and their IPv4 src-addr, dst-addr and
 | ... | MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* 802dot1ad.
+| ... | *[Ref] Applicable standard specifications:* IEEE 802.1ad.
 
 *** Variables ***
 | ${subid}= | 10
@@ -54,7 +54,7 @@
 | | ... | popping two VLAN tags on packets transmitted to local TG. [Ver]
 | | ... | Make TG send ICMPv4 Echo Req in both directions between two of
 | | ... | its interfaces to be switched by DUT1 and DUT2; verify all
-| | ... | packets are received. [Ref] 802dot1ad.
+| | ... | packets are received. [Ref] IEEE 802.1ad.
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | And Interfaces in 3-node path are up

diff --git a/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot b/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot
new file mode 100644 (file)
index 0000000..f1a954f
--- /dev/null
+++ b/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot
@@ -0,0 +1,453 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/testing_path.robot
+| Resource | resources/libraries/robot/tagging.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.Trace
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
+| Test Setup | Setup all DUTs before test
+| Suite Setup | Setup all TGs before traffic script
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ...           | AND          | Show vpp trace dump on all DUTs
+| Documentation | *L2 cross-connect with VLAN tag rewrite test cases - IPv4*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
+| ... | Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and DUT1-DUT2, Eth-IPv4-ICMPv4
+| ... | on TG-DUT2 for L2 switching of IPv4.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
+| ... | (L2XC) switching between VLAN sub-interface with VLAN tag rewrite
+| ... | translate-1-1 method of interface towards TG and interface towards DUT2.
+| ... | DUT2 is configured configured with L2 cross-connect (L2XC) switching
+| ... | between VLAN sub-interface with VLAN tag rewrite pop-1 method
+| ... | of interface towards DUT1 and interface towards TG.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
+| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
+| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
+
+*** Variables ***
+| ${subid}= | 10
+| ${outer_vlan_id1}= | 110
+| ${outer_vlan_id2}= | 120
+| ${outer_vlan_wrong}= | 150
+| ${inner_vlan_id1}= | 210
+| ${inner_vlan_id2}= | 220
+| ${inner_vlan_wrong}= | 250
+
+*** Test Cases ***
+| TC01: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one interface to DUT2 and one VLAN
+| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method;
+| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
+| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
+| | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag
+| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
+| | ... | that packet is received. [Ref] IEEE 802.1q
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-1
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Send and receive ICMP Packet
+| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
+| | ... | vlan1=${outer_vlan_id1}
+
+| TC02: DUT1 and DUT2 with L2XC and VLAN translate-1-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one VLAN tagged sub-interface to DUT2 and
+| | ... | one VLAN sub-interface towards TG with VLAN tag rewrite
+| | ... | (translate-1-1) on sub-interface to DUT2; on DUT2 configure L2XC with
+| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with VLAN
+| | ... | tag pop-1. [Ver] Make TG send ICMPv4 Echo Req tagged with one dot1q
+| | ... | tag from one of its interfaces to another one via DUT1 and DUT2;
+| | ... | verify that packet is not received. [Ref] IEEE 802.1q
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-1
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
+
+| TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-2 (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-1-2 method; on DUT2 configure L2 cross-connect (L2XC) with
+| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
+| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
+| | ... | tagged with one Dot1q tag from one of its interfaces to another one
+| | ... | via DUT1 and DUT2; verify that packet is received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Send and receive ICMP Packet
+| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
+| | ... | vlan1=${outer_vlan_id1}
+
+| TC04: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-1-2 method to set inner tag different from inner tag set on
+| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
+| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
+| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
+| | ... | tagged with one Dot1q tag from one of its interfaces to another one
+| | ... | via DUT1 and DUT2; verify that packet is not received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
+
+| TC05: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-1-2 method to set outer tag different from outer tag set on
+| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
+| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
+| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
+| | ... | tagged with one Dot1q tag from one of its interfaces to another one
+| | ... | via DUT1 and DUT2; verify that packet is not received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
+
+| TC06: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-1-2 method to set outer and inner tags different from tags
+| | ... | set on Dot1ad sub-interface of DUT2; on DUT2 configure L2
+| | ... | cross-connect with one interface to TG and one Dot1ad sub-interface
+| | ... | towards DUT1 with VLAN tag rewrite pop-2 method. [Ver] Make TG send
+| | ... | ICMPv4 Echo Req tagged with one Dot1q tag from one of its interfaces
+| | ... | to another one via DUT1 and DUT2; verify that packet is not received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
+
+| TC07: DUT1 and DUT2 with L2XC and VLAN translate-2-1 (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-2-1 method; on DUT2 configure L2 cross-connect (L2XC) with
+| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
+| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
+| | ... | tagged with Dot1ad tags from one of its interfaces to another one
+| | ... | via DUT1 and DUT2; verify that packet is received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-1
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Send and receive ICMP Packet
+| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
+| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
+
+| TC08: DUT1 and DUT2 with L2XC and VLAN translate-2-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
+| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
+| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
+| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
+| | ... | translate-2-1 method to set tag different from tag set on VLAN
+| | ... | sub-interface of DUT2; on DUT2 configure L2 cross-connect (L2XC) with
+| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
+| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
+| | ... | tagged with Dot1ad tags from one of its interfaces to another one
+| | ... | via DUT1 and DUT2; verify that packet is not received.
+| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-1
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}
+
+| TC09: DUT1 and DUT2 with L2XC and VLAN translate-2-2 switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
+| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method;
+| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG and
+| | ... | one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
+| | ... | tagged with Dot1ad tags from one of its interfaces to another one
+| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
+| | ... | that packet is received. [Ref] IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Send and receive ICMP Packet
+| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
+| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
+
+| TC10: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
+| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
+| | ... | set inner tag different from inner tag set on Dot1ad sub-interface of
+| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
+| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
+| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another one
+| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
+| | ... | that packet is not received. [Ref] IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}
+
+| TC11: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
+| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
+| | ... | set outer tag different from outer tag set on Dot1ad sub-interface of
+| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
+| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
+| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another
+| | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2;
+| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}
+
+| TC12: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv4 between two TG links
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
+| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
+| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
+| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
+| | ... | set tags different from tags set on Dot1ad sub-interface of DUT2;
+| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
+| | ... | and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
+| | ... | tagged with Dot1ad tags from one of its interfaces to another one
+| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
+| | ... | that packet is not received. [Ref] IEEE 802.1ad
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
+| | ... | type_subif=two_tags dot1ad
+| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
+| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
+| | ... | type_subif=two_tags dot1ad
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
+| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
+| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
+| | ... | ${vlan2_index} | pop-2
+| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
+| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
+| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}