aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-07-26 10:47:30 +0000
committerPeter Mikus <pmikus@cisco.com>2019-07-29 05:44:37 +0000
commitb5ee1c015e90ff59c1c5841654206c0576576e4c (patch)
treea4f9529fc0f8ff678049fd9bd46c98e2ecf55c4a
parent0e853acbf246dde97bf8b376cffca1aefdf1aa7b (diff)
Remove obsolete L2 KW
Change-Id: I9a8aa6f5ccf95d632f4e677c8bf14f50b982d930 Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/robot/ip/ip4.robot248
-rw-r--r--resources/libraries/robot/ip/ip6.robot219
-rw-r--r--resources/libraries/robot/overlay/gre.robot139
-rw-r--r--resources/libraries/robot/overlay/l2lisp.robot77
-rw-r--r--resources/libraries/robot/overlay/vxlan.robot24
-rw-r--r--resources/libraries/robot/shared/traffic.robot210
-rw-r--r--resources/libraries/robot/telemetry/span.robot58
-rw-r--r--tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot311
-rw-r--r--tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot97
-rw-r--r--tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot111
-rw-r--r--tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot113
-rw-r--r--tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot98
-rw-r--r--tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot113
13 files changed, 210 insertions, 1608 deletions
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot
index 1307eb89a9..76aeab84d2 100644
--- a/resources/libraries/robot/ip/ip4.robot
+++ b/resources/libraries/robot/ip/ip4.robot
@@ -14,30 +14,12 @@
*** Settings ***
| Library | resources.libraries.python.InterfaceUtil
| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.TrafficScriptExecutor
| ...
-| Resource | resources/libraries/robot/shared/counters.robot
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
| ...
| Documentation | IPv4 keywords
*** Keywords ***
-| Get interface Ipv4 addresses
-| | [Documentation] | Get IPv4 address for the given interface of the node.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - DUT node data. Type: dictionary
-| | ... | - interface - Name of the interface on the VPP node. Type: string
-| | ...
-| | [Arguments] | ${node} | ${interface}
-| | ...
-| | [Return] | ${ip_data}
-| | ...
-| | ${ip_data}= | VPP get interface ip addresses
-| | ... | ${node} | ${interface} | ipv4
-
| Configure IP addresses on interfaces
| | [Documentation] | Iterates through @{args} list and set interface IP address
| | ... | for every (${dut_node}, ${interface}, ${address},
@@ -60,233 +42,3 @@
| | :FOR | ${dut_node} | ${interface} | ${address} | ${prefix} | IN | @{args}
| | | VPP Interface Set IP Address
| | | ... | ${dut_node} | ${interface} | ${address} | ${prefix}
-
-| Send ICMP echo request and verify answer
-| | [Documentation] | Run traffic script that waits for ICMP reply and ignores
-| | ... | all other packets.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node where run traffic script. Type: dictionary
-| | ... | - tg_interface - TG interface where send ICMP echo request.
-| | ... | Type: string
-| | ... | - dst_mac - Destination MAC address. Type: string
-| | ... | - src_mac - Source MAC address. Type: string
-| | ... | - dst_ip - Destination IP address. Type: string
-| | ... | - src_ip - Source IP address. Type: string
-| | ... | - timeout - Wait timeout in seconds (Default: 10). Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send ICMP echo request and verify answer \
-| | ... | \| ${nodes['TG']} \| eth2 \
-| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \
-| | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface}
-| | ... | ${dst_mac} | ${src_mac} | ${dst_ip} | ${src_ip} | ${timeout}=${10}
-| | ...
-| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
-| | ${args}= | Catenate | --rx_if ${tg_interface_name}
-| | ... | --tx_if ${tg_interface_name} | --dst_mac ${dst_mac}
-| | ... | --src_mac ${src_mac} | --dst_ip ${dst_ip} | --src_ip ${src_ip}
-| | ... | --timeout ${timeout}
-| | Run Traffic Script On Node | send_icmp_wait_for_reply.py
-| | ... | ${tg_node} | ${args}
-
-| Configure IPv4 forwarding in circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node
-| | ... | circular topology. Get the interface MAC addresses and setup ARP on
-| | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG
-| | ... | links. In case of 3-node topology setup IPv4 adresses with /30 prefix
-| | ... | on DUT1-DUT2 link and set routing on both DUT nodes with prefix /24
-| | ... | and next hop of neighbour DUT interface IPv4 address. Configure route
-| | ... | entries for remote hosts IPv4 addresses if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip4 - IP address of TG interface1. Type: string
-| | ... | - tg_if2_ip4 - IP address of TG interface2. Type: string
-| | ... | - dut1_if1_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - dut2_if1_ip4 - IP address of DUT2 interface1 (Optional).
-| | ... | Type: string
-| | ... | - dut2_if2_ip4 - IP address of DUT2 interface2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host1_ip4 - IP address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip4 - IP address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip4_prefix - IP address prefix for host IP addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \|
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \
-| | ... | \| remote_host1_ip4=192.168.0.1 \| remote_host2_ip4=192.168.0.2 \
-| | ... | \| remote_host_ip4_prefix=32 \|
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \
-| | ... | \| 20.20.20.1 \|
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \
-| | ... | \| 20.20.20.1 \| remote_host1_ip4=192.168.0.1 \
-| | ... | \| remote_host2_ip4=192.168.0.2 \| remote_host_ip4_prefix=32 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4}
-| | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4}=${NONE} | ${dut2_if2_ip4}=${NONE}
-| | ... | ${remote_host1_ip4}=${NONE} | ${remote_host2_ip4}=${NONE}
-| | ... | ${remote_host_ip4_prefix}=${NONE}
-| | ...
-| | Configure interfaces in path up
-| | ...
-| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Variable Should Exist | ${dut2_node}
-| | ...
-| | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Configure IPv4 forwarding in 3-node circular topology
-| | ... | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4} | ${dut1_if2_ip4}
-| | ... | ${dut2_if1_ip4} | ${dut2_if2_ip4} | ${remote_host1_ip4}
-| | ... | ${remote_host2_ip4} | ${remote_host_ip4_prefix}
-| | ... | ELSE
-| | ... | Configure IPv4 forwarding in 2-node circular topology
-| | ... | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4} | ${dut1_if2_ip4}
-| | ... | remote_host1_ip4=${remote_host1_ip4}
-| | ... | remote_host2_ip4=${remote_host2_ip4}
-| | ... | remote_host_ip4_prefix=${remote_host_ip4_prefix}
-
-| Configure IPv4 forwarding in 2-node circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces on DUT node in 2-node circular
-| | ... | topology. Get the interface MAC addresses and setup ARP on
-| | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG
-| | ... | links. Configure route entries for remote hosts IPv4 addresses
-| | ... | if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip4 - IP address of TG interface1. Type: string
-| | ... | - tg_if2_ip4 - IP address of TG interface2. Type: string
-| | ... | - dut1_if1_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - remote_host1_ip4 - IP address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip4 - IP address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip4_prefix - IP address prefix for host IP addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \|
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \
-| | ... | \| 192.168.0.1 \| 192.168.0.2 \| 32 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4}
-| | ... | ${dut1_if2_ip4} | ${remote_host1_ip4}=${NONE}
-| | ... | ${remote_host2_ip4}=${NONE} | ${remote_host_ip4_prefix}=${NONE}
-| | ...
-| | ${dut_tg_ip4_prefix}= | Set Variable | 24
-| | ...
-| | VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip4}
-| | ... | ${tg_to_dut_if1_mac}
-| | VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${tg_if2_ip4}
-| | ... | ${tg_to_dut_if2_mac}
-| | ...
-| | Configure IP addresses on interfaces | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${dut1_if1_ip4} | ${dut_tg_ip4_prefix}
-| | Configure IP addresses on interfaces | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${dut1_if2_ip4} | ${dut_tg_ip4_prefix}
-| | ...
-| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4}
-| | ... | interface=${dut_to_tg_if1}
-| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4}
-| | ... | interface=${dut_to_tg_if2}
-
-| Configure IPv4 forwarding in 3-node circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
-| | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
-| | ... | interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG links.
-| | ... | Configure IPv4 adresses with /30 prefix on DUT1-DUT2 link and set
-| | ... | routing on both DUT nodes with prefix /24 and next hop of neighbour
-| | ... | DUT interface IPv4 address. Configure route entries for remote hosts
-| | ... | IPv4 addresses if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip4 - IP address of TG interface1. Type: string
-| | ... | - tg_if2_ip4 - IP address of TG interface2. Type: string
-| | ... | - dut1_if1_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip4 - IP address of DUT1 interface1. Type: string
-| | ... | - dut2_if1_ip4 - IP address of DUT2 interface1. Type: string
-| | ... | - dut2_if2_ip4 - IP address of DUT2 interface2. Type: string
-| | ... | - remote_host1_ip4 - IP address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip4 - IP address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip4_prefix - IP address prefix for host IP addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \
-| | ... | \| 20.20.20.1 \|
-| | ... | \| Configure IPv4 forwarding in circular topology \
-| | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \
-| | ... | \| 20.20.20.1 \| 192.168.0.1 \| 192.168.0.2 \| 32 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4}
-| | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut2_if2_ip4}
-| | ... | ${remote_host1_ip4}=${NONE} | ${remote_host2_ip4}=${NONE}
-| | ... | ${remote_host_ip4_prefix}=${NONE}
-| | ...
-| | ${dut_tg_ip4_prefix}= | Set Variable | 24
-| | ${dut_link_ip4_prefix}= | Set Variable | 30
-| | ...
-| | VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg_if1_ip4}
-| | ... | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_if1_ip4}
-| | ... | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_if2_ip4}
-| | ... | ${dut1_to_dut2_mac}
-| | VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg_if2_ip4}
-| | ... | ${tg_to_dut2_mac}
-| | ...
-| | Configure IP addresses on interfaces | ${dut1_node} | ${dut1_to_tg}
-| | ... | ${dut1_if1_ip4} | ${dut_tg_ip4_prefix}
-| | Configure IP addresses on interfaces | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${dut1_if2_ip4} | ${dut_link_ip4_prefix}
-| | Configure IP addresses on interfaces | ${dut2_node} | ${dut2_to_dut1}
-| | ... | ${dut2_if1_ip4} | ${dut_link_ip4_prefix}
-| | Configure IP addresses on interfaces | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${dut2_if2_ip4} | ${dut_tg_ip4_prefix}
-| | ...
-| | Vpp Route Add | ${dut1_node} | ${tg_if2_ip4} | ${dut_tg_ip4_prefix}
-| | ... | gateway=${dut2_if1_ip4} | interface=${dut1_to_dut2}
-| | Vpp Route Add | ${dut2_node} | ${tg_if1_ip4} | ${dut_tg_ip4_prefix}
-| | ... | gateway=${dut1_if2_ip4} | interface=${dut2_to_dut1}
-| | ...
-| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4}
-| | ... | interface=${dut1_to_tg}
-| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${dut2_if1_ip4}
-| | ... | interface=${dut1_to_dut2}
-| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${dut1_if2_ip4}
-| | ... | interface=${dut2_to_dut1}
-| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4}
-| | ... | interface=${dut2_to_tg}
diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot
index 8de302197e..647bd466df 100644
--- a/resources/libraries/robot/ip/ip6.robot
+++ b/resources/libraries/robot/ip/ip6.robot
@@ -16,233 +16,14 @@
| Library | resources.libraries.python.IPUtil
| Library | resources.libraries.python.IPv6Util
| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.TrafficScriptExecutor
| ...
-| Resource | resources/libraries/robot/shared/counters.robot
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
| ...
| Documentation | IPv6 keywords
*** Keywords ***
-| Get interface Ipv6 addresses
-| | [Documentation] | Get IPv6 address for the given interface of the node.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - DUT node data. Type: dictionary
-| | ... | - interface - Name of the interface on the VPP node. Type: string
-| | ...
-| | [Arguments] | ${node} | ${interface}
-| | ...
-| | [Return] | ${ip_data}
-| | ...
-| | ${ip_data}= | VPP get interface ip addresses
-| | ... | ${node} | ${interface} | ipv6
-
| Suppress ICMPv6 router advertisement message
| | [Documentation] | Suppress ICMPv6 router advertisement message for link
| | ... | scope address
| | [Arguments] | ${nodes}
| | Vpp All Ra Suppress Link Layer | ${nodes}
-
-| Configure IPv6 forwarding in circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node
-| | ... | circular topology. Get the interface MAC addresses and setup ARP on
-| | ... | all VPP interfaces. Setup IPv6 addresses with /64 prefix on DUT-TG
-| | ... | links. In case of 3-node topology setup IPv6 adresses with /96 prefix
-| | ... | on DUT1-DUT2 link and set routing on both DUT nodes with prefix /64
-| | ... | and next hop of neighbour DUT interface IPv6 address. Configure route
-| | ... | entries for remote hosts IPv6 addresses if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip6 - IPv6 address of TG interface1. Type: string
-| | ... | - tg_if2_ip6 - IPv6 address of TG interface2. Type: string
-| | ... | - dut1_if1_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - dut2_if1_ip6 - IPv6 address of DUT2 interface1 (Optional).
-| | ... | Type: string
-| | ... | - dut2_if2_ip6 - IPv6 address of DUT2 interface2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host1_ip6 - IPv6 address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip6 - IPv6 address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip6_prefix - IPv6 address prefix for host IPv6 addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \|
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \
-| | ... | \| remote_host1_ip6=3ffe:5f::1 \| remote_host2_ip6=3ffe:5f::2 \
-| | ... | \| remote_host_ip6_prefix=128 \|
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \
-| | ... | \| 2001:2::1 \|
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \
-| | ... | \| 2001:2::1 \| remote_host1_ip4=3ffe:5f::1 \
-| | ... | \| remote_host2_ip4=3ffe:5f::2 \| remote_host_ip4_prefix=128 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6}
-| | ... | ${dut1_if2_ip6} | ${dut2_if1_ip6}=${NONE} | ${dut2_if2_ip6}=${NONE}
-| | ... | ${remote_host1_ip6}=${NONE} | ${remote_host2_ip6}=${NONE}
-| | ... | ${remote_host_ip6_prefix}=${NONE}
-| | ...
-| | ...
-| | Configure interfaces in path up
-| | ...
-| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Variable Should Exist | ${dut2_node}
-| | ...
-| | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Configure IPv6 forwarding in 3-node circular topology
-| | ... | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6} | ${dut1_if2_ip6}
-| | ... | ${dut2_if1_ip6} | ${dut2_if2_ip6} | ${remote_host1_ip6}
-| | ... | ${remote_host2_ip6} | ${remote_host_ip6_prefix}
-| | ... | ELSE
-| | ... | Configure IPv6 forwarding in 2-node circular topology
-| | ... | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6} | ${dut1_if2_ip6}
-| | ... | remote_host1_ip6=${remote_host1_ip6}
-| | ... | remote_host2_ip6=${remote_host2_ip6}
-| | ... | remote_host_ip6_prefix=${remote_host_ip6_prefix}
-
-| Configure IPv6 forwarding in 2-node circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces on DUT node in 2-node circular
-| | ... | topology. Get the interface MAC addresses and setup ARP on
-| | ... | all VPP interfaces. Setup IPv6 addresses with /64 prefix on DUT-TG
-| | ... | links. Configure route entries for remote hosts IPv6 addresses
-| | ... | if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip6 - IPv6 address of TG interface1. Type: string
-| | ... | - tg_if2_ip6 - IPv6 address of TG interface2. Type: string
-| | ... | - dut1_if1_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - remote_host1_ip6 - IPv6 address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip6 - IPv6 address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip6_prefix - IPv6 address prefix for host IPv6 addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \|
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \
-| | ... | \| remote_host1_ip6=3ffe:5f::1 \| remote_host2_ip6=3ffe:5f::2 \
-| | ... | \| remote_host_ip6_prefix=128 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6}
-| | ... | ${dut1_if2_ip6} | ${remote_host1_ip6}=${NONE}
-| | ... | ${remote_host2_ip6}=${NONE} | ${remote_host_ip6_prefix}=${NONE}
-| | ...
-| | ${dut_tg_ip6_prefix}= | Set Variable | 64
-| | ...
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip6} | ${tg_to_dut_if1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_if2_ip6} | ${tg_to_dut_if2_mac}
-| | ...
-| | VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut1_if1_ip6} | ${dut_tg_ip6_prefix}
-| | VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut1_if2_ip6} | ${dut_tg_ip6_prefix}
-| | ...
-| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6}
-| | ... | interface=${dut_to_tg_if1}
-| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6}
-| | ... | interface=${dut_to_tg_if2}
-
-| Configure IPv6 forwarding in 3-node circular topology
-| | [Documentation]
-| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
-| | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
-| | ... | interfaces. Setup IPv6 addresses with /64 prefix on DUT-TG links.
-| | ... | Configure IPv6 adresses with /96 prefix on DUT1-DUT2 link and set
-| | ... | routing on both DUT nodes with prefix /64 and next hop of neighbour
-| | ... | DUT interface IPv6 address. Configure route entries for remote hosts
-| | ... | IPv6 addresses if required.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_if1_ip6 - IPv6 address of TG interface1. Type: string
-| | ... | - tg_if2_ip6 - IPv6 address of TG interface2. Type: string
-| | ... | - dut1_if1_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - dut1_if2_ip6 - IPv6 address of DUT1 interface1. Type: string
-| | ... | - dut2_if1_ip6 - IPv6 address of DUT2 interface1 Type: string
-| | ... | - dut2_if2_ip6 - IPv6 address of DUT2 interface2 Type: string
-| | ... | - remote_host1_ip6 - IPv6 address of remote host1 (Optional).
-| | ... | Type: string
-| | ... | - remote_host2_ip6 - IPv6 address of remote host2 (Optional).
-| | ... | Type: string
-| | ... | - remote_host_ip6_prefix - IPv6 address prefix for host IPv6 addresses
-| | ... | (Optional). Type: string or integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \
-| | ... | \| 2001:2::1 \|
-| | ... | \| Configure IPv6 forwarding in circular topology \
-| | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \
-| | ... | \| 2001:2::1 \| remote_host1_ip4=3ffe:5f::1 \
-| | ... | \| remote_host2_ip4=3ffe:5f::2 \| remote_host_ip4_prefix=128 \|
-| | ...
-| | [Arguments] | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6}
-| | ... | ${dut1_if2_ip6} | ${dut2_if1_ip6} | ${dut2_if2_ip6}
-| | ... | ${remote_host1_ip6}=${NONE} | ${remote_host2_ip6}=${NONE}
-| | ... | ${remote_host_ip6_prefix}=${NONE}
-| | ...
-| | ${dut_tg_ip6_prefix}= | Set Variable | 64
-| | ${dut_link_ip6_prefix}= | Set Variable | 96
-| | ...
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg_if1_ip6} | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut2_if1_ip6} | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut1_if2_ip6} | ${dut1_to_dut2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg_if2_ip6} | ${tg_to_dut2_mac}
-| | ...
-| | VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip6} | ${dut_tg_ip6_prefix}
-| | VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut1_if2_ip6} | ${dut_link_ip6_prefix}
-| | VPP Interface Set IP Address | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut2_if1_ip6} | ${dut_link_ip6_prefix}
-| | VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_if2_ip6} | ${dut_tg_ip6_prefix}
-| | ...
-| | Vpp Route Add | ${dut1_node} | ${tg_if2_ip6} | ${dut_tg_ip6_prefix}
-| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_to_dut2}
-| | Vpp Route Add | ${dut2_node} | ${tg_if1_ip6} | ${dut_tg_ip6_prefix}
-| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_to_dut1}
-| | ...
-| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6}
-| | ... | interface=${dut1_to_tg}
-| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${dut2_if1_ip6}
-| | ... | interface=${dut1_to_dut2}
-| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${dut1_if2_ip6}
-| | ... | interface=${dut2_to_dut1}
-| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6}
-| | ... | interface=${dut2_to_tg}
diff --git a/resources/libraries/robot/overlay/gre.robot b/resources/libraries/robot/overlay/gre.robot
index 0e825f05fb..fd38a1764a 100644
--- a/resources/libraries/robot/overlay/gre.robot
+++ b/resources/libraries/robot/overlay/gre.robot
@@ -41,142 +41,3 @@
| | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
| | Set Interface State | ${dut_node} | ${index} | up
| | [Return] | ${name} | ${index}
-
-
-| Send ICMPv4 and check received GRE header
-| | [Documentation] | Send ICMPv4 packet and check if received packed contains \
-| | ... | correct GRE, IP, MAC headers.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
-| | ... | - rx_if - Interface where to receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of ICMP packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address of GRE packet.
-| | ... | Type: string
-| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
-| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
-| | ... | Type: string
-| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - outer_dst_ip - Destination IP address of GRE packet.
-| | ... | Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send ICMPv4 and check received GRE header \
-| | ... | \| ${tg_node} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \
-| | ... | \| ${tx_dst_mac} \| ${rx_dst_mac} \| ${net1_host_address} \
-| | ... | \| ${net2_host_address} \| ${dut1_ip_address} \| ${dut2_ip_address} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${rx_dst_mac}
-| | ... | ${inner_src_ip} | ${inner_dst_ip}
-| | ... | ${outer_src_ip} | ${outer_dst_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
-| | Run Traffic Script On Node
-| | ... | send_icmp_check_gre_headers.py | ${tg_node} | ${args}
-
-
-| Send GRE and check received ICMPv4 header
-| | [Documentation] | Send IPv4 ICMPv4 packet encapsulated into GRE and \
-| | ... | check IP, MAC headers on received packed.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
-| | ... | - rx_if - Interface where receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of GRE packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address of ICMP packet.
-| | ... | Type: string
-| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
-| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
-| | ... | Type: string
-| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - outer_dst_ip - Destination IP address of GRE packet.
-| | ... | Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send GRE and check received ICMPv4 header \| ${tg_node} \
-| | ... | \| ${tg_to_dut_if2} \| ${tg_to_dut_if1} \| ${tx_dst_mac} \
-| | ... | \| ${rx_dst_mac} \| ${net2_host_address} \| ${net1_host_address} \
-| | ... | \| ${dut2_ip_address} \| ${dut1_ip_address} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${rx_dst_mac}
-| | ... | ${inner_src_ip} | ${inner_dst_ip}
-| | ... | ${outer_src_ip} | ${outer_dst_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
-| | Run Traffic Script On Node
-| | ... | send_gre_check_icmp_headers.py | ${tg_node} | ${args}
-
-| Send GRE and check received GRE header
-| | [Documentation] | Send IPv4 UDP packet encapsulated into GRE and \
-| | ... | check if received packed contains correct MAC GRE, IP, UDP headers.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send GRE packet. Type: string
-| | ... | - rx_if - Interface where to receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of transferred packet.
-| | ... | Type: string
-| | ... | - tx_src_mac - Source MAC address of transferred packet. Type: string
-| | ... | - tx_outer_dst_ip - Destination IP address of GRE packet. Type: string
-| | ... | - tx_outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - tx_inner_dst_ip - Destination IP address of UDP packet. Type: string
-| | ... | - tx_inner_src_ip - Source IP address of UDP packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address. Type: string
-| | ... | - rx_src_mac - Expected source MAC address. Type: string
-| | ... | - rx_outer_dst_ip - Expected destination IP address of received GRE
-| | ... | packet. Type: string
-| | ... | - rx_outer_src_ip - Expected source IP address of received GRE
-| | ... | packet. Type: string
-| | ...
-| | ... | __Note:__
-| | ... | rx_inner_dst_ip and rx_inner_src_ip should be same as transferred
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ... | \| Send GRE and check received GRE header \| ${tg_node} \
-| | ... | \| port3 \| port3 \| 08:00:27:f3:be:f0 \| 08:00:27:46:2b:4c \
-| | ... | \| 10.0.0.1 \| 10.0.0.2 \| 192.168.3.100 \| 192.168.2.100 \
-| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| 10.0.0.3 \| 10.0.0.1 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${tx_src_mac}
-| | ... | ${tx_outer_dst_ip} | ${tx_outer_src_ip}
-| | ... | ${tx_inner_dst_ip} | ${tx_inner_src_ip}
-| | ... | ${rx_dst_mac} | ${rx_src_mac}
-| | ... | ${rx_outer_dst_ip} | ${rx_outer_src_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac}
-| | ... | --tx_outer_dst_ip | ${tx_outer_dst_ip}
-| | ... | --tx_outer_src_ip | ${tx_outer_src_ip}
-| | ... | --tx_inner_dst_ip | ${tx_inner_dst_ip}
-| | ... | --tx_inner_src_ip | ${tx_inner_src_ip}
-| | ... | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --rx_src_mac | ${rx_src_mac}
-| | ... | --rx_outer_dst_ip | ${rx_outer_dst_ip}
-| | ... | --rx_outer_src_ip | ${rx_outer_src_ip}
-| | Run Traffic Script On Node
-| | ... | send_gre_check_gre_headers.py | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/overlay/l2lisp.robot b/resources/libraries/robot/overlay/l2lisp.robot
deleted file mode 100644
index 3a2eafa7a5..0000000000
--- a/resources/libraries/robot/overlay/l2lisp.robot
+++ /dev/null
@@ -1,77 +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 ***
-| Documentation | LISP-gpe encapsulation suite keywords
-| Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/overlay/lisp_api.robot
-| Library | resources.libraries.python.LispSetup.LispLocatorSet
-| Library | resources.libraries.python.LispSetup.LispLocator
-| Library | resources.libraries.python.LispSetup.LispLocalEid
-| Library | resources.libraries.python.LispSetup.LispAdjacency
-| Library | resources.libraries.python.LispSetup.LispRemoteMapping
-| Library | resources.libraries.python.LispSetup.LispMapResolver
-| Library | resources.libraries.python.LispSetup.LispEidTableMap
-
-*** Keywords ***
-| Configure L2 LISP on DUT
-| | [Documentation] | Set up LISP L2 topology.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - adjacency - DUT static adjacency settings. Type: dict
-| | ... | - settings - DUT other LISP related settings. Type: dict
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ... | \| Configure L2 LISP on DUT \| ${dut_node} \| ${adjacency} \
-| | ... | \| ${settings} \|
-| | ...
-| | [Arguments]
-| | ... | ${dut_node} | ${adjacency} | ${settings}
-| | ...
-| | ${int_idx}= | Get Interface Sw Index | ${dut_node} | ${${adjacency['int']}}
-| | Enable Lisp | ${dut_node}
-| | Vpp Add Lisp Locator Set | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | Vpp Add Lisp Locator | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | ... | ${int_idx}
-| | ... | ${settings['priority']}
-| | ... | ${settings['weight']}
-| | Vpp Lisp Eid Table Mapping | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | bd_id=${settings['bd']}
-| | Vpp Add Lisp Local Eid | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['seid']}
-| | Vpp Add Map Resolver | ${dut_node}
-| | ... | ${adjacency['map_res']}
-| | Vpp Add Lisp Remote Mapping | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['eid']}
-| | ... | 0
-| | ... | ${adjacency['seid']}
-| | ... | 0
-| | ... | ${adjacency['rloc']}
-| | ... | is_mac=${TRUE}
-| | Vpp Add Lisp Adjacency | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['eid']}
-| | ... | 0
-| | ... | ${adjacency['seid']}
-| | ... | 0
-| | ... | is_mac=${TRUE}
diff --git a/resources/libraries/robot/overlay/vxlan.robot b/resources/libraries/robot/overlay/vxlan.robot
index 06c8e94eb7..42c1eba096 100644
--- a/resources/libraries/robot/overlay/vxlan.robot
+++ b/resources/libraries/robot/overlay/vxlan.robot
@@ -27,30 +27,6 @@
| Documentation | VXLAN keywords
*** Keywords ***
-| Create vlan interfaces for VXLAN
-| | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given
-| | ... | VLAN ID.*
-| | ...
-| | ... | _Set testcase variables with name and index of created interfaces:_
-| | ... | - ${dut1s_vlan_name}
-| | ... | - ${dut1s_vlan_index}
-| | ... | - ${dut2s_vlan_name}
-| | ... | - ${dut2s_vlan_index}
-| | ...
-| | [Arguments] | ${VLAN} | ${DUT1} | ${INT1} | ${DUT2} | ${INT2}
-| | ${INT1_NAME}= | Get interface name | ${DUT1} | ${INT1}
-| | ${INT2_NAME}= | Get interface name | ${DUT2} | ${INT2}
-| | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface
-| | ... | ${DUT1} | ${INT1_NAME} | ${VLAN}
-| | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface
-| | ... | ${DUT2} | ${INT2_NAME} | ${VLAN}
-| | Set Interface State | ${DUT1} | ${dut1s_vlan_index} | up
-| | Set Interface State | ${DUT2} | ${dut2s_vlan_index} | up
-| | Set Test Variable | ${dut1s_vlan_name}
-| | Set Test Variable | ${dut1s_vlan_index}
-| | Set Test Variable | ${dut2s_vlan_name}
-| | Set Test Variable | ${dut2s_vlan_index}
-
| Get VXLAN dump
| | [Documentation] | Get VXLAN dump.
| | ...
diff --git a/resources/libraries/robot/shared/traffic.robot b/resources/libraries/robot/shared/traffic.robot
index b29f7af49d..173a52ee92 100644
--- a/resources/libraries/robot/shared/traffic.robot
+++ b/resources/libraries/robot/shared/traffic.robot
@@ -630,3 +630,213 @@
| | ... | --rx_vni ${rx_vni}
| | Run Traffic Script On Node | send_vxlan_check_vxlan.py | ${tg_node}
| | ... | ${args}
+
+| Send Packet And Check Received Copies
+| | [Documentation] | Sends an ARP or ICMP packet from TG to DUT using one\
+| | ... | link, then receive a copy of both the sent packet and the DUT's reply\
+| | ... | on the second link.
+| | ...
+| | ... | Used by Honeycomb.
+| | ...
+| | ... | *Arguments:*
+| | ...
+| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary
+| | ... | - tx_src_port - First interface on TG. Type: string
+| | ... | - tx_src_mac - MAC address of the first interface on TG. Type: string
+| | ... | - tx_dst_mac - MAC address of the first interface on DUT. Type: string
+| | ... | - rx_port - Second interface on TG. Type: string
+| | ... | - src_ip - Packet source IP address. Type: string
+| | ... | - dst_ip - Packet destination IP address. Type: string
+| | ... | - ptype - Type of payload, ARP, ICMP or ICMPv6. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send Packet And Check Received Copies \| ${nodes['TG']} \| eth1 \
+| | ... | \| 8:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
+| | ... | \| eth3 \| 192.168.0.2 \| 192.168.0.3 \| ARP \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_src_port}
+| | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port}
+| | ... | ${src_ip} | ${dst_ip} | ${ptype}
+| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port}
+| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
+| | ${args}= | Catenate
+| | ... | --tg_src_mac ${tx_src_mac} --dut_if1_mac ${tx_dst_mac}
+| | ... | --src_ip ${src_ip} --dst_ip ${dst_ip}
+| | ... | --tx_if ${tx_port_name} --rx_if | ${rx_port_name}
+| | ... | --ptype ${ptype}
+| | Run Traffic Script On Node | span_check.py | ${tg_node} |
+| | ... | ${args}
+
+| Send ICMPv4 and check received GRE header
+| | [Documentation] | Send ICMPv4 packet and check if received packed contains \
+| | ... | correct GRE, IP, MAC headers.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
+| | ... | - rx_if - Interface where to receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of ICMP packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address of GRE packet.
+| | ... | Type: string
+| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
+| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
+| | ... | Type: string
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of GRE packet.
+| | ... | Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send ICMPv4 and check received GRE header \
+| | ... | \| ${tg_node} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \
+| | ... | \| ${tx_dst_mac} \| ${rx_dst_mac} \| ${net1_host_address} \
+| | ... | \| ${net2_host_address} \| ${dut1_ip_address} \| ${dut2_ip_address} \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
+| | ... | ${tx_dst_mac} | ${rx_dst_mac}
+| | ... | ${inner_src_ip} | ${inner_dst_ip}
+| | ... | ${outer_src_ip} | ${outer_dst_ip}
+| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
+| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
+| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
+| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
+| | Run Traffic Script On Node
+| | ... | send_icmp_check_gre_headers.py | ${tg_node} | ${args}
+
+
+| Send GRE and check received ICMPv4 header
+| | [Documentation] | Send IPv4 ICMPv4 packet encapsulated into GRE and \
+| | ... | check IP, MAC headers on received packed.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
+| | ... | - rx_if - Interface where receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of GRE packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address of ICMP packet.
+| | ... | Type: string
+| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
+| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
+| | ... | Type: string
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of GRE packet.
+| | ... | Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send GRE and check received ICMPv4 header \| ${tg_node} \
+| | ... | \| ${tg_to_dut_if2} \| ${tg_to_dut_if1} \| ${tx_dst_mac} \
+| | ... | \| ${rx_dst_mac} \| ${net2_host_address} \| ${net1_host_address} \
+| | ... | \| ${dut2_ip_address} \| ${dut1_ip_address} \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
+| | ... | ${tx_dst_mac} | ${rx_dst_mac}
+| | ... | ${inner_src_ip} | ${inner_dst_ip}
+| | ... | ${outer_src_ip} | ${outer_dst_ip}
+| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
+| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
+| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
+| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
+| | Run Traffic Script On Node
+| | ... | send_gre_check_icmp_headers.py | ${tg_node} | ${args}
+
+| Send GRE and check received GRE header
+| | [Documentation] | Send IPv4 UDP packet encapsulated into GRE and \
+| | ... | check if received packed contains correct MAC GRE, IP, UDP headers.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send GRE packet. Type: string
+| | ... | - rx_if - Interface where to receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of transferred packet.
+| | ... | Type: string
+| | ... | - tx_src_mac - Source MAC address of transferred packet. Type: string
+| | ... | - tx_outer_dst_ip - Destination IP address of GRE packet. Type: string
+| | ... | - tx_outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - tx_inner_dst_ip - Destination IP address of UDP packet. Type: string
+| | ... | - tx_inner_src_ip - Source IP address of UDP packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address. Type: string
+| | ... | - rx_src_mac - Expected source MAC address. Type: string
+| | ... | - rx_outer_dst_ip - Expected destination IP address of received GRE
+| | ... | packet. Type: string
+| | ... | - rx_outer_src_ip - Expected source IP address of received GRE
+| | ... | packet. Type: string
+| | ...
+| | ... | __Note:__
+| | ... | rx_inner_dst_ip and rx_inner_src_ip should be same as transferred
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Send GRE and check received GRE header \| ${tg_node} \
+| | ... | \| port3 \| port3 \| 08:00:27:f3:be:f0 \| 08:00:27:46:2b:4c \
+| | ... | \| 10.0.0.1 \| 10.0.0.2 \| 192.168.3.100 \| 192.168.2.100 \
+| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| 10.0.0.3 \| 10.0.0.1 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
+| | ... | ${tx_dst_mac} | ${tx_src_mac}
+| | ... | ${tx_outer_dst_ip} | ${tx_outer_src_ip}
+| | ... | ${tx_inner_dst_ip} | ${tx_inner_src_ip}
+| | ... | ${rx_dst_mac} | ${rx_src_mac}
+| | ... | ${rx_outer_dst_ip} | ${rx_outer_src_ip}
+| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
+| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
+| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac}
+| | ... | --tx_outer_dst_ip | ${tx_outer_dst_ip}
+| | ... | --tx_outer_src_ip | ${tx_outer_src_ip}
+| | ... | --tx_inner_dst_ip | ${tx_inner_dst_ip}
+| | ... | --tx_inner_src_ip | ${tx_inner_src_ip}
+| | ... | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --rx_src_mac | ${rx_src_mac}
+| | ... | --rx_outer_dst_ip | ${rx_outer_dst_ip}
+| | ... | --rx_outer_src_ip | ${rx_outer_src_ip}
+| | Run Traffic Script On Node
+| | ... | send_gre_check_gre_headers.py | ${tg_node} | ${args}
+
+| Send ICMP echo request and verify answer
+| | [Documentation] | Run traffic script that waits for ICMP reply and ignores
+| | ... | all other packets.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - TG node where run traffic script. Type: dictionary
+| | ... | - tg_interface - TG interface where send ICMP echo request.
+| | ... | Type: string
+| | ... | - dst_mac - Destination MAC address. Type: string
+| | ... | - src_mac - Source MAC address. Type: string
+| | ... | - dst_ip - Destination IP address. Type: string
+| | ... | - src_ip - Source IP address. Type: string
+| | ... | - timeout - Wait timeout in seconds (Default: 10). Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send ICMP echo request and verify answer \
+| | ... | \| ${nodes['TG']} \| eth2 \
+| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \
+| | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tg_interface}
+| | ... | ${dst_mac} | ${src_mac} | ${dst_ip} | ${src_ip} | ${timeout}=${10}
+| | ...
+| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
+| | ${args}= | Catenate | --rx_if ${tg_interface_name}
+| | ... | --tx_if ${tg_interface_name} | --dst_mac ${dst_mac}
+| | ... | --src_mac ${src_mac} | --dst_ip ${dst_ip} | --src_ip ${src_ip}
+| | ... | --timeout ${timeout}
+| | Run Traffic Script On Node | send_icmp_wait_for_reply.py
+| | ... | ${tg_node} | ${args} \ No newline at end of file
diff --git a/resources/libraries/robot/telemetry/span.robot b/resources/libraries/robot/telemetry/span.robot
deleted file mode 100644
index 3d725bbbf7..0000000000
--- a/resources/libraries/robot/telemetry/span.robot
+++ /dev/null
@@ -1,58 +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.TrafficScriptExecutor
-| Library | resources.libraries.python.topology.Topology
-| Documentation | SPAN traffic keywords
-
-*** Keywords ***
-| Send Packet And Check Received Copies
-| | [Documentation] | Sends an ARP or ICMP packet from TG to DUT using one\
-| | ... | link, then receive a copy of both the sent packet and the DUT's reply\
-| | ... | on the second link.
-| | ...
-| | ... | Used by Honeycomb.
-| | ...
-| | ... | *Arguments:*
-| | ...
-| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary
-| | ... | - tx_src_port - First interface on TG. Type: string
-| | ... | - tx_src_mac - MAC address of the first interface on TG. Type: string
-| | ... | - tx_dst_mac - MAC address of the first interface on DUT. Type: string
-| | ... | - rx_port - Second interface on TG. Type: string
-| | ... | - src_ip - Packet source IP address. Type: string
-| | ... | - dst_ip - Packet destination IP address. Type: string
-| | ... | - ptype - Type of payload, ARP, ICMP or ICMPv6. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send Packet And Check Received Copies \| ${nodes['TG']} \| eth1 \
-| | ... | \| 8:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
-| | ... | \| eth3 \| 192.168.0.2 \| 192.168.0.3 \| ARP \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_src_port}
-| | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port}
-| | ... | ${src_ip} | ${dst_ip} | ${ptype}
-| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port}
-| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
-| | ${args}= | Catenate
-| | ... | --tg_src_mac ${tx_src_mac} --dut_if1_mac ${tx_dst_mac}
-| | ... | --src_ip ${src_ip} --dst_ip ${dst_ip}
-| | ... | --tx_if ${tx_port_name} --rx_if | ${rx_port_name}
-| | ... | --ptype ${ptype}
-| | Run Traffic Script On Node | span_check.py | ${tg_node} |
-| | ... | ${args}
diff --git a/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot b/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot
deleted file mode 100644
index 2b67db5d7e..0000000000
--- a/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot
+++ /dev/null
@@ -1,311 +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/shared/default.robot
-| Resource | resources/libraries/robot/overlay/gre.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *GREoIPv4 test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
-| ... | between nodes; TG-DUT1-DUT2-TG 3-node circular topology with single
-| ... | links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-GRE-IPv4-ICMPv4 on DUT1-DUT2,
-| ... | Eth-IPv4-ICMPv4 on TG-DUTn for routing over GRE tunnel; Eth-IPv4-ICMPv4
-| ... | on TG_if1-DUT, Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT for GREoIPv4
-| ... | encapsulation and decapsulation verification.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4 routing
-| ... | and static routes. GREoIPv4 tunnel is configured between DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets are
-| ... | sent in both directions by TG on links to DUT1 and DUT2; GREoIPv4
-| ... | encapsulation and decapsulation are verified separately by TG; on
-| ... | receive TG verifies packets for correctness and their IPv4 (IPv6)
-| ... | src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC2784.
-
-*** Variables ***
-| ${net1_address}= | 192.168.0.0
-| ${net1_host_address}= | 192.168.0.100
-| ${net1_gw_address}= | 192.168.0.1
-| ${net2_address}= | 192.168.2.0
-| ${net2_host_address}= | 192.168.2.100
-| ${net3_address}= | 192.168.3.0
-| ${net3_host_address}= | 192.168.3.100
-| ${net2_gw_address}= | 192.168.2.1
-| ${dut1_ip_address}= | 192.168.1.1
-| ${dut2_ip_address}= | 192.168.1.2
-| ${dut1_gre_ip}= | 172.16.0.1
-| ${dut2_gre_ip}= | 172.16.0.2
-| ${dut_tun0_ip1}= | 172.16.0.1
-| ${dut_tun0_ip2}= | 172.16.0.2
-| ${dut_tun1_ip1}= | 172.16.1.1
-| ${dut_tun1_ip2}= | 172.16.1.2
-| ${dut1_lo_address}= | 10.0.0.1
-| ${tun0_dst}= | 10.0.0.2
-| ${tun1_dst}= | 10.0.0.3
-| ${prefix}= | 24
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 route over GREoIPv4 tunnel between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv4-GRE-IPv4-ICMPv4 on \
-| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On DUT1 and DUT2
-| | ... | configure GREoIPv4 tunnel with IPv4 routes towards each other.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across
-| | ... | both DUTs and GRE tunnel between them; verify IPv4 headers on
-| | ... | received packets are correct. [Ref] RFC2784.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
-| | 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 IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${net1_gw_address} | ${prefix}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${net2_gw_address} | ${prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_ip_address}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_ip_address}
-| | And VPP Add IP Neighbor | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${net2_host_address} | ${tg_to_dut2_mac}
-| | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address}
-| | ${dut2_gre_interface} | ${dut2_gre_index}=
-| | ... | And Create GRE tunnel interface and set it up
-| | ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
-| | ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix}
-| | And Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix}
-| | ... | gateway=${dut2_gre_ip} | interface=${dut1_gre_index}
-| | Then Send packet and verify headers | ${tg_node}
-| | ... | ${net1_host_address} | ${net2_host_address}
-| | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-
-| TC02: DUT encapsulates IPv4 into GREoIPv4 tunnel - GRE header verification
-| | [Documentation]
-| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
-| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure
-| | ... | GREoIPv4 tunnel with IPv4 route towards TG. [Ver] Make TG send
-| | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received
-| | ... | GREoIPv4 encapsulated packet is correct. [Ref] RFC2784.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | 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_if2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${dut2_ip_address} | ${tg_to_dut_if2_mac}
-| | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
-| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
-| | ... | gateway=${dut2_gre_ip} | interface=${dut1_gre_index}
-| | Then Send ICMPv4 and check received GRE header
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${net1_host_address} | ${net2_host_address}
-| | ... | ${dut1_ip_address} | ${dut2_ip_address}
-
-| TC03: DUT decapsulates IPv4 from GREoIPv4 tunnel - IPv4 header verification
-| | [Documentation]
-| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
-| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure
-| | ... | GREoIPv4 tunnel towards TG. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | encapsulated into GREoIPv4 towards VPP; verify TG received IPv4
-| | ... | de-encapsulated packet is correct. [Ref] RFC2784.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | 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_if2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${net1_host_address} | ${tg_to_dut_if1_mac}
-| | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
-| | Then Send GRE and check received ICMPv4 header
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${net2_host_address} | ${net1_host_address}
-| | ... | ${dut2_ip_address} | ${dut1_ip_address}
-
-| TC04: DUT encapsulates IPv4 into GREoIPv4 different tunnels - GRE header verification
-| | [Documentation]
-| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
-| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
-| | ... | GRE tunnels with loopback's source address. Destination address of
-| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
-| | ... | should be only GRE encapsulated packets. Each tunnel has IPv4 address
-| | ... | and configured prefix routed through the tunnel. [Ver] Make TG send
-| | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received GREoIPv4
-| | ... | encapsulated packet is correct for each tunnel. [Ref] RFC2784.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
-| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${dut2_ip_address} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
-| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
-| | ... | And Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
-| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
-| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
-| | ... | gateway=${dut_tun0_ip2} | interface=${dut1_gre0_index}
-| | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix}
-| | ... | gateway=${dut_tun1_ip2} | interface=${dut1_gre1_index}
-| | Then Send ICMPv4 and check received GRE header
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${net1_host_address} | ${net2_host_address}
-| | ... | ${dut1_lo_address} | ${tun0_dst}
-| | And Send ICMPv4 and check received GRE header
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${net1_host_address} | ${net3_host_address}
-| | ... | ${dut1_lo_address} | ${tun1_dst}
-
-| TC05: DUT re-encapsulates IPv4 GRE into other GRE tunnel - GRE header verification
-| | [Documentation]
-| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
-| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
-| | ... | GRE tunnels with loopback's source address. Destination address of
-| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
-| | ... | should be only GRE encapsulated packets. Each tunnel has IPv4 address
-| | ... | and configured prefix routed through the tunnel. [Ver] Make TG send
-| | ... | encapsulated IPv4 UDP to DUT; Encapsulated IP source is behind
-| | ... | configured tunnel same as destination; verify TG received GREoIPv4
-| | ... | encapsulated packet is correct. [Ref] RFC2784.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
-| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${dut2_ip_address} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
-| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
-| | ... | And Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
-| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
-| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
-| | ... | gateway=${dut_tun0_ip2} | interface=${dut1_gre0_index}
-| | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix}
-| | ... | gateway=${dut_tun1_ip2} | interface=${dut1_gre1_index}
-| | Then Send GRE and check received GRE header
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${dut1_lo_address} | ${tun0_dst}
-| | ... | ${net3_host_address} | ${net2_host_address}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${tun1_dst} | ${dut1_lo_address}
-
-| TC06: DUT do not process GRE with wrong tunnel destination IP
-| | [Documentation]
-| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
-| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
-| | ... | GRE tunnels with loopback's source address. Destination address of
-| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
-| | ... | should be only GRE encapsulated packets. On DUT's to TG if1 interface
-| | ... | is configured test destination host MAC address. [Ver] Make TG send
-| | ... | GRE encapsulated ICMPv4 Echo Req to DUT; verify TG received
-| | ... | de-capsulated packet is correct, then send packet with wrong tunnel
-| | ... | destination address. [Ref] RFC2784.
-| | ... |
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
-| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${net1_host_address} | ${tg_to_dut_if1_mac}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${dut2_ip_address} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
-| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2}
-| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
-| | ... | When Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
-| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
-| | ... | And Create GRE tunnel interface and set it up
-| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
-| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
-| | Then Send GRE and check received ICMPv4 header
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${net2_host_address} | ${net1_host_address}
-| | ... | ${tun0_dst} | ${dut1_lo_address}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send GRE and check received ICMPv4 header |
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${net2_host_address} | ${net1_host_address}
-| | ... | ${tun0_dst} | ${dut1_ip_address}
diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot
deleted file mode 100644
index 5c3ba1b1b2..0000000000
--- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot
+++ /dev/null
@@ -1,97 +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.L2Util
-| Library | resources.libraries.python.LispUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/overlay/l2lisp.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
-| ...
-# Import configuration and test data:
-| Variables | resources/test_data/lisp/l2/l2_ipv4.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *ip4-lispgpe-ip4 encapsulation test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4-LISPGpe-IP4
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 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 src-addr, dst-addr\
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: Route IPv4 packet through LISP with Bridge Domain setup.
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG.
-| | ... | [Enc] Eth-IPv4-ICMPv4-LISPGpe-IP4
-| | ... | [Cfg] Configure IPv4 LISP static adjacencies on DUT1 and DUT2. Also\
-| | ... | configure BD and assign it to LISP VNI.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across both\
-| | ... | DUTs and LISP tunnel between them; verify IPv4, Ether headers on\
-| | ... | received packets are correct.
-| | ... | [Ref] RFC6830.
-| | ...
-| | 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 IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4}
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4}
-| | And VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} | ${tg_to_dut2_mac}
-| | And VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | ${tg_to_dut1_mac}
-| | And VPP Add IP Neighbor | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | ${dut2_to_dut1_mac}
-| | And VPP Add IP Neighbor | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | ${dut1_to_dut2_mac}
-| | When Create L2 BD | ${dut1_node} | ${vpp_bd_id}
-| | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id}
-| | And Create L2 BD | ${dut2_node} | ${vpp_bd_id}
-| | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id}
-| | And Configure L2 LISP on DUT | ${dut1_node}
-| | ... | ${dut1_to_dut2_ip4_static_adjacency}
-| | ... | ${lisp_dut_settings}
-| | And Configure L2 LISP on DUT | ${dut2_node}
-| | ... | ${dut2_to_dut1_ip4_static_adjacency}
-| | ... | ${lisp_dut_settings}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac}
-| | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac}
-| | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac}
diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot
deleted file mode 100644
index 077639eeec..0000000000
--- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot
+++ /dev/null
@@ -1,111 +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.InterfaceUtil
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.VhostUser
-| Library | resources.libraries.python.VPPUtil
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/overlay/lispgpe.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
-| ...
-# Import configuration and test data:
-| Variables | resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down LISP functional test
-| ...
-| Documentation | *ip4-lispgpe-ip4 encapsulation test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2,\
-| ... | Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 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 src-addr, dst-addr\
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 route IPv4 bidirectionally over LISP GPE tunnel using physical interfaces and VRF is enabled
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG.
-| | ... | [Enc] Eth-IPv4-LISPGPE-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on\
-| | ... | TG-DUTn.
-| | ... | [Cfg] Configure IPv4 LISP static adjacencies on DUT1 and DUT2.
-| | ... | [Ver] Case: ip4-lispgpe-ip4 - vrf, phy2lisp
-| | ... | Make TG send ICMPv4 Echo Req between its interfaces across both\
-| | ... | DUTs and LISP GPE tunnel between them; verify IPv4 headers on\
-| | ... | received packets are correct.
-| | ... | [Ref] RFC6830.
-| | ...
-| | 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 Add Fib Table | ${dut1_node} | ${fib_table_1}
-| | And Add Fib Table | ${dut2_node} | ${fib_table_1}
-| | And Assign Interface To Fib Table | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${fib_table_1}
-| | And Assign Interface To Fib Table | ${dut2_node}
-| | ... | ${dut2_to_tg} | ${fib_table_1}
-| | And Add IP Neighbors
-| | And Configure IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4}
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4}
-| | When Configure LISP GPE topology in 3-node circular topology
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_to_dut2_ip4_static_adjacency}
-| | ... | ${dut2_to_dut1_ip4_static_adjacency}
-| | ... | ${dut1_dut2_vni} | ${fib_table_1}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-*** Keywords ***
-| Add IP Neighbors
-| | [Documentation]
-| | ... | Add IP neighbors to physical interfaces on DUTs.
-| | ...
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} | ${tg_to_dut2_mac}
-| | VPP Add IP Neighbor | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | ${dut1_to_dut2_mac}
diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot
deleted file mode 100644
index a5181b5180..0000000000
--- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot
+++ /dev/null
@@ -1,113 +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
-| Library | resources.libraries.python.VhostUser
-| Library | resources.libraries.python.VPPUtil
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/overlay/lispgpe.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-# import additional Lisp settings from resource file
-| Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
-| ... | VM_ENV | HW_ENV
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down LISP functional test
-| ...
-| Documentation | *LISP static adjacency test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv6-ICMPv6 on DUT1-DUT2,\
-| ... | Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured\
-| ... | between DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test 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 IPv6 src-addr,\
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 route IPv6 bidirectionally over LISP GPE tunnel using physical interfaces and VRF is enabled
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG.
-| | ... | [Enc] Eth-IPv4-LISPGPE-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on\
-| | ... | TG-DUTn.
-| | ... | [Cfg] Configure IPv4 LISP static adjacencies on DUT1 and DUT2.
-| | ... | [Ver] Case: ip6-lispgpe-ip4 - vrf, phy2lisp
-| | ... | Make TG send ICMPv4 Echo Req between its interfaces across both\
-| | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\
-| | ... | received packets are correct.
-| | ... | [Ref] RFC6830.
-| | ...
-| | 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 Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Assign Interface To Fib Table | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE}
-| | And Assign Interface To Fib Table | ${dut2_node}
-| | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE}
-| | And Add IP Neighbors
-| | And Configure IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4}
-| | ... | ${dut_prefix6o4}
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut_prefix6o4}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | When Configure LISP GPE topology in 3-node circular topology
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency}
-| | ... | ${dut2_ip6o4_static_adjacency}
-| | ... | ${dut1_dut2_vni} | ${fib_table_1}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4}
-| | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4}
-| | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-*** Keywords ***
-| Add IP Neighbors
-| | [Documentation]
-| | ... | Add IP neighbors to physical interfaces on DUTs.
-| | ...
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4} | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4} | ${tg_to_dut2_mac}
-| | VPP Add IP Neighbor | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4} | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} | ${dut1_to_dut2_mac}
diff --git a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot
deleted file mode 100644
index df1b6c0d02..0000000000
--- a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot
+++ /dev/null
@@ -1,98 +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.L2Util
-| Library | resources.libraries.python.LispUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/overlay/l2lisp.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-# Import configuration and test data:
-| Variables | resources/test_data/lisp/l2/l2_ipv6.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *l2-lispgpe-ip6 encapsulation test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IP6-ICMPv6-LISPGpe-IP6
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\
-| ... | domains and neighbors. LISPoIPv6 tunnel is configured between\
-| ... | DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test 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 IPv6 src-addr, dst-addr\
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: Route IPv6 packet through LISP with Bridge Domain setup.
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG.
-| | ... | [Enc] Eth-IP6-ICMPv6-LISPGpe-IP6
-| | ... | [Cfg] Configure IPv6 LISP static adjacencies on DUT1 and DUT2. Also\
-| | ... | configure BD and assign it to LISP VNI.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across both\
-| | ... | DUTs and LISP tunnel between them; verify IPv6, Ether headers on\
-| | ... | received packets are correct.
-| | ... | [Ref] RFC6830.
-| | ...
-| | 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 IP addresses on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6}
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} | ${prefix6}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} | ${tg_to_dut2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} | ${dut1_to_dut2_mac}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | When Create L2 BD | ${dut1_node} | ${vpp_bd_id}
-| | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id}
-| | And Create L2 BD | ${dut2_node} | ${vpp_bd_id}
-| | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id}
-| | And Configure L2 LISP on DUT | ${dut1_node}
-| | ... | ${dut1_to_dut2_ip6_static_adjacency}
-| | ... | ${lisp_dut_settings}
-| | And Configure L2 LISP on DUT | ${dut2_node}
-| | ... | ${dut2_to_dut1_ip6_static_adjacency}
-| | ... | ${lisp_dut_settings}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6}
-| | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac}
-| | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6}
-| | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac}
-| | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac}
diff --git a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot
deleted file mode 100644
index 0a189e510f..0000000000
--- a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot
+++ /dev/null
@@ -1,113 +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.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.VPPUtil
-| ...
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/overlay/lispgpe.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
-| ...
-# Import configuration and test data:
-| Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
-| ...
-| Test Setup | Run Keywords | Set up functional test
-| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes}
-| ...
-| Test Teardown | Tear down LISP functional test
-| ...
-| Documentation | *ip6-lispgpe-ip6 encapsulation test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv6-ICMPv6 on DUT1-DUT2,\
-| ... | Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 routing over LISPoIPv6 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv6 tunnel is configured between\
-| ... | DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test 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 IPv6 src-addr, dst-addr\
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 route IPv6 bidirectionally over LISP GPE tunnel using physical interfaces and VRF is enabled
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG.
-| | ... | [Enc] Eth-IPv6-LISPGPE-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on\
-| | ... | TG-DUTn.
-| | ... | [Cfg] Configure IPv6 LISP static adjacencies on DUT1 and DUT2.
-| | ... | [Ver] Case: ip6-lispgpe-ip6 - vrf, phy2lisp
-| | ... | Make TG send ICMPv6 Echo Req between its interfaces across both\
-| | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\
-| | ... | received packets are correct.
-| | ... | [Ref] RFC6830.
-| | ...
-| | 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 Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE}
-| | And Assign Interface To Fib Table | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE}
-| | And Assign Interface To Fib Table | ${dut2_node}
-| | ... | ${dut2_to_tg} | ${fib_table_1} | ipv6=${TRUE}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6}
-| | And VPP Interface Set IP Address
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} | ${prefix6}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6}
-| | And VPP Interface Set IP Address
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Add IP Neighbors
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | When Configure LISP GPE topology in 3-node circular topology
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_to_dut2_ip6_static_adjacency}
-| | ... | ${dut2_to_dut1_ip6_static_adjacency}
-| | ... | ${dut1_dut2_vni} | ${fib_table_1}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6}
-| | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6}
-| | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-*** Keywords ***
-| Add IP Neighbors
-| | [Documentation]
-| | ... | Add IP neighbors to physical interfaces on DUTs.
-| | ...
-| | VPP Add IP Neighbor
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | ${tg_to_dut1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} | ${tg_to_dut2_mac}
-| | VPP Add IP Neighbor | ${dut1_node}
-| | ... | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${dut2_node}
-| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} | ${dut1_to_dut2_mac}