CSIT_VIRL phased migration, prio P0 - apply SKIP_VPP_PATCH tag

Jira: CSIT-1137

Change-Id: I06e00e25060c36a1e7bd5b70bce1f203c1509ef5
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/tests/vpp/func/ip4/eth2p-dot1q-ip4base-func.robot b/tests/vpp/func/ip4/eth2p-dot1q-ip4base-func.robot
index 98bf796..d5b89ec 100644 (file)
--- a/tests/vpp/func/ip4/eth2p-dot1q-ip4base-func.robot
+++ b/tests/vpp/func/ip4/eth2p-dot1q-ip4base-func.robot
@@ -20,6 +20,7 @@
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.IPv6Util
 | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.IPv6Util
 | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV

+| ... | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv4 with VLAN subinterfaces*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv4 with VLAN subinterfaces*

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot
index 8d93aec..310e50d 100644 (file)
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot
@@ -20,7 +20,7 @@
 | Resource | resources/libraries/robot/l2/l2_xconnect.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/l2/l2_xconnect.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv4 ARP test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv4 ARP test cases*

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
index 5960e83..73efbdb 100644 (file)
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
@@ -17,7 +17,7 @@
 | Resource | resources/libraries/robot/features/dhcp_client.robot
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/features/dhcp_client.robot
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *DHCPv4 Client related test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *DHCPv4 Client related test cases*

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot
index 6764044..2a2b55b 100644 (file)
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot
@@ -20,7 +20,7 @@
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Ipv4 Multipath routing test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Ipv4 Multipath routing test cases*

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
index 8097526..4348c73 100644 (file)
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
@@ -19,7 +19,7 @@
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Library | resources.libraries.python.ProxyArp
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Library | resources.libraries.python.ProxyArp

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *RFC1027 Proxy ARP test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *RFC1027 Proxy ARP test cases*

diff --git a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
index 32014e5..9f1a40b 100644 (file)
--- a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
+++ b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
@@ -19,7 +19,7 @@
 | Resource | resources/libraries/robot/vm/qemu.robot
 | Resource | resources/libraries/robot/vm/double_qemu_setup.robot
 | Library  | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/vm/qemu.robot
 | Resource | resources/libraries/robot/vm/double_qemu_setup.robot
 | Library  | resources.libraries.python.Trace

-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Bridge-domain with VXLAN test cases - IPv4*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Bridge-domain with VXLAN test cases - IPv4*


@@ -64,15 +64,16 @@
 | | And Set interfaces in 3-node circular topology up
 | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
 | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
 | | And Set interfaces in 3-node circular topology up
 | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
 | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}

-| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
-| | ...                                    | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
+| | And Configure IP addresses and neighbors on interfaces
+| | ... | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} | ${dut2_node}
+| | ... | ${dut2_to_dut1_name} | ${NONE}

 | | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1_node} | ${vni_1}
 | |                 | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
 | | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1_node} | ${vni_1}
 | |                 | ... | ${dut1s_ip_address} | ${dut2s_ip_address}

-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
-| | ...                            | ${dut1_to_tg} | ${dut1s_vxlan}
+| | And Add interfaces to L2BD
+| | ... | ${dut1_node} | ${bd_id1} | ${dut1_to_tg} | ${dut1s_vxlan}

 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | |                 | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | |                 | ... | ${dut2s_ip_address} | ${dut1s_ip_address}

-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
-| | ...                            | ${dut2_to_tg} | ${dut2s_vxlan}
+| | And Add interfaces to L2BD
+| | ... | ${dut2_node} | ${bd_id1} | ${dut2_to_tg} | ${dut2s_vxlan}

 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}

diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot
index 9da7c1d..bd2d5fb 100644 (file)
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot
+++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot
@@ -21,7 +21,7 @@
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Classify.Classify
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Classify.Classify
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv6 routing with ingress ACL test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv6 routing with ingress ACL test cases*

diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
index 1f4b6c7..3d6dae8 100644 (file)
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
+++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
@@ -20,7 +20,7 @@
 | Resource | resources/libraries/robot/ip/ip6.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/ip/ip6.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Ipv6 Multipath routing test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *Ipv6 Multipath routing test cases*

diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ra-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ra-func.robot
index 20fa1bd..d897f7c 100644 (file)
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ra-func.robot
+++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ra-func.robot
@@ -19,7 +19,7 @@
 | Resource | resources/libraries/robot/ip/ip6.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace
 | Resource | resources/libraries/robot/ip/ip6.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.Trace

-| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH

 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv6 Router Advertisement test cases*
 | Test Setup | Set up functional test
 | Test Teardown | Tear down functional test
 | Documentation | *IPv6 Router Advertisement test cases*