Remove obsolete L2 KW

Change-Id: I9a8aa6f5ccf95d632f4e677c8bf14f50b982d930
Signed-off-by: Peter Mikus <pmikus@cisco.com>

7 files changed, 210 insertions, 765 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}