aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2019-07-12 13:13:00 +0200
committerJan Gelety <jgelety@cisco.com>2019-07-19 14:08:50 +0000
commit87c41b8df8b3c50a90e9d3d740ac629028109dc1 (patch)
tree941c7112c4eb0fdb9bb1e68fbde276076678f737
parentb02ab5b1588750decd66b53c6e20f1002b7c8238 (diff)
Remove un-interested VIRL tests and related resources
Change-Id: I712f5dc238fdf480c7c35250148c12d03ed96d74 Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--resources/libraries/python/Dhcp.py56
-rw-r--r--resources/libraries/python/Map.py281
-rw-r--r--resources/libraries/python/ProxyArp.py57
-rw-r--r--resources/libraries/robot/features/dhcp_client.robot141
-rw-r--r--resources/libraries/robot/features/dhcp_proxy.robot159
-rw-r--r--resources/templates/vat/add_proxy_arp.vat1
-rw-r--r--resources/templates/vat/dhcp_client.vat1
-rw-r--r--resources/templates/vat/dhcp_proxy_config.vat1
-rw-r--r--resources/templates/vat/map_add_del_rule.vat1
-rw-r--r--resources/templates/vat/map_add_domain.vat1
-rw-r--r--resources/templates/vat/map_del_domain.vat1
-rw-r--r--resources/test_data/softwire/map_e_domains.py57
-rw-r--r--resources/test_data/softwire/map_utils.py53
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot119
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot96
-rw-r--r--tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot158
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot215
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot490
-rw-r--r--tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot140
-rw-r--r--tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot71
20 files changed, 1 insertions, 2098 deletions
diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py
index 5f76e434ec..cd074c3702 100644
--- a/resources/libraries/python/Dhcp.py
+++ b/resources/libraries/python/Dhcp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# 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:
@@ -15,66 +15,12 @@
from resources.libraries.python.VatExecutor import VatExecutor
-from resources.libraries.python.topology import Topology
-
-
-class DhcpClient(object):
- """DHCP Client utilities."""
-
- @staticmethod
- def set_dhcp_client_on_interface(vpp_node, interface, hostname=None):
- """Set DHCP client on interface.
-
- :param vpp_node: VPP node to set DHCP client on.
- :param interface: Interface name to set DHCP client on.
- :param hostname: Hostname used in DHCP DISCOVER.
- :type vpp_node: dict
- :type interface: str
- :type hostname: str
- :raises RuntimeError: If unable to set DHCP client on interface.
- """
- sw_if_index = Topology.get_interface_sw_index(vpp_node, interface)
- interface = 'sw_if_index {}'.format(sw_if_index)
- hostname = 'hostname {}'.format(hostname) if hostname else ''
- output = VatExecutor.cmd_from_template(vpp_node,
- "dhcp_client.vat",
- interface=interface,
- hostname=hostname)
- output = output[0]
-
- if output["retval"] != 0:
- raise RuntimeError('Unable to set DHCP client on node {} and'
- ' interface {}.'
- .format(vpp_node, interface))
class DhcpProxy(object):
"""DHCP Proxy utilities."""
@staticmethod
- def dhcp_proxy_config(vpp_node, server_address, source_address):
- """Set DHCP proxy.
-
- :param vpp_node: VPP node to set DHCP proxy.
- :param server_address: DHCP server IP address.
- :param source_address: DHCP proxy address.
- :type vpp_node: dict
- :type server_address: str
- :type source_address: str
- :raises RuntimeError: If unable to set DHCP proxy.
- """
-
- output = VatExecutor.cmd_from_template(vpp_node,
- "dhcp_proxy_config.vat",
- server_address=server_address,
- source_address=source_address)
- output = output[0]
-
- if output["retval"] != 0:
- raise RuntimeError('Unable to set DHCP proxy on node {}'
- .format(vpp_node))
-
- @staticmethod
def vpp_get_dhcp_proxy(node, ip_version):
"""Retrieve DHCP relay configuration.
diff --git a/resources/libraries/python/Map.py b/resources/libraries/python/Map.py
deleted file mode 100644
index ec1d22cec8..0000000000
--- a/resources/libraries/python/Map.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright (c) 2018 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.
-
-"""Map utilities library."""
-
-
-import ipaddress
-
-from resources.libraries.python.VatExecutor import VatExecutor
-
-
-class Map(object):
- """Utilities for manipulating MAP feature in VPP."""
-
- @staticmethod
- def map_add_domain(vpp_node, ip4_pfx, ip6_pfx, ip6_src, ea_bits_len,
- psid_offset, psid_len, map_t=False):
- """Add map domain on node.
-
- :param vpp_node: VPP node to add map domain on.
- :param ip4_pfx: Rule IPv4 prefix.
- :param ip6_pfx: Rule IPv6 prefix.
- :param ip6_src: MAP domain IPv6 BR address / Tunnel source.
- :param ea_bits_len: Embedded Address bits length.
- :param psid_offset: Port Set Identifier (PSID) offset.
- :param psid_len: Port Set Identifier (PSID) length.
- :param map_t: Mapping using translation instead of encapsulation.
- Default False.
- :type vpp_node: dict
- :type ip4_pfx: str
- :type ip6_pfx: str
- :type ip6_src: str
- :type ea_bits_len: int
- :type psid_offset: int
- :type psid_len: int
- :type map_t: bool
- :returns: Index of created map domain.
- :rtype: int
- :raises RuntimeError: If unable to add map domain.
- """
- translate = 'map-t' if map_t else ''
-
- output = VatExecutor.cmd_from_template(vpp_node, "map_add_domain.vat",
- ip4_pfx=ip4_pfx,
- ip6_pfx=ip6_pfx,
- ip6_src=ip6_src,
- ea_bits_len=ea_bits_len,
- psid_offset=psid_offset,
- psid_len=psid_len,
- map_t=translate)
- if output[0]["retval"] == 0:
- return output[0]["index"]
- else:
- raise RuntimeError('Unable to add map domain on node {}'
- .format(vpp_node['host']))
-
- @staticmethod
- def map_add_rule(vpp_node, index, psid, dst, delete=False):
- """Add or delete map rule on node.
-
- :param vpp_node: VPP node to add map rule on.
- :param index: Map domain index to add rule to.
- :param psid: Port Set Identifier.
- :param dst: MAP CE IPv6 address.
- :param delete: If set to True, delete rule. Default False.
- :type vpp_node: dict
- :type index: int
- :type psid: int
- :type dst: str
- :type delete: bool
- :raises RuntimeError: If unable to add map rule.
- """
- output = VatExecutor.cmd_from_template(vpp_node, "map_add_del_rule.vat",
- index=index,
- psid=psid,
- dst=dst,
- delete='del' if delete else '')
-
- if output[0]["retval"] != 0:
- raise RuntimeError('Unable to add map rule on node {}'
- .format(vpp_node['host']))
-
- @staticmethod
- def map_del_domain(vpp_node, index):
- """Delete map domain on node.
-
- :param vpp_node: VPP node to delete map domain on.
- :param index: Index of the map domain.
- :type vpp_node: dict
- :type index: int
- :raises RuntimeError: If unable to delete map domain.
- """
- output = VatExecutor.cmd_from_template(vpp_node, "map_del_domain.vat",
- index=index)
- if output[0]["retval"] != 0:
- raise RuntimeError('Unable to delete map domain {} on node {}'
- .format(index, vpp_node['host']))
-
- @staticmethod
- def get_psid_from_port(port, psid_len, psid_offset):
- """Return PSID from port.::
-
- 0 1
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- +-----------+-----------+-------+
- Ports in | A | PSID | j |
- the CE port set | > 0 | | |
- +-----------+-----------+-------+
- | a bits | k bits |m bits |
-
-
- :param port: Port to compute PSID from.
- :param psid_len: PSID length.
- :param psid_offset: PSID offset.
- :type port: int
- :type psid_len: int
- :type psid_offset: int
- :returns: PSID.
- :rtype: int
- """
- ones = 2**16-1
- mask = ones >> (16 - psid_len)
- psid = port >> (16 - psid_len - psid_offset)
- psid &= mask
- return psid
-
- @staticmethod
- def _make_ea_bits(ipv4_net, ipv4_host, ea_bit_len, psid_len, psid):
- """
- _note_: host(or prefix) part of destination ip in rule prefix, + psid
-
- :param ipv4_net: IPv4 domain prefix.
- :param ipv4_host: Destination IPv4 address.
- :param ea_bit_len: EA bit length.
- :param psid_len: PSID length.
- :param psid: PSID.
- :type ipv4_net: ipaddress.IPv4Network
- :type ipv4_host: ipaddress.IPv4Address
- :type ea_bit_len: int
- :type psid_len: int
- :type psid: int
- :returns: Number representing EA bit field of destination IPv6 address.
- :rtype: int
- """
- v4_suffix_len = ipv4_net.max_prefixlen - ipv4_net.prefixlen
- v4_suffix = int(ipv4_net.network_address) ^ int(ipv4_host)
-
- if ipv4_net.prefixlen + ea_bit_len <= 32:
- ea_bits = v4_suffix >> (v4_suffix_len - ea_bit_len)
- return ea_bits
- else:
- q_len = ea_bit_len - v4_suffix_len
- # p_bits = v4_suffix << q_len # option 1: psid right padded
- p_bits = v4_suffix << psid_len # option 2: psid left padded
- if q_len < psid_len:
- raise Exception("invalid configuration: q_len < psid_len")
- ea_bits = p_bits | psid
- ea_bits <<= q_len - psid_len # option 2: psid left padded
- return ea_bits
-
- @staticmethod
- def _make_interface_id(rule_net, dst_ip, ea_bit_len, psid):
- """
- _note_: if prefix or complete ip (<= 32), psid is 0
-
- :param rule_net: IPv4 domain prefix.
- :param dst_ip: Destination IPv4 address.
- :param ea_bit_len: EA bit length.
- :param psid: PSID.
- :type rule_net: ipaddress.IPv4Network
- :type dst_ip: ipaddress.IPv4Address
- :type ea_bit_len: int
- :type psid: int
- :returns: Number representing interface id field of destination IPv6
- address.
- :rtype: int
- """
- if rule_net.prefixlen + ea_bit_len < 32:
- v4_suffix_len = rule_net.max_prefixlen - rule_net.prefixlen
- v4_suffix = int(rule_net.network_address) ^ int(dst_ip)
- ea_bits = v4_suffix >> (v4_suffix_len - ea_bit_len)
- address = int(rule_net.network_address) >> v4_suffix_len
- address <<= ea_bit_len
- address |= ea_bits
- address <<= 32 - rule_net.prefixlen - ea_bit_len
- address <<= 16
- elif rule_net.prefixlen + ea_bit_len == 32:
- address = int(dst_ip) << 16
- else:
- address = int(dst_ip) << 16
- address |= psid
- return address
-
- return address
-
- @staticmethod
- def compute_ipv6_map_destination_address(ipv4_pfx, ipv6_pfx, ea_bit_len,
- psid_offset, psid_len, ipv4_dst,
- dst_port):
- """Compute IPv6 destination address from IPv4 address for MAP algorithm.
- (RFC 7597)::
-
- | n bits | o bits | s bits | 128-n-o-s bits |
- +--------------------+-----------+---------+-----------------------+
- | Rule IPv6 prefix | EA bits |subnet ID| interface ID |
- +--------------------+-----------+---------+-----------------------+
- |<--- End-user IPv6 prefix --->|
-
- :param ipv4_pfx: Domain IPv4 preffix.
- :param ipv6_pfx: Domain IPv6 preffix.
- :param ea_bit_len: Domain EA bits length.
- :param psid_offset: Domain PSID offset.
- :param psid_len: Domain PSID length.
- :param ipv4_dst: Destination IPv4 address.
- :param dst_port: Destination port number or ICMP ID.
- :type ipv4_pfx: str
- :type ipv6_pfx: str
- :type ea_bit_len: int
- :type psid_offset: int
- :type psid_len: int
- :type ipv4_dst: str
- :type dst_port: int
- :returns: Computed IPv6 address.
- :rtype: str
- """
- ipv6_net = ipaddress.ip_network(unicode(ipv6_pfx))
- ipv4_net = ipaddress.ip_network(unicode(ipv4_pfx))
- ipv4_host = ipaddress.ip_address(unicode(ipv4_dst))
-
- ipv6_host_len = ipv6_net.max_prefixlen - ipv6_net.prefixlen
- end_user_v6_pfx_len = ipv6_net.prefixlen + ea_bit_len
- psid = Map.get_psid_from_port(dst_port, psid_len, psid_offset)
-
- rule_v6_pfx = int(ipv6_net.network_address) >> ipv6_host_len
- ea_bits = Map._make_ea_bits(ipv4_net, ipv4_host, ea_bit_len, psid_len,
- psid)
- interface_id = Map._make_interface_id(ipv4_net, ipv4_host, ea_bit_len,
- psid)
-
- address = rule_v6_pfx << ea_bit_len
- address |= ea_bits # add EA bits
-
- if end_user_v6_pfx_len > 64:
- # If the End-user IPv6 prefix length is larger than 64,
- # the most significant parts of the interface identifier are
- # overwritten by the prefix.
- mask = (2**128-1) >> end_user_v6_pfx_len
- interface_id &= mask
- address <<= (128 - end_user_v6_pfx_len)
- address |= interface_id # add Interface ID bits
-
- return str(ipaddress.ip_address(address))
-
- @staticmethod
- def compute_ipv6_map_source_address(ipv6_pfx, ipv4_src):
- """Compute IPv6 source address from IPv4 address for MAP-T algorithm.
-
- :param ipv6_pfx: 96 bit long IPv6 prefix.
- :param ipv4_src: IPv4 source address
- :type ipv6_pfx: str
- :type ipv4_src: str
- :returns: IPv6 address, combination of IPv6 prefix and IPv4 address.
- :rtype: str
- """
- ipv6_net = ipaddress.ip_network(unicode(ipv6_pfx))
- ipv4_host = ipaddress.ip_address(unicode(ipv4_src))
-
- address = int(ipv6_net.network_address)
- address |= int(ipv4_host)
-
- return str(ipaddress.ip_address(address))
diff --git a/resources/libraries/python/ProxyArp.py b/resources/libraries/python/ProxyArp.py
deleted file mode 100644
index e05bfe3a61..0000000000
--- a/resources/libraries/python/ProxyArp.py
+++ /dev/null
@@ -1,57 +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.
-
-"""Proxy ARP library"""
-
-from resources.libraries.python.InterfaceUtil import InterfaceUtil
-from resources.libraries.python.PapiExecutor import PapiSocketExecutor
-from resources.libraries.python.VatExecutor import VatTerminal
-
-
-class ProxyArp(object):
- """Proxy ARP utilities."""
-
- @staticmethod
- def vpp_add_proxy_arp(node, lo_ip4_addr, hi_ip4_addr):
- """Enable proxy ARP for a range of IP addresses.
-
- :param node: VPP node to enable proxy ARP.
- :param lo_ip4_addr: The lower limit of the IP addresses.
- :param hi_ip4_addr: The upper limit of the IP addresses.
- :type node: dict
- :type lo_ip4_addr: str
- :type hi_ip4_addr: str
- """
- with VatTerminal(node) as vat:
- vat.vat_terminal_exec_cmd_from_template("add_proxy_arp.vat",
- lo_ip4_addr=lo_ip4_addr,
- hi_ip4_addr=hi_ip4_addr)
-
- @staticmethod
- def vpp_proxy_arp_interface_enable(node, interface):
- """Enable proxy ARP on interface.
-
- :param node: VPP node to enable proxy ARP on interface.
- :param interface: Interface to enable proxy ARP.
- :type node: dict
- :type interface: str or int
- """
-
- cmd = 'proxy_arp_intfc_enable_disable'
- args = dict(
- sw_if_index=InterfaceUtil.get_interface_index(node, interface),
- enable_disable=1)
- err_msg = 'Failed to enable proxy ARP on interface {ifc}'.format(
- ifc=interface)
- with PapiSocketExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_reply(err_msg)
diff --git a/resources/libraries/robot/features/dhcp_client.robot b/resources/libraries/robot/features/dhcp_client.robot
deleted file mode 100644
index efc016741a..0000000000
--- a/resources/libraries/robot/features/dhcp_client.robot
+++ /dev/null
@@ -1,141 +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 ***
-| Library | Collections
-| Resource | resources/libraries/robot/shared/default.robot
-| Library | resources.libraries.python.Dhcp.DhcpClient
-| Library | resources.libraries.python.TrafficScriptExecutor
-| Documentation | DHCP Client specific keywords.
-
-*** Keywords ***
-| Verify DHCP DISCOVER header
-| | [Documentation] | Check if DHCP DISCOVER message contains all required
-| | ... | fields.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - interface - TG interface where listen for DHCP DISCOVER message.
-| | ... | Type: string
-| | ... | - src_mac - DHCP client MAC address. Type: string
-| | ... | - hostname - DHCP client hostname (Optional, Default="", if not
-| | ... | specified, the hostname is not checked). Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
-| | ... | \| eth2 \| 08:00:27:66:b8:57 \|
-| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
-| | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \|
-| | ...
-| | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY}
-| | ${interface_name}= | Get interface name | ${tg_node} | ${interface}
-| | ${args}= | Catenate | --rx_if | ${interface_name} | --rx_src_mac | ${src_mac}
-| | ${args}= | Run Keyword If | "${hostname}" == "" | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --hostname | ${hostname}
-| | Run Traffic Script On Node | dhcp/check_dhcp_discover.py
-| | ... | ${tg_node} | ${args}
-
-
-| Verify DHCP REQUEST after OFFER
-| | [Documentation] | Check if DHCP REQUEST message contains all required
-| | ... | fields. DHCP REQUEST should be send by a client after DHCP OFFER
-| | ... | message sent by a server.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface - TG interface where listen for DHCP DISCOVER,
-| | ... | send DHCP OFFER and listen for DHCP REQUEST messages. Type: string
-| | ... | - server_mac - DHCP server MAC address. Type: string
-| | ... | - server_ip - DHCP server IP address. Type: string
-| | ... | - client_mac - DHCP client MAC address. Type: string
-| | ... | - client_ip - IP address that should be offered to client.
-| | ... | Type: string
-| | ... | - client_mask - IP netmask that should be offered to client.
-| | ... | Type: string
-| | ... | - hostname - DHCP client hostname (Optional, Default="", if not
-| | ... | specified, the hostname is not checked). Type: string
-| | ... | - offer_xid - Transaction ID (Optional, Default="", if not specified
-| | ... | xid field in DHCP OFFER is same as in DHCP DISCOVER message).
-| | ... | Type: integer
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Raises:*
-| | ... | - DHCP REQUEST Rx timeout - if no DHCP REQUEST is received.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Verify DHCP REQUEST after OFFER \| ${nodes['TG']} \
-| | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
-| | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \|
-| | ...
-| | ... | \| Run Keyword And Expect Error \| DHCP REQUEST Rx timeout \
-| | ... | \| Verify DHCP REQUEST after OFFER \
-| | ... | \| ${nodes['TG']} \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
-| | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \
-| | ... | \| offer_xid=11113333 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface} | ${server_mac} | ${server_ip}
-| | ... | ${client_mac} | ${client_ip} | ${client_mask}
-| | ... | ${hostname}=${EMPTY} | ${offer_xid}=${EMPTY}
-| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
-| | ${args}= | Catenate | --rx_if | ${tg_interface_name} | --server_mac
-| | ... | ${server_mac} | --server_ip | ${server_ip} | --client_mac
-| | ... | ${client_mac} | --client_ip | ${client_ip} | --client_mask
-| | ... | ${client_mask}
-| | ${args}= | Run Keyword If | "${hostname}" == "" | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --hostname | ${hostname}
-| | ${args}= | Run Keyword If | "${offer_xid}" == "" | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --offer_xid | ${offer_xid}
-| | Run Traffic Script On Node | dhcp/check_dhcp_request.py
-| | ... | ${tg_node} | ${args}
-
-
-| Configure IP on client via DHCP
-| | [Documentation] | Run script that sends IP configuration to the DHCP client.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface - TG interface where listen for DHCP DISCOVER,
-| | ... | send DHCP OFFER and DHCP ACK after DHCP REQUEST messages.
-| | ... | Type: string
-| | ... | - server_mac - DHCP server MAC address. Type: string
-| | ... | - server_ip - DHCP server IP address. Type: string
-| | ... | - client_ip - IP address that is offered to client. Type: string
-| | ... | - client_mask - IP netmask that is offered to client. Type: string
-| | ... | - lease_time - IP lease time in seconds. Type: integer
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure IP on client via DHCP \| ${nodes['TG']} \
-| | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
-| | ... | \| 192.168.23.10 \| 255.255.255.0 \| 86400 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface}
-| | ... | ${server_mac} | ${server_ip} | ${client_ip} | ${client_mask}
-| | ... | ${lease_time}
-| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
-| | ${args}= | Catenate | --rx_if | ${tg_interface_name}
-| | ... | --server_mac | ${server_mac} | --server_ip | ${server_ip}
-| | ... | --client_ip | ${client_ip} | --client_mask | ${client_mask}
-| | ... | --lease_time | ${lease_time}
-| | Run Traffic Script On Node | dhcp/check_dhcp_request_ack.py
-| | ... | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/features/dhcp_proxy.robot b/resources/libraries/robot/features/dhcp_proxy.robot
deleted file mode 100644
index e6ea69d5d0..0000000000
--- a/resources/libraries/robot/features/dhcp_proxy.robot
+++ /dev/null
@@ -1,159 +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 ***
-| Library | Collections
-| Resource | resources/libraries/robot/shared/default.robot
-| Library | resources.libraries.python.Dhcp.DhcpProxy
-| Library | resources.libraries.python.TrafficScriptExecutor
-| Documentation | DHCP Proxy specific keywords.
-
-*** Keywords ***
-| Send DHCP messages and check answer
-| | [Documentation] | Send and receive DHCP messages between client
-| | ... | and server through DHCP proxy.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - server_ip - DHCP server IP address. Type: string
-| | ... | - server_mac - DHCP server MAC address. Type: string
-| | ... | - client_ip - Client IP address. Type: string
-| | ... | - client_mac - Client MAC address. Type: string
-| | ... | - proxy_ip - DHCP proxy IP address. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCP messages and check answer \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \
-| | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${server_ip} | ${server_mac} | ${client_ip} | ${client_mac}
-| | ... | ${proxy_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ... | --rx_if | ${tg_interface_name2}
-| | ... | --server_ip | ${server_ip}
-| | ... | --server_mac | ${server_mac}
-| | ... | --client_ip | ${client_ip}
-| | ... | --client_mac | ${client_mac}
-| | ... | --proxy_ip | ${proxy_ip}
-| | Run Traffic Script On Node | dhcp/send_and_check_proxy_messages.py
-| | ... | ${tg_node} | ${args}
-
-| Send DHCP DISCOVER and check answer
-| | [Documentation] | Send and receive DHCP DISCOVER.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
-| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCP DISCOVER and check answer \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${tx_src_ip} | ${tx_dst_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ... | --rx_if | ${tg_interface_name2}
-| | ... | --tx_src_ip | ${tx_src_ip}
-| | ... | --tx_dst_ip | ${tx_dst_ip}
-| | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py
-| | ... | ${tg_node} | ${args}
-
-| DHCP DISCOVER should fail
-| | [Documentation] | Send and receive DHCP DISCOVER should fail.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
-| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| DHCP DISCOVER should fail \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.1 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${tx_src_ip} | ${tx_dst_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ... | --rx_if | ${tg_interface_name2}
-| | ... | --tx_src_ip | ${tx_src_ip}
-| | ... | --tx_dst_ip | ${tx_dst_ip}
-| | Run Keyword And Expect Error | DHCP DISCOVER Rx timeout
-| | ... | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py
-| | ... | ${tg_node} | ${args}
-
-| Send DHCPv6 Messages
-| | [Documentation] | Send and receive DHCPv6 messages between client
-| | ... | and server through DHCPv6 proxy.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - proxy_ip - DHCPv6 proxy IP address. Type: string
-| | ... | - proxy_mac - Proxy MAC address. Type: string
-| | ... | - server_ip - DHCPv6 server IP address. Type: string
-| | ... | - server_mac - Server MAC address. Type: string
-| | ... | - client_mac - Client MAC address. Type: string
-| | ... | - proxy_to_server_mac - MAC address of proxy interface
-| | ... | connected to server. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCPv6 Messages \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 3ffe:62::1 \| 08:00:27:54:59:f9 \
-| | ... | \| 3ffe:63::2 \| 08:00:27:cc:4f:54 \|
-| | ... | \| 08:00:27:64:18:d2 \| 08:00:27:c9:6a:d5 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} | ${proxy_ip}
-| | ... | ${proxy_mac} | ${server_ip} | ${server_mac} | ${client_mac}
-| | ... | ${proxy_to_server_mac}
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ... | --rx_if | ${tg_interface_name2}
-| | ... | --proxy_ip | ${proxy_ip}
-| | ... | --proxy_mac | ${proxy_mac}
-| | ... | --server_ip | ${server_ip}
-| | ... | --server_mac | ${server_mac}
-| | ... | --client_mac | ${client_mac}
-| | ... | --proxy_to_server_mac | ${proxy_to_server_mac}
-| | Run Traffic Script On Node | dhcp/send_dhcp_v6_messages.py
-| | ... | ${tg_node} | ${args}
diff --git a/resources/templates/vat/add_proxy_arp.vat b/resources/templates/vat/add_proxy_arp.vat
deleted file mode 100644
index 42dd3992bb..0000000000
--- a/resources/templates/vat/add_proxy_arp.vat
+++ /dev/null
@@ -1 +0,0 @@
-proxy_arp_add_del {lo_ip4_addr} - {hi_ip4_addr} \ No newline at end of file
diff --git a/resources/templates/vat/dhcp_client.vat b/resources/templates/vat/dhcp_client.vat
deleted file mode 100644
index 2fd99e3470..0000000000
--- a/resources/templates/vat/dhcp_client.vat
+++ /dev/null
@@ -1 +0,0 @@
-dhcp_client_config {interface} {hostname}
diff --git a/resources/templates/vat/dhcp_proxy_config.vat b/resources/templates/vat/dhcp_proxy_config.vat
deleted file mode 100644
index 365b8d7de1..0000000000
--- a/resources/templates/vat/dhcp_proxy_config.vat
+++ /dev/null
@@ -1 +0,0 @@
-dhcp_proxy_config svr {server_address} src {source_address} \ No newline at end of file
diff --git a/resources/templates/vat/map_add_del_rule.vat b/resources/templates/vat/map_add_del_rule.vat
deleted file mode 100644
index 4d82b36674..0000000000
--- a/resources/templates/vat/map_add_del_rule.vat
+++ /dev/null
@@ -1 +0,0 @@
-map_add_del_rule index {index} psid {psid} dst {dst} {delete}
diff --git a/resources/templates/vat/map_add_domain.vat b/resources/templates/vat/map_add_domain.vat
deleted file mode 100644
index 4895f04794..0000000000
--- a/resources/templates/vat/map_add_domain.vat
+++ /dev/null
@@ -1 +0,0 @@
-map_add_domain ip4-pfx {ip4_pfx} ip6-pfx {ip6_pfx} ip6-src {ip6_src} ea-bits-len {ea_bits_len} psid-offset {psid_offset} psid-len {psid_len} {map_t} \ No newline at end of file
diff --git a/resources/templates/vat/map_del_domain.vat b/resources/templates/vat/map_del_domain.vat
deleted file mode 100644
index eeafd8f93a..0000000000
--- a/resources/templates/vat/map_del_domain.vat
+++ /dev/null
@@ -1 +0,0 @@
-map_del_domain index {index} \ No newline at end of file
diff --git a/resources/test_data/softwire/map_e_domains.py b/resources/test_data/softwire/map_e_domains.py
deleted file mode 100644
index 44cb661b01..0000000000
--- a/resources/test_data/softwire/map_e_domains.py
+++ /dev/null
@@ -1,57 +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.l
-
-"""Variables for MAP-e feature tests."""
-
-from resources.libraries.python.Map import Map
-from random import sample, randint
-from itertools import product
-
-
-def get_variables(count):
- """Generate variables with random generated MAP-E configuration sets and
- IP test sets.
-
- domain_set = [IPv4_prefix, IPv6_prefix, IPv6_source, 16, 0, 0]
- ip_set = [IPv4_dst_address, IPv6_dst_address, dst_port, IPv6_src_address]
-
- :param count: Generate "count" map domain configuration parameters.
- :type count: int
- :return: Variable dictionary with domain_sets and ip_sets.
- :rtype: dict
- """
- domain_sets = []
- ip_sets = []
-
- ip_product = [x for x in list(product(xrange(2, 224), xrange(0, 256)))
- if x[0] != 127]
-
- for n1, n2 in sample(ip_product, count):
- v4_pfx = '{}.{}.0.0/16'.format(n1, n2)
- v6_pfx = '2001:{:x}{:x}::/48'.format(n1, n2)
- ipv6_br = '2001:ffff::1'
- domain_set = [v4_pfx,
- v6_pfx,
- ipv6_br, 16, 0, 0]
- port = randint(1025, 65500)
- ipv4_addr = '{}.{}.20.30'.format(n1, n2)
- ipv6_addr = Map.compute_ipv6_map_destination_address(
- v4_pfx, v6_pfx, 16, 0, 0, ipv4_addr, port)
- domain_sets.append(domain_set)
- ip_sets.append([ipv4_addr, ipv6_addr, port, ipv6_br])
-
- variables = {
- "domain_sets": domain_sets,
- "ip_sets": ip_sets
- }
- return variables
diff --git a/resources/test_data/softwire/map_utils.py b/resources/test_data/softwire/map_utils.py
deleted file mode 100644
index 58ef551d7a..0000000000
--- a/resources/test_data/softwire/map_utils.py
+++ /dev/null
@@ -1,53 +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.
-
-"""Utils for MAP feature."""
-
-
-def map_port_ranges(psid, length, offset=6):
- """Return list of port ranges for given PSID in tuple <min, max>.
-
- :param psid: PSID.
- :param length: PSID length.
- :param offset: PSID offset.
- :type psid: int
- :type length: int
- :type offset: int
- :return: List of (min, max) port range tuples inclusive.
- :rtype: list
-
- 0 1
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- +-----------+-----------+-------+
- Ports in | A | PSID | j |
- the CE port set | > 0 | | |
- +-----------+-----------+-------+
- | a bits | k bits |m bits |
- """
-
- port_field_len = 16
- port_field_min = int('0x0000', 16)
- port_field_max = int('0xffff', 16)
-
- a = offset
- k = length
- m = port_field_len - offset - length
- km = k + m
- j_max = port_field_max >> a + k
-
- port_ranges = []
- for A in range(1, (port_field_max >> km) + 1):
- port_ranges.append((((A << k) | psid) << m,
- ((A << k) | psid) << m | j_max))
-
- return port_ranges
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
deleted file mode 100644
index 3dbb2abb11..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/features/dhcp_client.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | DHCPv4 Client related test cases
-
-*** Variables ***
-| ${client_hostname}= | dhcp-client
-| ${client_ip}= | 192.168.23.10
-| ${client_mask}= | 255.255.255.0
-| ${server_ip}= | 192.168.23.1
-| ${own_xid}= | 11112222
-| ${lease_time}= | ${15}
-
-*** Test Cases ***
-| TC01: VPP sends a DHCP DISCOVER
-| | [Documentation] | Configure DHCPv4 client on interface to TG without
-| | ... | hostname and check if DHCPv4 DISCOVER message contains all
-| | ... | required fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
-
-| TC02: VPP sends a DHCPv4 DISCOVER with hostname
-| | [Documentation] | Configure DHCPv4 client on interface to TG with hostname
-| | ... | and check if DHCPv4 DISCOVER message contains all required
-| | ... | fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${client_hostname}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
-
-| TC03: VPP sends DHCPv4 REQUEST after OFFER
-| | [Documentation] | Configure DHCPv4 client on interface to TG and check if
-| | ... | DHCPv4 REQUEST message contains all required fields.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-
-| TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID
-| | [ Tags ] | EXPECTED_FAILING
-| | [Documentation] | Configure DHCPv4 client on interface to TG. If server
-| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4
-| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout
-| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-| | ... | offer_xid=${own_xid}
-
-| TC05: VPP honors DHCPv4 lease time
-| | [Documentation] | Send IP configuration to the VPP client via DHCPv4.
-| | ... | Address is checked with ICMP echo request and there should
-| | ... | be no reply for echo request when lease has expired.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | And Configure IP on client via DHCP
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${client_ip} | ${client_mask}
-| | ... | ${lease_time}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
-| | ... | ${tg_to_dut_if1_mac}
-| | Then Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip}
-| | ... | ${server_ip}
-| | And Sleep | ${lease_time}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${client_ip} | ${server_ip}
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
deleted file mode 100644
index 24514d018b..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/features/dhcp_proxy.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *DHCPv4 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... | with two links between the nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP-BOOTP-DHCP
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv4 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv4 packets are sent
-| ... | on TG on first link to DUT and received on TG on second link.
-| ... | On receive TG verifies if DHCPv4 packets are valid.
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 172.16.0.1
-| ${dut_to_tg_if2_ip}= | 192.168.0.1
-| ${dhcp_server_ip}= | 192.168.0.100
-| ${client_ip}= | 172.16.0.2
-| ${prefix_length}= | 24
-
-| ${discover_src_ip}= | 0.0.0.0
-| ${valid_discover_dst_ip}= | 255.255.255.255
-| ${invalid_discover_dst_ip}= | 255.255.255.1
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv4 request to DHCPv4 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4
-| | ... | server through DHCP proxy.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${True}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${dhcp_server_ip} | ${tg_to_dut_if2_mac}
-| | ... | ${client_ip} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip}
-
-| TC02: VPP proxy ignores invalid DHCPv4 request
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${True}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip}
-| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip}
diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
deleted file mode 100644
index da1988defe..0000000000
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.ProxyArp
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *RFC1027 Proxy ARP test cases*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with
-| ... | single link between nodes.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with Proxy ARP
-| ... | *[Ver] TG verification:* Test ARP Request packet is sent
-| ... | from TG on link to DUT1; on receive TG verifies ARP reply packet
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC1027.
-
-*** Variables ***
-| ${tg_to_dut1_ip}= | 10.0.0.100
-| ${dut1_to_tg_ip}= | 10.0.0.1
-| ${prefix_length}= | 24
-| ${lo_ip4_addr}= | 192.168.1.2
-| ${hi_ip4_addr}= | 192.168.1.10
-| ${pass_test_ip}= | 192.168.1.5
-| ${pass_test_lo_ip}= | 192.168.1.2
-| ${pass_test_hi_ip}= | 192.168.1.10
-| ${fail_test_lo_ip}= | 192.168.1.1
-| ${fail_test_hi_ip}= | 192.168.1.11
-
-*** Test Cases ***
-| TC01: DUT sends ARP reply on behalf of another machine from the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is in range.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_ip}
-
-| TC02: DUT sends ARP reply on behalf of another machine from beginning of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is from beginning of the IP range.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_lo_ip}
-
-| TC03: DUT sends ARP reply on behalf of another machine from end of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 sends correct ARP reply on behalf of machine which
-| | ... | IP is from end of the IP range.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then Send ARP Request | ${tg_node} | ${tg_to_dut1_name} | ${tg_to_dut1_mac}
-| | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_ip} | ${pass_test_hi_ip}
-
-| TC04: DUT does not send ARP reply on behalf of another machine from below of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 does not send ARP reply on behalf of machine which
-| | ... | IP is from below of the IP range.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name}
-| | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut1_ip}
-| | ... | ${fail_test_lo_ip}
-
-| TC05: DUT does not send ARP reply on behalf of another machine from above of the IP range
-| | [Documentation]
-| | ... | [Top] TG-DUT1.
-| | ... | [Ref] RFC1027.
-| | ... | [Cfg] On DUT1 configure interface IPv4 address and proxy ARP
-| | ... | for IP range.
-| | ... | [Ver] Make TG send ARP request to DUT1 interface,
-| | ... | verify if DUT1 does not send ARP reply on behalf of machine which
-| | ... | IP is from above of the IP range.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg}
-| | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1}
-| | When VPP Interface Set IP Address | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
-| | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr}
-| | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name}
-| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name}
-| | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut1_ip}
-| | ... | ${fail_test_hi_ip}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
deleted file mode 100644
index 7a17c4cfd1..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/ip/map.robot
-| ...
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Lightweight 4 over 6 test cases*
-| ...
-| ... | LW4o6 is a subset of MAP-E, with per-subscriber rules. It uses the
-| ... | same tunneling mechanism and configuration as MAP-E. It does not use
-| ... | embedded address bits.
-| ...
-| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
-| ... | between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG_if1-DUT,
-| ... | Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured as lwAFTR.
-| ... | *[Ver] TG verification:* Test UDP ICMP Echo Request in IPv4 are
-| ... | sent to lwAFTR and are verified by TG for correctness their
-| ... | encapsulation in IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7596 RFC7597.
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${tg_ip6}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-
-| ${lw_ipv4_pfx}= | 20.0.0.1/32
-| ${lw_ipv6_pfx}= | 2001:1::/64
-| ${lw_ipv6_src}= | 2001:1::1
-| ${lw_psid_length}= | ${8}
-| ${lw_psid_offset}= | ${6}
-| ${lw_rule_psid}= | ${52}
-| ${lw_rule_ipv6_dst}= | 2001:1::2
-| ${lw_rule_2_psid}= | ${22}
-| ${lw_rule_2_ipv6_dst}= | 2001:1::3
-| ${test_ipv4_inside}= | 20.0.0.1
-| ${test_ipv4_outside}= | 10.0.0.100
-# test_port depends on psid, length, offset
-| ${test_port}= | ${1232}
-| ${test_icmp_id}= | ${1232}
-| ${test_2_port}= | ${6232}
-
-*** Test Cases ***
-| TC01: Encapsulate IPv4 into IPv6. IPv6 dst depends on IPv4 and UDP destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-UDP on TG_if1-DUT, Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send non-encapsulated UDP to DUT; verify TG received
-| | ... | IPv4oIPv6 encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 UDP and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${test_ipv4_inside} | ${test_ipv4_outside}
-| | ... | ${test_port} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_ipv6_dst} | ${lw_ipv6_src}
-
-TC02: Encapsulate IPv4 ICMP into IPv6. IPv6 dst depends on IPv4 addr and ICMP ID
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-ICMP(type 0 and 8) on TG_if1-DUT, Eth-IPv6-IPv4-ICMP
-| | ... | on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send non-encapsulated ICMP to DUT; verify TG received
-| | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6
-| | ... | destination based on ICMP Identifier field.
-| | ... | [Ref] RFC7596 section 8.1
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 ICMP and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${test_ipv4_inside} | ${test_ipv4_outside}
-| | ... | ${test_icmp_id} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_ipv6_dst} | ${lw_ipv6_src}
-
-TC03: Decapsulate IPv4 UDP from IPv6.
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv6-IPv4-UDP on TG_if2_DUT, Eth-IPv4-UDP on TG_if1-DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and Map rule.
-| | ... | [Ver] Make TG send encapsulated UDP to DUT; verify TG received
-| | ... | IPv4 non-encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${test_ipv4_outside}
-| | ... | ${tg_to_dut_if1_mac}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | Then Send IPv4 UDP in IPv6 and check headers for lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${lw_ipv6_src} | ${lw_rule_ipv6_dst}
-| | ... | ${test_ipv4_outside} | ${test_ipv4_inside} | ${test_port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-
-TC04: Hairpinning of traffic between two lwB4
-| | [Documentation]
-| | ... | [Top] DUT1-TG.
-| | ... | [Enc] Eth-IPv6-IPv4-UDP on TG_if2_DUT, Eth-IPv6-IPv4-UDP on TG_if2_DUT.
-| | ... | [Cfg] On DUT1 configure Map domain and two Map rules.
-| | ... | [Ver] Make TG send encapsulated UDP to DUT; verify TG received
-| | ... | encapsulated packet is correct.
-| | ... | [Ref] RFC7596 RFC7597
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${lw_rule_2_ipv6_dst} | 128
-| | ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2}
-| | ${domain_index}=
-| | ... | When Map Add Domain
-| | ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
-| | ... | ${lw_ipv6_src} | 0 | ${lw_psid_offset}
-| | ... | ${lw_psid_length}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_psid}
-| | ... | ${lw_rule_ipv6_dst}
-| | And Map Add Rule
-| | ... | ${dut_node} | ${domain_index} | ${lw_rule_2_psid}
-| | ... | ${lw_rule_2_ipv6_dst}
-| | Then Send IPv4 UDP in IPv6 and check headers for lightweight hairpinning
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if2_mac}
-| | ... | ${lw_ipv6_src} | ${lw_rule_ipv6_dst}
-| | ... | ${test_ipv4_inside} | ${test_ipv4_inside}
-| | ... | ${test_2_port} | ${test_port}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${lw_rule_2_ipv6_dst} | ${lw_ipv6_src}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
deleted file mode 100644
index 47f88ff347..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
+++ /dev/null
@@ -1,490 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-*** Settings ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/ip/map.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Variables | resources/test_data/softwire/map_e_domains.py | ${5}
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ... | SOFTWIRE
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Test for Basic mapping rule for MAP-E*\
-| ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the
-| ... | nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG-to-DUT-if1.
-| ... | Eth-IPv6-IPv4-UDP on TG-to-DUT-if2.
-| ... | *[Cfg] DUT configuration:* DUT is configured with IPv4 on one DUT-to-TG
-| ... | interface and IPv6 address on second DUT-to-TG interface. MAP-E domain
-| ... | is configured in test template based on test parameters.
-| ... | *[Ver] TG verification:* UDP packets in IPv4 are sent by TG to
-| ... | destination in MAP domain. IPv6 packets with encapsulated IPv4 are
-| ... | received on TG interface.
-| ... | *[Ref] Applicable standard specifications:* RFC7597.
-
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${dut_ip4_gw}= | 10.0.0.2
-| ${dut_ip6_gw}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-| ${ipv6_br_src}= | 2001:db8:ffff::1
-| ${ipv4_outside}= | 1.0.0.1
-
-
-*** Test Cases ***
-| TC01: BMR, then an IPv4 prefix is assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length < 32 (o + r < 32)
-| | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |=================|===============|================|============|=============|==========|================|==========|==================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |=================|===============|================|============|=============|==========|================|==========|==================================|
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a000::14a0:0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a900::14a9:0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c0::14a9:c000:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9::14a9:c900:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:d000:0:14a9:c9d0:0 |
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${23} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:da00:0:14a9:c9da:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:d000::14a9:c9d0:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${7} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:da00::14a9:c9da:0 |
-
-
-| TC02: BMR, full IPv4 address is to be assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length == 32 (o + r == 32)
-| | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|===============|================|============|=============|==========|================|==========|==================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |===================|===============|================|============|=============|==========|================|==========|==================================|
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:db00:0:14a9:c9db:0 |
-| | 20.160.0.0/12 | 2001:db8::/32 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:9c9d:b000:0:14a9:c9db:0 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:c9db::14a9:c9db:0 |
-| | 20.169.200.0/22 | 2001:db8::/32 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:76c0::14a9:c9db:0 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:db00::14a9:c9db:0 |
-| | 20.169.201.208/28 | 2001:db8::/32 | ${ipv6_br_src} | ${4} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:b000::14a9:c9db:0 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8::14a9:c9db:0 |
-| | 20.0.0.0/8 | 2001:db8::/40 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:a9:c9db:0:14a9:c9db:0 |
-| | 20.160.0.0/12 | 2001:db8::/44 | ${ipv6_br_src} | ${20} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:9:c9db:0:14a9:c9db:0 |
-| | 20.169.0.0/16 | 2001:db8::/48 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:0:c9db:0:14a9:c9db:0 |
-| | 20.169.200.0/22 | 2001:db8::/54 | ${ipv6_br_src} | ${10} | ${0} | ${0} | 20.169.201.219 | ${1232} | 2001:db8:0:1db:0:14a9:c9db:0 |
-
-
-| TC03: BMR, shared IPv4 address is to be assigned
-| | [Documentation]
-| | ... | Basic Mapping Rule https://tools.ietf.org/html/rfc7597#section-5.2\
-| | ... | IPv4 prefix length + ea bits length > 32 (o + r > 32)
-| | ... | ip6_prefix < 64, ip4_prefix <= 32
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ... | - expected_ipv6_dst
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|===============|================|============|=============|==========|================|==========|===================================|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port | expected_ipv6_dst |
-# |===================|===============|================|============|=============|==========|================|==========|===================================|
-| | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:3400::14a9:c9db:34 |
-
-| | 20.0.0.0/8 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:a9:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9:db34::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db:3400::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:34::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:3400::14a9:c9db:34 |
-
-| | 20.0.0.0/8 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:a9c9:db34:0:14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/24 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9:db34::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/24 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db:3400::14a9:c9db:34 |
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:c9db:3400::14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001::/16 | ${ipv6_br_src} | ${32} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db34::14a9:c9db:34 |
-
-| | 20.160.0.0/12 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${5} | 20.169.201.219 | ${1232} | 2001:db8:9c9d:b300:0:14a9:c9db:6 |
-| | 20.169.0.0/16 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:c9db:3400:0:14a9:c9db:34 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${25} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-| | 20.169.192.0/20 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${5} | 20.169.201.219 | ${1232} | 2001:db8:9db3::14a9:c9db:6 |
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:db34::14a9:c9db:34 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${17} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${12} | ${6} | ${4} | 20.169.201.219 | ${1232} | 2001:db8:db30::14a9:c9db:3 |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${12} | ${6} | ${8} | 20.169.201.219 | ${1232} | 2001:db8:3400::14a9:c9db:34 |
-
-
-| TC04: End user IPv6 prefix is 64
-| | [Documentation]
-| | ... | Supported End-User IPv6 prefix length is 64 bit.
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_pfx
-| | ... | - ipv6_src
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ...
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|=========================|================|============|=============|==========|================|==========|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port |
-# |===================|=========================|================|============|=============|==========|================|==========|
-| | 20.0.0.0/8 | 2001:db8:0012:3400::/56 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 20.169.201.208/28 | 2001:db8:0012:3400::/56 | ${ipv6_br_src} | ${8} | ${5} | ${4} | 20.169.201.219 | ${3280} |
-| | 20.0.0.0/8 | 2001:db8:0012:3400::/64 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 20.169.201.219/32 | 2001:db8:0012:3400::/64 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-
-
-| TC05: IPv4 prefix is 0
-| | [Tags] | EXPECTED_FAILING
-# TODO: replace setup when VPP-312 fixed
-#| | [Setup] | Set Interfaces IP Addresses And Routes
-| | [Setup] | Run Keywords
-| | ... | Set up functional test | AND
-| | ... | Set Interfaces IP Addresses And Routes
-| | [Template] | Check MAP Configuration With Traffic Script
-# |===================|=========================|================|============|=============|==========|================|==========|
-# | ipv4_pfx | ipv6_pfx | ipv6_src | ea_bit_len | psid_offset | psid_len | ipv4_dst | dst_port |
-# |===================|=========================|================|============|=============|==========|================|==========|
-| | 0.0.0.0/0 | 2001:db8:0000::/40 | ${ipv6_br_src} | ${8} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:db8:0000::/40 | ${ipv6_br_src} | ${16} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:db8::/32 | ${ipv6_br_src} | ${32} | ${0} | ${0} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001:d00::/24 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} |
-| | 0.0.0.0/0 | 2001::/16 | ${ipv6_br_src} | ${40} | ${6} | ${8} | 20.169.201.219 | ${1232} |
-
-
-| TC06: Multiple domain and check with traffic script IPv4 source IPv6 destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Send IPv4 to destination in configured domain and receive IPv6\
-| | ... | packet.
-| | ... | [Ref] RFC7597.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | :FOR | ${ip_set} | IN | @{ip_sets}
-| | | ${ipv4}= | Get From List | ${ip_set} | 0
-| | | ${ipv6}= | Get From List | ${ip_set} | 1
-| | | ${port}= | Get From List | ${ip_set} | 2
-| | | ${ipv6_br}= | Get From List | ${ip_set} | 3
-| | | Then Send IPv4 UDP And Check Headers For Lightweight 4over6
-| | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | | ... | ${dut_to_tg_if1_mac} | ${ipv4} | ${ipv4_outside} | ${port}
-| | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${ipv6} | ${ipv6_br}
-| | | And Send IPv4 UDP In IPv6 And Check Headers For Lightweight 4over6
-| | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} | ${ipv6_br} | ${ipv6}
-| | | ... | ${ipv4_outside} | ${ipv4} | ${port} | ${tg_to_dut_if1_mac}
-| | | ... | ${dut_to_tg_if1_mac}
-
-
-| TC07: Multiple domain and check with traffic script IPv6 source IPv6 destination
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Send IPv4 encapsulated in IPv6. Source and destination are from\
-| | ... | configured domains. Check if VPP translate IPv6 addresses.
-| | ... | [Ref] RFC7597.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | ${ip_set_A}= | Get From List | ${ip_sets} | 0
-| | ${ip_set_B}= | Get From List | ${ip_sets} | 1
-| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
-| | ${port_A}= | Get From List | ${ip_set_A} | 2
-| | ${port_B}= | Get From List | ${ip_set_B} | 2
-| | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
-| | ${ipv6_B}= | Get From List | ${ip_set_B} | 1
-| | ${ipv4_A}= | Get From List | ${ip_set_A} | 0
-| | ${ipv4_B}= | Get From List | ${ip_set_B} | 0
-| | Then Send IPv4 UDP In IPv6 And Check Headers For Lightweight Hairpinning
-| | ... | ${tg_node} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_br} | ${ipv6_A}
-| | ... | ${ipv4_B} | ${ipv4_A}
-| | ... | ${port_B} | ${port_A}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_B} | ${ipv6_br}
-
-
-| TC08: Encapsulate IPv4 ICMP into IPv6
-| | [Documentation]
-| | ... | [Top] TG=DUT1.
-| | ... | [Enc] Eth-IPv4-ICMP(type 0 and 8) on TG_if1-DUT, Eth-IPv6-IPv4-ICMP\
-| | ... | on TG_if2_DUT.
-| | ... | [Cfg] Multiple MAP-E domains are configured, values from variable\
-| | ... | file.
-| | ... | [Ver] Make TG send non-encapsulated ICMP to DUT; verify TG received\
-| | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6 destination\
-| | ... | based on ICMP Identifier field.
-| | ... | [Ref] RFC7597 section 8.2.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | :FOR | ${domain_set} | IN | @{domain_sets}
-| | | When Map Add Domain | ${dut_node} | @{domain_set}
-| | ${ip_set_A}= | Get From List | ${ip_sets} | 0
-| | ${ipv4_A}= | Get From List | ${ip_set_A} | 0
-| | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
-| | ${icmp_id_A}= | Get From List | ${ip_set_A} | 2
-| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
-| | Then Send IPv4 ICMP And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_A} | ${ipv4_outside}
-| | ... | ${icmp_id_A} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_A} | ${ipv6_br}
-
-
-| TC09: Repeated ip neighbor command doesnt put FIB to broken state
-| | [Documentation] |
-| | ... | Original issue described in https://jira.fd.io/browse/VPP-312.
-| | ... | [Top] TG=DUT1.
-| | ... | [Cfg] IP address are set on interfaces, ip neighbor multiple times
-| | ... | [Ver] FIB is not in broken state. The steps are add route, \
-| | ... | check with traffic then add same route
-| | ... | again and check with traffic script.
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | Then Check MAP Configuration With Traffic Script
-| | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8}
-| | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34
-| | When Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | And VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-| | Then Check MAP Configuration With Traffic Script
-| | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8}
-| | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34
-
-
-| Bug: VPP-318
-| | [Tags] | EXPECTED_FAILING
-| | [Documentation] | qlen < psid length
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Then Run Keyword And Expect Error | Unable to add map domain *
-| | ... | Map Add Domain | ${dut_node} | 20.169.0.0/16 | 2001:db8::/32
-| | ... | ${ipv6_br_src} | ${20} | ${6} | ${8}
-
-
-*** Keywords ***
-| Set Interfaces IP Addresses And Routes
-| | Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | Set interfaces in 2-node circular topology up
-| | Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | ${ipv4_outside} | 32 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-
-| Check MAP Configuration With Traffic Script
-| | [Documentation]
-| | ... | Used as a test case template.\
-| | ... | Configure MAP-E domain with given parameters, with traffic script send
-| | ... | UDP in IPv4 packet to given UDP destination port and IP destination
-| | ... | address and check if correctly received IPv6 packet. Vice versa send
-| | ... | IPv6 packet and check if received IPv4 packet with correct source
-| | ... | address.
-| | ... | The MAP domain is deleted in teardown.
-| | ... | The expected IPv6 address is compared with computed IPv6 address.
-| | [Arguments] | ${ipv4_pfx} | ${ipv6_pfx} | ${ipv6_br_src} | ${ea_bit_len}
-| | ... | ${psid_offset} | ${psid_len} | ${ipv4_dst} | ${dst_port}
-| | ... | ${expected_ipv6_dst}=${EMPTY}
-| | ${domain_index}= | Map Add Domain | ${dut_node} | ${ipv4_pfx} | ${ipv6_pfx}
-| | ... | ${ipv6_br_src} | ${ea_bit_len} | ${psid_offset} | ${psid_len}
-| | ${computed_ipv6_dst}= | Compute IPv6 Map Destination Address
-| | ... | ${ipv4_pfx} | ${ipv6_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${ipv4_dst} | ${dst_port}
-| | ${ipv6_dst}= | Run Keyword If | "${expected_ipv6_dst}" == "${EMPTY}"
-| | ... | Set Variable | ${computed_ipv6_dst}
-| | ... | ELSE | Set Variable | ${expected_ipv6_dst}
-| | Run Keyword If | "${expected_ipv6_dst}" != "${EMPTY}"
-| | ... | IP Addresses Should Be Equal
-| | ... | ${computed_ipv6_dst} | ${expected_ipv6_dst}
-| | ${ipv6_dst}= | Set Variable | ${computed_ipv6_dst}
-| | Check Encapsulation With Traffic Script
-| | ... | ${ipv4_dst} | ${dst_port} | ${ipv6_dst}
-| | Check Decapsulation With Traffic Script
-| | ... | ${ipv6_dst} | ${ipv4_dst} | ${dst_port}
-| | [Teardown] | Run Keywords
-| | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND
-| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
-| | ... | Clear Packet Trace On All DUTs | ${nodes} | AND
-| | ... | Verify VPP PID in Teardown
-
-| Check Encapsulation With Traffic Script
-| | [Arguments] | ${ipv4_dst} | ${dst_port} | ${ipv6_dst}
-| | Send IPv4 UDP And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_dst} | ${ipv4_outside}
-| | ... | ${dst_port} | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_dst} | ${ipv6_br_src}
-
-| Check Decapsulation With Traffic Script
-| | [Arguments] | ${ipv6_ce_addr} | ${ipv4_inside} | ${port}
-| | Send IPv4 UDP In IPv6 And Check Headers For Lightweight 4over6
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${ipv6_br_src} | ${ipv6_ce_addr}
-| | ... | ${ipv4_outside} | ${ipv4_inside} | ${port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
deleted file mode 100644
index a9c32a90bf..0000000000
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-*** Settings ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/ip/map.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE
-| ...
-| Test Setup | Run Keywords | Set up functional test
-| ... | AND | Set interfaces IP addresses and routes
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *Test for Basic mapping rule for MAP-T*\
-| ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the
-| ... | nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP on TG-to-DUT-if1.
-| ... | Eth-IPv6-UDP on TG-to-DUT-if2.
-| ... | *[Cfg] DUT configuration:* DUT is configured with IPv4 on one DUT-to-TG
-| ... | interface and IPv6 address on second DUT-to-TG interface. MAP-T domain
-| ... | is configured in test template based on test parameters.
-| ... | *[Ver] TG verification:* UDP packets in IPv4 are sent by TG to
-| ... | destination in MAP domain. IPv6 packets with translated IPv4 addresses
-| ... | are received on TG interface.
-| ... | *[Ref] Applicable standard specifications:* RFC7599
-
-
-*** Variables ***
-| ${dut_ip4}= | 10.0.0.1
-| ${dut_ip6}= | 2001:0::1
-| ${dut_ip4_gw}= | 10.0.0.2
-| ${dut_ip6_gw}= | 2001:0::2
-| ${ipv4_prefix_len}= | 24
-| ${ipv6_prefix_len}= | 64
-| ${ipv6_br_src}= | 2001:db8:ffff::/96
-
-
-*** Test Cases ***
-| TC01: MAP-T test
-| | [Documentation] |
-| | ... | Test to check map-t address translation.
-| | ...
-| | ... | Arguments:
-| | ...
-| | ... | - ipv4_pfx
-| | ... | - ipv6_dst_pfx
-| | ... | - ipv6_src_pfx
-| | ... | - ea_bit_len
-| | ... | - psid_offset
-| | ... | - psid_len
-| | ... | - ipv4_src
-| | ... | - ipv4_dst
-| | ... | - dst_port
-| | ...
-| | [Template] | Check MAP-T configuration with traffic script
-# |===================|===============|================|============|=============|==========|===========|================|==========|
-# | ipv4_pfx | ipv6_dst_pfx | ipv6_src_pfx | ea_bit_len | psid_offset | psid_len | ipv4_src | ipv4_dst | dst_port |
-# |===================|===============|================|============|=============|==========|===========|================|==========|
-| | 20.169.0.0/16 | 2001::/16 | ${ipv6_br_src} | ${40} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-| | 20.169.201.219/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-| | 20.0.0.0/8 | 2001:db8::/40 | ${ipv6_br_src} | ${24} | ${0} | ${0} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-#| | 20.169.201.0/32 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${6} | ${8} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-#| | 20.169.201.0/24 | 2001:db8::/32 | ${ipv6_br_src} | ${0} | ${6} | ${8} | 100.0.0.1 | 20.169.201.219 | ${1232} |
-
-
-*** Keywords ***
-| Set interfaces IP addresses and routes
-| | Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | Set interfaces in 2-node circular topology up
-| | Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
-| | ... | interface=${dut_to_tg_if2}
-| | VPP Add IP neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw} | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
-| | ... | interface=${dut_to_tg_if1}
-| | VPP Add IP neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw} | ${tg_to_dut_if1_mac}
-
-| Check MAP-T configuration with traffic script
-| | [Documentation] |
-| | ... | Used as a test case template.\
-| | ... | Configure MAP-T domain with given parameters, with traffic script send
-| | ... | UDP in IPv4 packet to given UDP destination port and IP destination
-| | ... | address and check if correctly received IPv6 packet with translated
-| | ... | source and destination addresses. Vice versa send IPv6 packet and
-| | ... | check if received IPv4 packet with correct source and destination
-| | ... | addresses.
-| | ... | The MAP domain is deleted in teardown.
-| | [Arguments] | ${ipv4_pfx} | ${ipv6_dst_pfx} | ${ipv6_src_pfx}
-| | ... | ${ea_bit_len} | ${psid_offset} | ${psid_len}
-| | ... | ${ipv4_outside} | ${ipv4_inside} | ${dst_port}
-| | ${domain_index}= | Map Add Domain | ${dut_node} | ${ipv4_pfx}
-| | ... | ${ipv6_dst_pfx} | ${ipv6_src_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${TRUE}
-| | ${ipv6_ce_addr}= | Compute IPv6 map destination address
-| | ... | ${ipv4_pfx} | ${ipv6_dst_pfx} | ${ea_bit_len} | ${psid_offset}
-| | ... | ${psid_len} | ${ipv4_inside} | ${dst_port}
-| | ${ipv6_br_addr}= | Compute IPv6 map source address
-| | ... | ${ipv6_src_pfx} | ${ipv4_outside}
-# Check translation from v4 to v6 with traffic script
-| | Send IPv4 UDP and check IPv6 headers for MAP-T
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_mac} | ${ipv4_inside} | ${ipv4_outside} | ${dst_port}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
-| | ... | ${ipv6_ce_addr} | ${ipv6_br_addr}
-# Check translation from v6 to v4 with traffic script
-| | Send IPv6 UDP and check IPv4 headers for MAP-T
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | ${ipv6_br_addr} | ${ipv6_ce_addr}
-| | ... | ${dst_port}
-| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-| | ... | ${ipv4_outside} | ${ipv4_inside}
-| | [Teardown] | Run Keywords
-| | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND
-| | ... | Show packet trace on all DUTs | ${nodes} | AND
-| | ... | Clear packet trace on all DUTs | ${nodes} | AND
-| | ... | Verify VPP PID in Teardown
diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
deleted file mode 100644
index 7611cbcbd4..0000000000
--- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.Trace
-| ...
-| Resource | resources/libraries/robot/features/dhcp_proxy.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| ...
-| Test Setup | Set up functional test
-| ...
-| Test Teardown | Tear down functional test
-| ...
-| Documentation | *DHCPv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... | with two links between the nodes.
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv6 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv6 packets are sent
-| ... | on TG on first link to DUT and received on TG on second link.
-| ... | On receive TG verifies if DHCPv6 packets are valid
-| ... | *[Ref] Applicable standard specifications:* RFC 3315
-
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 3ffe:62::1
-| ${dut_to_tg_if2_ip}= | 3ffe:63::1
-| ${dhcp_server_ip}= | 3ffe:63::2
-| ${prefix_length}= | 64
-
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv6 request to DHCPv6 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT
-| | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching DHCPv6 packets between client and \
-| | ... | DHCPv6 server through DHCPv6 proxy.
-| | ... | [Ref] RFC 3315
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And VPP Interface Set IP Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | local=${TRUE}
-| | And VPP Add IP Neighbor | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dhcp_server_ip} | ${tg_to_dut_if2_mac}
-| | And Vpp All Ra Suppress Link Layer | ${nodes}
-| | When DHCP Proxy Config
-| | ... | ${dut_node} | ${dhcp_server_ip} | ${dut_to_tg_if1_ip}
-| | Then Send DHCPv6 Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_ip} | ${dut_to_tg_if1_mac} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if2_mac}