aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot396
-rw-r--r--tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot422
-rw-r--r--tests/vpp/func/l2xc/eth2p-eth-l2xcbase-func.robot74
3 files changed, 0 insertions, 892 deletions
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot
deleted file mode 100644
index da2128f0de..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright (c) 2019 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 ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| 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 | *Vpn routed forwarding - baseline IPv4*
-| ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two
-| ... | links in between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of
-| ... | IPv4.
-| ... | *[Cfg] DUT configuration:* Each DUT is configured with two VRF tables;
-| ... | Separation of traffic is tested by IP packets; Basic ARP and ROUTES are
-| ... | set on DUT nodes; IP addresses are set on DUT interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets
-| ... | are sent by TG on link to DUT1, DUT2 or back to TG; On receipt TG
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr,
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:*
-
-*** Variables ***
-| ${fib_table_1}= | 9
-| ${fib_table_2}= | 99
-
-| ${dut1_to_tg_ip1}= | 10.0.0.3
-| ${dut1_to_tg_ip2}= | 10.0.0.4
-| ${dut2_to_tg_ip1}= | 30.0.0.3
-| ${dut2_to_tg_ip2}= | 30.0.0.4
-
-| ${dut1_to_dut2_ip1}= | 20.0.0.1
-| ${dut1_to_dut2_ip2}= | 20.0.0.2
-| ${dut2_to_dut1_ip1}= | 20.0.0.3
-| ${dut2_to_dut1_ip2}= | 20.0.0.4
-
-| ${tg_dut1_ip1}= | 10.0.0.1
-| ${tg_dut1_ip2}= | 10.0.0.2
-| ${tg_dut2_ip1}= | 30.0.0.1
-| ${tg_dut2_ip2}= | 30.0.0.2
-
-| ${ip_prefix}= | 24
-
-*** Test Cases ***
-| TC01: TG packets routed to DUT ingress interface, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if1 and from
-| | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac}
-| | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1} | ${tg_dut1_ip1} | 5
-| | And Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac}
-| | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2} | ${tg_dut1_ip2} | 5
-
-| TC02: TG packets routed to DUT egress interface, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if1 and from
-| | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | 5
-| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | 5
-
-| TC03: TG packets routed to DUT2 ingress interface through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if1 and from
-| | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | 5
-| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | 5
-
-| TC04: TG packets routed to DUT2 egress interface through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if1 and from
-| | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | 5
-| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | 5
-
-| TC05: TG packets routed to TG through DUT1 and DUT2, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if1 and from
-| | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1}
-| | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac}
-| | ... | ${tg_to_dut2_if1_mac}
-| | And Send packet and verify headers | ${tg_node}
-| | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2}
-| | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac}
-
-| TC06: TG packets not routed to DUT ingress interface in different VRF, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | 5
-
-| TC07: TG packets not routed to DUT egress interface in different VRF, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | 5
-
-| TC08: TG packets not routed to DUT2 ingress interface in different VRF through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | 5
-
-| TC09: TG packets not routed to DUT2 egress interface in different VRF through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | 5
-
-| TC10: TG packets not routed to TG in different VRF through DUT1 and DUT2, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG.
-| | ... | [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. On every ingress
-| | ... | and egress port on DUT is configured ARP and each DUT is configured
-| | ... | with one route.
-| | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1}
-| | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2}
-| | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac}
-
-*** Keywords ***
-| Setup Env - 2xVRF Each Node
-| | [Documentation]
-| | ... | Environment is set up with 2 fib tables on each DUT. DUT1-TG-IF1 and \
-| | ... | DUT1-DUT2-IF1 are assigned to FIB1, and DUT1-TG-IF2 and DUT1-DUT2-IF2
-| | ... | are assigned to FIB2 (the some done on DUT2, just opposite). IP
-| | ... | addresses are subsequently set on interfaces, and ARP is set for
-| | ... | neighbors. The last setting is route for each fib table.
-| | ...
-| | And Add fib table | ${dut1_node} | ${fib_table_1}
-| | And Add fib table | ${dut1_node} | ${fib_table_2}
-| | And Add fib table | ${dut2_node} | ${fib_table_1}
-| | And Add fib table | ${dut2_node} | ${fib_table_2}
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix}
-| | ... | vrf=${fib_table_1} | interface=${dut1_to_dut2_if1}
-| | ... | gateway=${dut1_to_dut2_ip2} | multipath=${True}
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip2} | ${ip_prefix}
-| | ... | vrf=${fib_table_2} | interface=${dut1_to_dut2_if2}
-| | ... | gateway=${dut1_to_dut2_ip2} | multipath=${True}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip1} | ${ip_prefix}
-| | ... | vrf=${fib_table_1} | interface=${dut2_to_dut1_if1}
-| | ... | gateway=${dut2_to_dut1_ip1} | multipath=${True}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip2} | ${ip_prefix}
-| | ... | vrf=${fib_table_2} | interface=${dut2_to_dut1_if2}
-| | ... | gateway=${dut2_to_dut1_ip2} | multipath=${True}
-
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_dut2_if1} | ${fib_table_1}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_dut2_if2} | ${fib_table_2}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_tg_if1} | ${fib_table_1}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${fib_table_2}
-
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_dut1_if1} | ${fib_table_1}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_dut1_if2} | ${fib_table_2}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_tg_if1} | ${fib_table_1}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_tg_if2} | ${fib_table_2}
-
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg_if1} | ${dut1_to_tg_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${dut1_to_tg_ip2} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_dut2_if1}
-| | ... | ${dut1_to_dut2_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_dut2_if2}
-| | ... | ${dut1_to_dut2_ip2} | ${ip_prefix}
-
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg_if1} | ${dut2_to_tg_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg_if2} | ${dut2_to_tg_ip2} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_dut1_if1}
-| | ... | ${dut2_to_dut1_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_dut1_if2}
-| | ... | ${dut2_to_dut1_ip2} | ${ip_prefix}
-
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac}
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if1}
-| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if1}
-| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac}
-
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac}
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if2}
-| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if2}
-| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac}
-
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix}
-| | ... | gateway=${dut2_to_dut1_ip1} | interface=${dut1_to_dut2_if1}
-| | ... | vrf=${fib_table_1}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip1} | ${ip_prefix}
-| | ... | gateway=${dut1_to_dut2_ip1} | interface=${dut2_to_dut1_if1}
-| | ... | vrf=${fib_table_1}
-
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip2} | ${ip_prefix}
-| | ... | gateway=${dut2_to_dut1_ip2} | interface=${dut1_to_dut2_if2}
-| | ... | vrf=${fib_table_2}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip2} | ${ip_prefix}
-| | ... | gateway=${dut1_to_dut2_ip2} | interface=${dut2_to_dut1_if2}
-| | ... | vrf=${fib_table_2}
diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot
deleted file mode 100644
index 9c90bc39a4..0000000000
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright (c) 2019 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 ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| 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 | *Vpn routed forwarding - baseline IPv6*
-| ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two
-| ... | links in between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6
-| ... | *[Cfg] DUT configuration:* Each DUT is configured with two VRF tables;
-| ... | Separation of traffic is tested by IP packets; Neighbors and Routes are
-| ... | set on DUT nodes; IP addresses are set on DUT interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets
-| ... | are sent by TG on link to DUT1, DUT2 or back to TG; On receipt TG
-| ... | verifies packets for correctness and their IPv6 src-addr, dst-addr,
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:*
-
-*** Variables ***
-| ${fib_table_1}= | 9
-| ${fib_table_2}= | 99
-
-| ${dut1_to_tg_ip1}= | 2001:62::3
-| ${dut1_to_tg_ip2}= | 2001:62::4
-| ${dut2_to_tg_ip1}= | 2003:62::3
-| ${dut2_to_tg_ip2}= | 2003:62::4
-
-| ${dut1_to_dut2_ip1}= | 2002:62::1
-| ${dut1_to_dut2_ip2}= | 2002:62::2
-| ${dut2_to_dut1_ip1}= | 2002:62::3
-| ${dut2_to_dut1_ip2}= | 2002:62::4
-
-| ${tg_dut1_ip1}= | 2001:62::1
-| ${tg_dut1_ip2}= | 2001:62::2
-| ${tg_dut2_ip1}= | 2003:62::1
-| ${tg_dut2_ip2}= | 2003:62::2
-
-| ${ip_prefix}= | 64
-| ${timeout}= | 5
-
-*** Test Cases ***
-| TC01: TG packets routed to DUT ingress interface, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if1 and from
-| | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac}
-| | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1}
-| | ... | ${tg_dut1_ip1} | ${timeout}
-| | And Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac}
-| | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2}
-| | ... | ${tg_dut1_ip2} | ${timeout}
-
-| TC02: TG packets routed to DUT egress interface, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if1 and from
-| | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | ${timeout}
-| | And Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | ${timeout}
-
-| TC03: TG packets routed to DUT2 ingress interface through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if1 and from
-| | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | ${timeout}
-| | And Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | ${timeout}
-
-| TC04: TG packets routed to DUT2 egress interface through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if1 and from
-| | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | ${timeout}
-| | And Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | ${timeout}
-
-| TC05: TG packets routed to TG through DUT1 and DUT2, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if1 and from
-| | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived.
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1}
-| | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac}
-| | ... | ${tg_to_dut2_if1_mac}
-| | And Send packet and verify headers | ${tg_node}
-| | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2}
-| | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac}
-
-| TC06: TG packets not routed to DUT ingress interface in different VRF, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut1_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout}
-
-| TC07: TG packets not routed to DUT egress interface in different VRF, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | ${timeout}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip2} | ${timeout}
-
-
-| TC08: TG packets not routed to DUT2 ingress interface in different VRF through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | ${timeout}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip2} | ${timeout}
-
-| TC09: TG packets not routed to DUT2 egress interface in different VRF through DUT1, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if1}
-| | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac}
-| | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut1_if2}
-| | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac}
-| | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout}
-
-| TC10: TG packets not routed to TG in different VRF through DUT1 and DUT2, VPP configured with two VRFs
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG.
-| | ... | [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] DUT1 and DUT2 are both configured with two fib tables. Each
-| | ... | table is assigned to 2 interfaces to separate the traffic. Interfaces
-| | ... | are configured with IP addresses from *Variables*. Neighbors are
-| | ... | configured for each DUTs ingress/egress ports, and each VRF is
-| | ... | configured with just one route.
-| | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if2 where it
-| | ... | should not arrive.
-| | [Tags] | SKIP_PATCH
-| | Given Configure path in double-link 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in double-link 3-node circular topology up
-| | When Setup Env - 2xVRF Each Node
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1}
-| | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2}
-| | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip2}
-| | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if1}
-| | ... | ${dut2_to_tg_if1_mac} | ${tg_to_dut2_if1_mac}
-
-*** Keywords ***
-| Setup Env - 2xVRF Each Node
-| | [Documentation]
-| | ... | Environment is set up with 2 fib tables on each DUT. DUT1-TG-IF1 and \
-| | ... | DUT1-DUT2-IF1 are assigned to FIB1, and DUT1-TG-IF2 and DUT1-DUT2-IF2
-| | ... | are assigned to FIB2 (the same done on DUT2, just opposite).
-| | ... | IP addresses and IP Neighbors are subsequently set for interfaces.
-| | ... | The last setting is route for each fib table.
-| | ...
-| | ${dut1_if1_idx}= | Get Interface SW Index
-| | ... | ${dut1_node} | ${dut1_to_dut2_if1}
-| | ${dut1_if2_idx}= | Get Interface SW Index
-| | ... | ${dut1_node} | ${dut1_to_dut2_if2}
-| | ${dut2_if1_idx}= | Get Interface SW Index
-| | ... | ${dut2_node} | ${dut2_to_dut1_if1}
-| | ${dut2_if2_idx}= | Get Interface SW Index
-| | ... | ${dut2_node} | ${dut2_to_dut1_if2}
-
-| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Add Fib Table | ${dut1_node} | ${fib_table_2} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_dut2_if1} | ${fib_table_1} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_dut2_if2} | ${fib_table_2} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_tg_if1} | ${fib_table_1} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${fib_table_2} | ipv6=${TRUE}
-
-| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Add Fib Table | ${dut2_node} | ${fib_table_2} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_dut1_if1} | ${fib_table_1} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_dut1_if2} | ${fib_table_2} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_tg_if1} | ${fib_table_1} | ipv6=${TRUE}
-| | Assign Interface To Fib Table
-| | ... | ${dut2_node} | ${dut2_to_tg_if2} | ${fib_table_2} | ipv6=${TRUE}
-
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg_if1} | ${dut1_to_tg_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${dut1_to_tg_ip2} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_dut2_if1}
-| | ... | ${dut1_to_dut2_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_dut2_if2}
-| | ... | ${dut1_to_dut2_ip2} | ${ip_prefix}
-
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg_if1} | ${dut2_to_tg_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg_if2} | ${dut2_to_tg_ip2} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_dut1_if1}
-| | ... | ${dut2_to_dut1_ip1} | ${ip_prefix}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_dut1_if2}
-| | ... | ${dut2_to_dut1_ip2} | ${ip_prefix}
-
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac}
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if1}
-| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if1}
-| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac}
-
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac}
-| | And VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if2}
-| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if2}
-| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac}
-
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix}
-| | ... | gateway=${dut2_to_dut1_ip1} | interface=${dut1_to_dut2_if1}
-| | ... | vrf=${fib_table_1}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip1} | ${ip_prefix}
-| | ... | gateway=${dut1_to_dut2_ip1} | interface=${dut2_to_dut1_if1}
-| | ... | vrf=${fib_table_1}
-
-| | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip2} | ${ip_prefix}
-| | ... | gateway=${dut2_to_dut1_ip2} | interface=${dut1_to_dut2_if2}
-| | ... | vrf=${fib_table_2}
-| | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip2} | ${ip_prefix}
-| | ... | gateway=${dut1_to_dut2_ip2} | interface=${dut2_to_dut1_if2}
-| | ... | vrf=${fib_table_2}
-
-| | Vpp All RA Suppress Link Layer | ${nodes}
diff --git a/tests/vpp/func/l2xc/eth2p-eth-l2xcbase-func.robot b/tests/vpp/func/l2xc/eth2p-eth-l2xcbase-func.robot
deleted file mode 100644
index 37ccfc47cf..0000000000
--- a/tests/vpp/func/l2xc/eth2p-eth-l2xcbase-func.robot
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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/shared/default.robot
-| Resource | resources/libraries/robot/l2/l2_xconnect.robot
-| Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/vm/qemu.robot
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.NodePath
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2 cross-connect test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of IPv4;
-| ... | Eth-IPv6-ICMPv6 for L2 switching of IPv6 use. Both apply to all links.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | cross-connect (L2XC) switching.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets are
-| ... | sent in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv4 (IPv6) src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:*
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT1 and \
-| | ... | DUT2 configure L2 cross-connect (L2XC), each with one interface
-| | ... | to TG and one Ethernet interface towards the other DUT. [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]
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | And Configure L2XC | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2}
-| | And Configure L2XC | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
-| | Then Send ICMPv4 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
-
-| TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT1 and \
-| | ... | DUT2 configure L2 cross-connect (L2XC), each with one interface
-| | ... | to TG and one Ethernet interface towards the other DUT. [Ver]
-| | ... | Make TG send ICMPv6 Echo Req in both directions between two of
-| | ... | its interfaces to be switched by DUT1 and DUT2; verify all
-| | ... | packets are received. [Ref]
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | And Configure L2XC | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2}
-| | And Configure L2XC | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
-| | Then Send ICMPv6 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}