aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/func
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vpp/func')
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot119
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot96
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot158
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot215
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot490
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot140
-rw-r--r--tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot71
7 files changed, 0 insertions, 1289 deletions
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
deleted file mode 100644
index 3dbb2abb11..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ /dev/null
@@ -1,119 +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.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/features/dhcp_client.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.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 | DHCPv4 Client related test cases
-
-*** Variables ***
-| ${client_hostname}= | dhcp-client
-| ${client_ip}= | 192.168.23.10
-| ${client_mask}= | 255.255.255.0
-| ${server_ip}= | 192.168.23.1
-| ${own_xid}= | 11112222
-| ${lease_time}= | ${15}
-
-*** Test Cases ***
-| TC01: VPP sends a DHCP DISCOVER
-| | [Documentation] | Configure DHCPv4 client on interface to TG without
-| | ... | hostname and check if DHCPv4 DISCOVER message contains all
-| | ... | required fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
-
-| TC02: VPP sends a DHCPv4 DISCOVER with hostname
-| | [Documentation] | Configure DHCPv4 client on interface to TG with hostname
-| | ... | and check if DHCPv4 DISCOVER message contains all required
-| | ... | fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${client_hostname}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
-
-| TC03: VPP sends DHCPv4 REQUEST after OFFER
-| | [Documentation] | Configure DHCPv4 client on interface to TG and check if
-| | ... | DHCPv4 REQUEST message contains all required fields.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-
-| TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID
-| | [ Tags ] | EXPECTED_FAILING
-| | [Documentation] | Configure DHCPv4 client on interface to TG. If server
-| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4
-| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout
-| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-| | ... | offer_xid=${own_xid}
-
-| TC05: VPP honors DHCPv4 lease time
-| | [Documentation] | Send IP configuration to the VPP client via DHCPv4.
-| | ... | Address is checked with ICMP echo request and there should
-| | ... | be no reply for echo request when lease has expired.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | And Configure IP on client via DHCP
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${client_ip} | ${client_mask}
-| | ... | ${lease_time}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
-| | ... | ${tg_to_dut_if1_mac}
-| | Then Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip}
-| | ... | ${server_ip}
-| | And Sleep | ${lease_time}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${client_ip} | ${server_ip}
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
deleted file mode 100644
index 24514d018b..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
+++ /dev/null
@@ -1,96 +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.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/features/dhcp_proxy.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.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 | *DHCPv4 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... | with two links between the nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP-BOOTP-DHCP
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv4 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv4 packets are sent
-| ... | on TG on first link to DUT and received on TG on second link.
-| ... | On receive TG verifies if DHCPv4 packets are valid.
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 172.16.0.1
-| ${dut_to_tg_if2_ip}= | 192.168.0.1
-| ${dhcp_server_ip}= | 192.168.0.100
-| ${client_ip}= | 172.16.0.2
-| ${prefix_length}= | 24
-
-| ${discover_src_ip}= | 0.0.0.0
-| ${valid_discover_dst_ip}= | 255.255.255.255
-| ${invalid_discover_dst_ip}= | 255.255.255.1
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv4 request to DHCPv4 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4
-| | ... | server through DHCP proxy.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${True}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${dhcp_server_ip} | ${tg_to_dut_if2_mac}
-| | ... | ${client_ip} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip}
-
-| TC02: VPP proxy ignores invalid DHCPv4 request
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${True}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip}
-| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip}
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
deleted file mode 100644
index da1988defe..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
+++ /dev/null
@@ -1,158 +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.ProxyArp
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.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_SINGLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *RFC1027 Proxy ARP test cases*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with
-| ... | single link between nodes.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with Proxy ARP
-| ... | *[Ver] TG verification:* Test ARP Request packet is sent
-| ... | from TG on link to DUT1; on receive TG verifies ARP reply packet
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC1027.
-
-*** Variables ***
-| ${tg_to_dut1_ip}= | 10.0.0.100
-| ${dut1_to_tg_ip}= | 10.0.0.1
-| ${prefix_length}= | 24
-| ${lo_ip4_addr}= | 192.168.1.2
-| ${hi_ip4_addr}= | 192.168.1.10
-| ${pass_test_ip}= | 192.168.1.5
-| ${pass_test_lo_ip}= | 192.168.1.2
-| ${pass_test_hi_ip}= | 192.168.1.10
-| ${fail_test_lo_ip}= | 192.168.1.1
-| ${fail_test_hi_ip}= | 192.168.1.11
-
-*** Test Cases ***
-| TC01: DUT sends ARP reply on behalf of another machine from the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is in range.
-| | 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
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_ip}
-
-| TC02: DUT sends ARP reply on behalf of another machine from beginning of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is from beginning of the IP range.
-| | 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
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_lo_ip}
-
-| TC03: DUT sends ARP reply on behalf of another machine from end of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is from end of the IP range.
-| | 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
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_hi_ip}
-
-| TC04: DUT does not send ARP reply on behalf of another machine from below of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 does not send ARP reply on behalf of machine which
-| | ... | IP is from below of the IP range.
-| | 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
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name}
-| | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut1_ip}
-| | ... | ${fail_test_lo_ip}
-
-| TC05: DUT does not send ARP reply on behalf of another machine from above of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 does not send ARP reply on behalf of machine which
-| | ... | IP is from above of the IP range.
-| | 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
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name}
-| | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut1_ip}
-| | ... | ${fail_test_hi_ip}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
deleted file mode 100644
index 7a17c4cfd1..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
+++ /dev/null
@@ -1,215 +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/ip/map.robot
-| ...
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Lightweight 4 over 6 test cases*
-| ...
-| ... | LW4o6 is a subset of MAP-E, with per-subscriber rules. It uses the
-| ... | same tunneling mechanism and configuration as MAP-E. It does not use
-| ... | embedded address bits.
-| ...
-| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
-| ... | between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG_if1-DUT,
-| ... | Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured as lwAFTR.
-| ... | *[Ver] TG verification:* Test UDP ICMP Echo Request in IPv4 are
-| ... | sent to lwAFTR and are verified by TG for correctness their
-| ... | encapsulation in IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7596 RFC7597.
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${tg_ip6}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-
-| ${lw_ipv4_pfx}= | 20.0.0.1/32
-| ${lw_ipv6_pfx}= | 2001:1::/64
-| ${lw_ipv6_src}= | 2001:1::1
-| ${lw_psid_length}= | ${8}
-| ${lw_psid_offset}= | ${6}
-| ${lw_rule_psid}= | ${52}
-| ${lw_rule_ipv6_dst}= | 2001:1::2
-| ${lw_rule_2_psid}= | ${22}
-| ${lw_rule_2_ipv6_dst}= | 2001:1::3
-| ${test_ipv4_inside}= | 20.0.0.1
-| ${test_ipv4_outside}= | 10.0.0.100
-# test_port depends on psid, length, offset
-| ${test_port}= | ${1232}
-| ${test_icmp_id}= | ${1232}
-| ${test_2_port}= | ${6232}
-
-*** Test Cases ***
-| TC01: Encapsulate IPv4 into IPv6. IPv6 dst depends on IPv4 and UDP destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-UDP on TG_if1-DUT, Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send non-encapsulated UDP to DUT; verify TG received
-| | ... | IPv4oIPv6 encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 UDP and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${test_ipv4_inside} | ${test_ipv4_outside}
-| | ... | ${test_port} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_ipv6_dst} | ${lw_ipv6_src}
-
-TC02: Encapsulate IPv4 ICMP into IPv6. IPv6 dst depends on IPv4 addr and ICMP ID
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-ICMP(type 0 and 8) on TG_if1-DUT, Eth-IPv6-IPv4-ICMP
-| | ... | on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send non-encapsulated ICMP to DUT; verify TG received
-| | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6
-| | ... | destination based on ICMP Identifier field.
-| | ... | [Ref] RFC7596 section 8.1
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 ICMP and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${test_ipv4_inside} | ${test_ipv4_outside}
-| | ... | ${test_icmp_id} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_ipv6_dst} | ${lw_ipv6_src}
-
-TC03: Decapsulate IPv4 UDP from IPv6.
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv6-IPv4-UDP on TG_if2_DUT, Eth-IPv4-UDP on TG_if1-DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send encapsulated UDP to DUT; verify TG received
-| | ... | IPv4 non-encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${test_ipv4_outside}
-| | ... | ${tg_to_dut_if1_mac}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 UDP in IPv6 and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${lw_ipv6_src} | ${lw_rule_ipv6_dst}
-| | ... | ${test_ipv4_outside} | ${test_ipv4_inside} | ${test_port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-
-TC04: Hairpinning of traffic between two lwB4
-| | [Documentation]
-| | ... | [Top] DUT1-TG.
-| | ... | [Enc] Eth-IPv6-IPv4-UDP on TG_if2_DUT, Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and two Map rules.
-| | ... | [Ver] Make TG send encapsulated UDP to DUT; verify TG received
-| | ... | encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_2_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_2_psid}
-| | ... | ${lw_rule_2_ipv6_dst}
-| | Then Send IPv4 UDP in IPv6 and check headers for lightweight hairpinning
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if2_mac}
-| | ... | ${lw_ipv6_src} | ${lw_rule_ipv6_dst}
-| | ... | ${test_ipv4_inside} | ${test_ipv4_inside}
-| | ... | ${test_2_port} | ${test_port}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_2_ipv6_dst} | ${lw_ipv6_src}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
deleted file mode 100644
index 47f88ff347..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
+++ /dev/null
@@ -1,490 +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/ip/map.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Variables | resources/test_data/softwire/map_e_domains.py | ${5}
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ... | SOFTWIRE
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Test for Basic mapping rule for MAP-E*\
-| ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the
-| ... | nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG-to-DUT-if1.
-| ... | Eth-IPv6-IPv4-UDP on TG-to-DUT-if2.
-| ... | *[Cfg] DUT configuration:* DUT is configured with IPv4 on one DUT-to-TG
-| ... | interface and IPv6 address on second DUT-to-TG interface. MAP-E domain
-| ... | is configured in test template based on test parameters.
-| ... | *[Ver] TG verification:* UDP packets in IPv4 are sent by TG to
-| ... | destination in MAP domain. IPv6 packets with encapsulated IPv4 are
-| ... | received on TG interface.
-| ... | *[Ref] Applicable standard specifications:* RFC7597.
-
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${dut_ip4_gw}= | 10.0.0.2
-| ${dut_ip6_gw}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-| ${ipv6_br_src}= | 2001:db8:ffff::1
-| ${ipv4_outside}= | 1.0.0.1
-
-
-*** Test Cases ***
-| TC01: BMR, then an IPv4 prefix is assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length < 32 (o + r < 32)
-| | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |=================|===============|================|============|=============|==========|================|==========|==================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |=================|===============|================|============|=============|==========|================|==========|==================================|
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a000::14a0:0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a900::14a9:0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c0::14a9:c000:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9::14a9:c900:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:d000:0:14a9:c9d0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${23} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:da00:0:14a9:c9da:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:d000::14a9:c9d0:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${7} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:da00::14a9:c9da:0 |
-
-
-| TC02: BMR, full IPv4 address is to be assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length == 32 (o + r == 32)
-| | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|===============|================|============|=============|==========|================|==========|==================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |===================|===============|================|============|=============|==========|================|==========|==================================|
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:db00:0:14a9:c9db:0 |
-| | 20.160.0.0/12 | 2001:db8::/32 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:9c9d:b000:0:14a9:c9db:0 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:c9db::14a9:c9db:0 |
-| | 20.169.200.0/22 | 2001:db8::/32 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:76c0::14a9:c9db:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:db00::14a9:c9db:0 |
-| | 20.169.201.208/28 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:b000::14a9:c9db:0 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8::14a9:c9db:0 |
-| | 20.0.0.0/8 | 2001:db8::/40 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9:c9db:0:14a9:c9db:0 |
-| | 20.160.0.0/12 | 2001:db8::/44 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:9:c9db:0:14a9:c9db:0 |
-| | 20.169.0.0/16 | 2001:db8::/48 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:0:c9db:0:14a9:c9db:0 |
-| | 20.169.200.0/22 | 2001:db8::/54 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:0:1db:0:14a9:c9db:0 |
-
-
-| TC03: BMR, shared IPv4 address is to be assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length > 32 (o + r > 32)
-| | ... | ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|===============|================|============|=============|==========|================|==========|===================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |===================|===============|================|============|=============|==========|================|==========|===================================|
-| | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:3400::14a9:c9db:34 |
-
-| | 20.0.0.0/8 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:a9:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9:db34::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db:3400::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:34::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:3400::14a9:c9db:34 |
-
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:db34:0:14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/24 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9:db34::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/24 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db:3400::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/16 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db34::14a9:c9db:34 |
-
-| | 20.160.0.0/12 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${5} | 20.169.201.219 | ${1232} | 2001:db8:9c9d:b300:0:14a9:c9db:6 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-| | 20.169.192.0/20 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${5} | 20.169.201.219 | ${1232} | 2001:db8:9db3::14a9:c9db:6 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${12} | ${6} | ${4} | 20.169.201.219 | ${1232} | 2001:db8:db30::14a9:c9db:3 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${12} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-
-| TC04: End user IPv6 prefix is 64
-| | [Documentation]
-| | ... | Supported End-User IPv6 prefix length is 64 bit.
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|=========================|================|============|=============|==========|================|==========|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port |
-# |===================|=========================|================|============|=============|==========|================|==========|
-| | 20.0.0.0/8 | 2001:db8:0012:3400::/56 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 20.169.201.208/28 | 2001:db8:0012:3400::/56 | ${ipv6_br_src} | ${8} | ${5} | ${4} | 20.169.201.219 | ${3280} |
-| | 20.0.0.0/8 | 2001:db8:0012:3400::/64 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 20.169.201.219/32 | 2001:db8:0012:3400::/64 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-
-
-| TC05: IPv4 prefix is 0
-| | [Tags] | EXPECTED_FAILING
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|=========================|================|============|=============|==========|================|==========|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port |
-# |===================|=========================|================|============|=============|==========|================|==========|
-| | 0.0.0.0/0 | 2001:db8:0000::/40 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:db8:0000::/40 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:d00::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} |
-
-
-| TC06: Multiple domain and check with traffic script IPv4 source IPv6 destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Send IPv4 to destination in configured domain and receive IPv6\
-| | ... | packet.
-| | ... | [Ref] RFC7597.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | :FOR | ${ip_set} | IN | @{ip_sets}
-| | | ${ipv4}= | Get From List | ${ip_set} | 0
-| | | ${ipv6}= | Get From List | ${ip_set} | 1
-| | | ${port}= | Get From List | ${ip_set} | 2
-| | | ${ipv6_br}= | Get From List | ${ip_set} | 3
-| | | Then Send IPv4 UDP And Check Headers For Lightweight 4over6
-| | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | | ... | ${dut_to_tg_if1_mac} | ${ipv4} | ${ipv4_outside} | ${port}
-| | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${ipv6} | ${ipv6_br}
-| | | And Send IPv4 UDP In IPv6 And Check Headers For Lightweight 4over6
-| | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} | ${ipv6_br} | ${ipv6}
-| | | ... | ${ipv4_outside} | ${ipv4} | ${port} | ${tg_to_dut_if1_mac}
-| | | ... | ${dut_to_tg_if1_mac}
-
-
-| TC07: Multiple domain and check with traffic script IPv6 source IPv6 destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Send IPv4 encapsulated in IPv6. Source and destination are from\
-| | ... | configured domains. Check if VPP translate IPv6 addresses.
-| | ... | [Ref] RFC7597.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | ${ip_set_A}= | Get From List | ${ip_sets} | 0
-| | ${ip_set_B}= | Get From List | ${ip_sets} | 1
-| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
-| | ${port_A}= | Get From List | ${ip_set_A} | 2
-| | ${port_B}= | Get From List | ${ip_set_B} | 2
-| | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
-| | ${ipv6_B}= | Get From List | ${ip_set_B} | 1
-| | ${ipv4_A}= | Get From List | ${ip_set_A} | 0
-| | ${ipv4_B}= | Get From List | ${ip_set_B} | 0
-| | Then Send IPv4 UDP In IPv6 And Check Headers For Lightweight Hairpinning
-| | ... | ${tg_node} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_br} | ${ipv6_A}
-| | ... | ${ipv4_B} | ${ipv4_A}
-| | ... | ${port_B} | ${port_A}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_B} | ${ipv6_br}
-
-
-| TC08: Encapsulate IPv4 ICMP into IPv6
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-ICMP(type 0 and 8) on TG_if1-DUT, Eth-IPv6-IPv4-ICMP\
-| | ... | on TG_if2_DUT.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Make TG send non-encapsulated ICMP to DUT; verify TG received\
-| | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6 destination\
-| | ... | based on ICMP Identifier field.
-| | ... | [Ref] RFC7597 section 8.2.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | ${ip_set_A}= | Get From List | ${ip_sets} | 0
-| | ${ipv4_A}= | Get From List | ${ip_set_A} | 0
-| | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
-| | ${icmp_id_A}= | Get From List | ${ip_set_A} | 2
-| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
-| | Then Send IPv4 ICMP And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_A} | ${ipv4_outside}
-| | ... | ${icmp_id_A} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_A} | ${ipv6_br}
-
-
-| TC09: Repeated ip neighbor command doesnt put FIB to broken state
-| | [Documentation] |
-| | ... | Original issue described in https://jira.fd.io/browse/VPP-312.
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] IP address are set on interfaces, ip neighbor multiple times
-| | ... | [Ver] FIB is not in broken state. The steps are add route, \
-| | ... | check with traffic then add same route
-| | ... | again and check with traffic script.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | Then Check MAP Configuration With Traffic Script
-| | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8}
-| | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34
-| | When Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | Then Check MAP Configuration With Traffic Script
-| | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8}
-| | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34
-
-
-| Bug: VPP-318
-| | [Tags] | EXPECTED_FAILING
-| | [Documentation] | qlen < psid length
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Then Run Keyword And Expect Error | Unable to add map domain *
-| | ... | Map Add Domain | ${dut_node} | 20.169.0.0/16 | 2001:db8::/32
-| | ... | ${ipv6_br_src} | ${20} | ${6} | ${8}
-
-
-*** Keywords ***
-| Set Interfaces IP Addresses And Routes
-| | Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | Set interfaces in 2-node circular topology up
-| | Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | ${ipv4_outside} | 32 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-
-| Check MAP Configuration With Traffic Script
-| | [Documentation]
-| | ... | Used as a test case template.\
-| | ... | Configure MAP-E domain with given parameters, with traffic script send
-| | ... | UDP in IPv4 packet to given UDP destination port and IP destination
-| | ... | address and check if correctly received IPv6 packet. Vice versa send
-| | ... | IPv6 packet and check if received IPv4 packet with correct source
-| | ... | address.
-| | ... | The MAP domain is deleted in teardown.
-| | ... | The expected IPv6 address is compared with computed IPv6 address.
-| | [Arguments] | ${ipv4_pfx} | ${ipv6_pfx} | ${ipv6_br_src} | ${ea_bit_len}
-| | ... | ${psid_offset} | ${psid_len} | ${ipv4_dst} | ${dst_port}
-| | ... | ${expected_ipv6_dst}=${EMPTY}
-| | ${domain_index}= | Map Add Domain | ${dut_node} | ${ipv4_pfx} | ${ipv6_pfx}
-| | ... | ${ipv6_br_src} | ${ea_bit_len} | ${psid_offset} | ${psid_len}
-| | ${computed_ipv6_dst}= | Compute IPv6 Map Destination Address
-| | ... | ${ipv4_pfx} | ${ipv6_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${ipv4_dst} | ${dst_port}
-| | ${ipv6_dst}= | Run Keyword If | "${expected_ipv6_dst}" == "${EMPTY}"
-| | ... | Set Variable | ${computed_ipv6_dst}
-| | ... | ELSE | Set Variable | ${expected_ipv6_dst}
-| | Run Keyword If | "${expected_ipv6_dst}" != "${EMPTY}"
-| | ... | IP Addresses Should Be Equal
-| | ... | ${computed_ipv6_dst} | ${expected_ipv6_dst}
-| | ${ipv6_dst}= | Set Variable | ${computed_ipv6_dst}
-| | Check Encapsulation With Traffic Script
-| | ... | ${ipv4_dst} | ${dst_port} | ${ipv6_dst}
-| | Check Decapsulation With Traffic Script
-| | ... | ${ipv6_dst} | ${ipv4_dst} | ${dst_port}
-| | [Teardown] | Run Keywords
-| | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND
-| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
-| | ... | Clear Packet Trace On All DUTs | ${nodes} | AND
-| | ... | Verify VPP PID in Teardown
-
-| Check Encapsulation With Traffic Script
-| | [Arguments] | ${ipv4_dst} | ${dst_port} | ${ipv6_dst}
-| | Send IPv4 UDP And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_dst} | ${ipv4_outside}
-| | ... | ${dst_port} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_dst} | ${ipv6_br_src}
-
-| Check Decapsulation With Traffic Script
-| | [Arguments] | ${ipv6_ce_addr} | ${ipv4_inside} | ${port}
-| | Send IPv4 UDP In IPv6 And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${ipv6_br_src} | ${ipv6_ce_addr}
-| | ... | ${ipv4_outside} | ${ipv4_inside} | ${port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
deleted file mode 100644
index a9c32a90bf..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
+++ /dev/null
@@ -1,140 +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/ip/map.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE
-| ...
-| Test Setup | Run Keywords | Set up functional test
-| ... | AND | Set interfaces IP addresses and routes
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Test for Basic mapping rule for MAP-T*\
-| ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the
-| ... | nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG-to-DUT-if1.
-| ... | Eth-IPv6-UDP on TG-to-DUT-if2.
-| ... | *[Cfg] DUT configuration:* DUT is configured with IPv4 on one DUT-to-TG
-| ... | interface and IPv6 address on second DUT-to-TG interface. MAP-T domain
-| ... | is configured in test template based on test parameters.
-| ... | *[Ver] TG verification:* UDP packets in IPv4 are sent by TG to
-| ... | destination in MAP domain. IPv6 packets with translated IPv4 addresses
-| ... | are received on TG interface.
-| ... | *[Ref] Applicable standard specifications:* RFC7599
-
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${dut_ip4_gw}= | 10.0.0.2
-| ${dut_ip6_gw}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-| ${ipv6_br_src}= | 2001:db8:ffff::/96
-
-
-*** Test Cases ***
-| TC01: MAP-T test
-| | [Documentation] |
-| | ... | Test to check map-t address translation.
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_dst_pfx
-| | ... | - ipv6_src_pfx
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_src
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ...
-| | [Template] | Check MAP-T configuration with traffic script
-# |===================|===============|================|============|=============|==========|===========|================|==========|
-# | ipv4_pfx | ipv6_dst_pfx | ipv6_src_pfx | ea_bit_len | psid_offset | psid_len | ipv4_src | ipv4_dst | dst_port |
-# |===================|===============|================|============|=============|==========|===========|================|==========|
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${40} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-| | 20.0.0.0/8 | 2001:db8::/40 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-#| | 20.169.201.0/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${6} | ${8} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-#| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${6} | ${8} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-
-
-*** Keywords ***
-| Set interfaces IP addresses and routes
-| | Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | Set interfaces in 2-node circular topology up
-| | Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | VPP Add IP neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | VPP Add IP neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-
-| Check MAP-T configuration with traffic script
-| | [Documentation] |
-| | ... | Used as a test case template.\
-| | ... | Configure MAP-T domain with given parameters, with traffic script send
-| | ... | UDP in IPv4 packet to given UDP destination port and IP destination
-| | ... | address and check if correctly received IPv6 packet with translated
-| | ... | source and destination addresses. Vice versa send IPv6 packet and
-| | ... | check if received IPv4 packet with correct source and destination
-| | ... | addresses.
-| | ... | The MAP domain is deleted in teardown.
-| | [Arguments] | ${ipv4_pfx} | ${ipv6_dst_pfx} | ${ipv6_src_pfx}
-| | ... | ${ea_bit_len} | ${psid_offset} | ${psid_len}
-| | ... | ${ipv4_outside} | ${ipv4_inside} | ${dst_port}
-| | ${domain_index}= | Map Add Domain | ${dut_node} | ${ipv4_pfx}
-| | ... | ${ipv6_dst_pfx} | ${ipv6_src_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${TRUE}
-| | ${ipv6_ce_addr}= | Compute IPv6 map destination address
-| | ... | ${ipv4_pfx} | ${ipv6_dst_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${ipv4_inside} | ${dst_port}
-| | ${ipv6_br_addr}= | Compute IPv6 map source address
-| | ... | ${ipv6_src_pfx} | ${ipv4_outside}
-# Check translation from v4 to v6 with traffic script
-| | Send IPv4 UDP and check IPv6 headers for MAP-T
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_inside} | ${ipv4_outside} | ${dst_port}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_ce_addr} | ${ipv6_br_addr}
-# Check translation from v6 to v4 with traffic script
-| | Send IPv6 UDP and check IPv4 headers for MAP-T
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${ipv6_br_addr} | ${ipv6_ce_addr}
-| | ... | ${dst_port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-| | ... | ${ipv4_outside} | ${ipv4_inside}
-| | [Teardown] | Run Keywords
-| | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND
-| | ... | Show packet trace on all DUTs | ${nodes} | AND
-| | ... | Clear packet trace on all DUTs | ${nodes} | AND
-| | ... | Verify VPP PID in Teardown
diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
deleted file mode 100644
index 7611cbcbd4..0000000000
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
+++ /dev/null
@@ -1,71 +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/features/dhcp_proxy.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.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 | *DHCPv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... | with two links between the nodes.
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv6 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv6 packets are sent
-| ... | on TG on first link to DUT and received on TG on second link.
-| ... | On receive TG verifies if DHCPv6 packets are valid
-| ... | *[Ref] Applicable standard specifications:* RFC 3315
-
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 3ffe:62::1
-| ${dut_to_tg_if2_ip}= | 3ffe:63::1
-| ${dhcp_server_ip}= | 3ffe:63::2
-| ${prefix_length}= | 64
-
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv6 request to DHCPv6 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT
-| | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching DHCPv6 packets between client and \
-| | ... | DHCPv6 server through DHCPv6 proxy.
-| | ... | [Ref] RFC 3315
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | local=${TRUE}
-| | And VPP Add IP Neighbor | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dhcp_server_ip} | ${tg_to_dut_if2_mac}
-| | And Vpp All Ra Suppress Link Layer | ${nodes}
-| | When DHCP Proxy Config
-| | ... | ${dut_node} | ${dhcp_server_ip} | ${dut_to_tg_if1_ip}
-| | Then Send DHCPv6 Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_ip} | ${dut_to_tg_if1_mac} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if2_mac}