CSIT-450: Refactor LISP files

-change file names to appropriate
-move tests to appropriate files

Change-Id: Icadd7b8dcee503f4026d340bbfdba488145b8c9d
Signed-off-by: Zdeno Olsovsky <zolsovsk@cisco.com>

10 files changed, 336 insertions, 366 deletions

diff --git a/tests/func/lisp/lisp_api_untagged.robot b/tests/func/lisp/api.robot
index 38692a067a..e464ba221b 100644
--- a/tests/func/lisp/lisp_api_untagged.robot
+++ b/tests/func/lisp/api.robot
@@ -28,7 +28,7 @@
 | ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
 | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
 | ...           | AND          | Show vpp trace dump on all DUTs
-| Documentation | *LISP API test cases*
+| Documentation | *API test cases*
 | ...
 | ... | *[Top] Network Topologies:* DUT1 1-node topology.
 | ... | *[Enc] Packet Encapsulations:* None.
diff --git a/tests/func/lisp/dataplane_generic.robot b/tests/func/lisp/dataplane_generic.robot
new file mode 100644
index 0000000000..94079d162f
--- /dev/null
+++ b/tests/func/lisp/dataplane_generic.robot
@@ -0,0 +1,123 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/testing_path.robot
+| Resource | resources/libraries/robot/ipv4.robot
+| Resource | resources/libraries/robot/traffic.robot
+| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.IPUtil
+| Library  | resources.libraries.python.Trace
+# import additional Lisp settings from resource file
+| Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
+| ... | VM_ENV | HW_ENV
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ...           | AND          | Show vpp trace dump on all DUTs
+| Documentation | *IP AFI independent functional tests.*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2,\
+| ... | Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing over LISPoIPv4 tunnel.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and static routes. LISPoIPv4 tunnel is\
+| ... | configured between DUT1 and DUT2.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets\
+| ... | are sent in both directions by TG on links to DUT1 and DUT2; on receive\
+| ... | TG verifies packets for correctness and their IPv4 src-addr,\
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC6830.
+
+*** Test Cases ***
+| TC01: DUT1 and DUT2 route IPv4 over LISPoIPv4 tunnel after disable-enable
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG.
+| | ... | [Enc] Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on\
+| | ... | TG-DUTn.
+| | ... | [Cfg1] On DUT1 and DUT2 configure IPv4 LISP static adjacencies.
+| | ... | [Ver1] Make TG send ICMPv4 Echo Req between its interfaces across\
+| | ... | both DUTs and LISP tunnel between them; verify IPv4 headers on\
+| | ... | received packets are correct.
+| | ... | [Cfg2] Disable LISP.
+| | ... | [Ver2] Verify packets are not received via LISP tunnel.
+| | ... | [Cfg3] Re-enable LISP.
+| | ... | [Ver3] Verify packets are received again via LISP tunnel.
+| | ... | [Ref] RFC6830.
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And   Interfaces in 3-node path are up
+| | And   IP addresses are set on interfaces
+| |       ... | ${dut1_node} | ${dut1_to_dut2}
+| |       ... | ${dut1_to_dut2_ip4} | ${prefix4}
+| |       ... | ${dut1_node} | ${dut1_to_tg}
+| |       ... | ${dut1_to_tg_ip4} | ${prefix4}
+| |       ... | ${dut2_node} | ${dut2_to_dut1}
+| |       ... | ${dut2_to_dut1_ip4} | ${prefix4}
+| |       ... | ${dut2_node} | ${dut2_to_tg}
+| |       ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4}
+| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4}
+| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4}
+| |       ... | ${tg_to_dut2_mac}
+| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4}
+| |       ... | ${tg_to_dut1_mac}
+| | When Set up Lisp topology
+| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
+| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
+| |      ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| |      ... | ${dut1_to_dut2_ip4_static_adjacency}
+| |      ... | ${dut2_to_dut1_ip4_static_adjacency}
+| | Then Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
+| | When Disable Lisp | ${dut1_node}
+| | Then Send packet from Port to Port should failed
+| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send packet from Port to Port should failed
+| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
+| | When Enable Lisp | ${dut1_node}
+| | And Vpp Add Lisp Adjacency | ${dut1_node}
+| |     ... | ${dut1_to_dut2_ip4_static_adjacency['vni']}
+| |     ... | ${dut1_to_dut2_ip4_static_adjacency['deid']}
+| |     ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']}
+| |     ... | ${dut1_to_dut2_ip4_static_adjacency['seid']}
+| |     ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']}
+| | And Vpp Add Lisp Adjacency | ${dut2_node}
+| |     ... | ${dut2_to_dut1_ip4_static_adjacency['vni']}
+| |     ... | ${dut2_to_dut1_ip4_static_adjacency['deid']}
+| |     ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']}
+| |     ... | ${dut2_to_dut1_ip4_static_adjacency['seid']}
+| |     ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']}
+| | Then Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file
diff --git a/tests/func/lisp/lisp_ipv4_lispgpe_ipsec_ipv4.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot
index cbd139cefd..cbd139cefd 100644
--- a/tests/func/lisp/lisp_ipv4_lispgpe_ipsec_ipv4.robot
+++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot
diff --git a/tests/func/lisp/lisp_ipv4_ipsec_ipv6.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot
index 8b5ba11a29..c290564d7b 100644
--- a/tests/func/lisp/lisp_ipv4_ipsec_ipv6.robot
+++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot
@@ -127,7 +127,7 @@
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
 
-| TC03: DUT1 and DUT2 route IPv4 bidirectionally over LISP GPE tunnel using IPsec (transport) on RLOC Int.
+| TC03: DUT1 and DUT2 route IPv4 over Vhost to LISP GPE tunnel using IPsec (transport) on RLOC Int.
 | | [Documentation]
 | | ... | [Top] TG-DUT1-DUT2-TG.
 | | ... | [Enc] Eth-IPv6-LISPGPE-IPSec-IPv4-ICMP on DUT1-DUT2, Eth-IPv4-ICMP\
@@ -168,7 +168,7 @@
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
 
-| TC04: DUT1 and DUT2 route IPv6 bidirectionally over LISP GPE tunnel using IPsec (transport) on lisp_gpe0 Int.
+| TC04: DUT1 and DUT2 route IPv4 over Vhost to LISP GPE tunnel using IPsec (transport) on lisp_gpe0 Int.
 | | [Documentation]
 | | ... | [Top] TG-DUT1-DUT2-TG.
 | | ... | [Enc] Eth-IPv6-IPSec-LISPGPE-IPv6-ICMPv6 on DUT1-DUT2,\
diff --git a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot
index aeaeb586d1..c6707c23b1 100644
--- a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot
+++ b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot
@@ -48,7 +48,7 @@
 | ...           | AND          | Show VPP Settings | ${nodes['DUT2']}
 | ...
 | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib,
-| ... | vrf (gpe_vni-to-vrf), phy2listp, virt2lisp*
+| ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
diff --git a/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot b/tests/func/lisp/ipv4_lispgpe_ipv4.robot
index 13af66f862..13af66f862 100644
--- a/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot
+++ b/tests/func/lisp/ipv4_lispgpe_ipv4.robot
diff --git a/tests/func/lisp/ipv4_lispgpe_ipv6.robot b/tests/func/lisp/ipv4_lispgpe_ipv6.robot
new file mode 100644
index 0000000000..5ce8d793ed
--- /dev/null
+++ b/tests/func/lisp/ipv4_lispgpe_ipv6.robot
@@ -0,0 +1,104 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/testing_path.robot
+| Resource | resources/libraries/robot/ipv4.robot
+| Resource | resources/libraries/robot/traffic.robot
+| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.IPUtil
+| Library  | resources.libraries.python.Trace
+# import additional Lisp settings from resource file
+| Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
+| ... | VM_ENV | HW_ENV
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ...           | AND          | Show vpp trace dump on all DUTs
+| Documentation | *LISP static adjacency test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv6-ICMPv6 on DUT1-DUT2,\
+| ... | Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 routing over LISPoIPv4 tunnel.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and static routes. LISPoIPv4 tunnel is configured\
+| ... | between DUT1 and DUT2.
+| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets\
+| ... | are sent in both directions by TG on links to DUT1 and DUT2; on receive\
+| ... | TG verifies packets for correctness and their IPv6 src-addr,\
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC6830.
+
+*** Test Cases ***
+| TC01: DUT1 and DUT2 route IPv6 bidirectionally over LISPoIPv4 tunnel
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG.
+| | ... | [Enc] Eth-IPv4-LISP-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on\
+| | ... | TG-DUTn.
+| | ... | [Cfg] On DUT1 and DUT2 configure IPv4 LISP static adjacencies.
+| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across both\
+| | ... | DUTs and LISP tunnel between them; verify IPv6 headers on received\
+| | ... | packets are correct.
+| | ... | [Cfg2] Reconf LISP.
+| | ... | [Ver2] Verify packets are received again via LISP tunnel.
+| | ... | [Ref] RFC6830.
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And   Interfaces in 3-node path are up
+| | And   IP addresses are set on interfaces
+| |       ... | ${dut1_node} | ${dut1_to_dut2}
+| |       ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4}
+| |       ... | ${dut1_node} | ${dut1_to_tg}
+| |       ... | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4}
+| |       ... | ${dut2_node} | ${dut2_to_dut1}
+| |       ... | ${dut2_to_dut1_ip6o4} | ${dut_prefix6o4}
+| |       ... | ${dut2_node} | ${dut2_to_tg}
+| |       ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4}
+| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4}
+| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4}
+| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4}
+| |       ... | ${tg_to_dut2_mac}
+| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4}
+| |       ... | ${tg_to_dut1_mac}
+| | When Set up Lisp topology
+| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
+| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
+| |      ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| |      ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
+| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
+| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
+| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6o4}
+| |      ... | ${dut2_to_dut1_ip6o4_reconf} | ${dut_prefix6o4}
+| |      ... | ${dut1_ip6o4_static_adjacency}
+| |      ... | ${dut1_ip6o4_static_adjacency_reconf}
+| | Then Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file
diff --git a/tests/func/lisp/ipv6_lispgpe_ipv4.robot b/tests/func/lisp/ipv6_lispgpe_ipv4.robot
new file mode 100644
index 0000000000..a4ff3a61c3
--- /dev/null
+++ b/tests/func/lisp/ipv6_lispgpe_ipv4.robot
@@ -0,0 +1,105 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/testing_path.robot
+| Resource | resources/libraries/robot/ipv4.robot
+| Resource | resources/libraries/robot/traffic.robot
+| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.IPUtil
+| Library  | resources.libraries.python.Trace
+# import additional Lisp settings from resource file
+| Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
+| ... | VM_ENV | HW_ENV
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ...           | AND          | Show vpp trace dump on all DUTs
+| Documentation | *LISP static adjacency test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv4-ICMPv4 on\
+| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing over LISPoIPv6\
+| ... | tunnel.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and static routes. LISPoIPv6 tunnel is configured\
+| ... | between DUT1 and DUT2.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets\
+| ... | are sent in both directions by TG on links to DUT1 and DUT2; on receive\
+| ... | TG verifies packets for correctness and their IPv4 src-addr,\
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC6830.
+
+*** Test Cases ***
+| TC01: DUT1 and DUT2 route IPv4 bidirectionally over LISPoIPv6 tunnel
+| | [Documentation]
+| | ... | [Top] TG-DUT1-DUT2-TG.
+| | ... | [Enc] Eth-IPv6-LISP-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on\
+| | ... | TG-DUTn.
+| | ... | [Cfg] On DUT1 and DUT2 configure IPv6 LISP static adjacencies.
+| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across both\
+| | ... | DUTs and LISP tunnel between them; verify IPv4 headers on received\
+| | ... | packets are correct.
+| | ... | [Cfg2] Reconf LISP.
+| | ... | [Ver2] Verify packets are received again via LISP tunnel.
+| | ... | [Ref] RFC6830.
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And   Interfaces in 3-node path are up
+| | And   IP addresses are set on interfaces
+| |       ... | ${dut1_node} | ${dut1_to_dut2}
+| |       ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6}
+| |       ... | ${dut1_node} | ${dut1_to_tg}
+| |       ... | ${dut1_to_tg_ip4o6} | ${tg_prefix4o6}
+| |       ... | ${dut2_node} | ${dut2_to_dut1}
+| |       ... | ${dut2_to_dut1_ip4o6} | ${dut_prefix4o6}
+| |       ... | ${dut2_node} | ${dut2_to_tg}
+| |       ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6}
+| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4o6}
+| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4o6}
+| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4o6}
+| |       ... | ${tg_to_dut2_mac}
+| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6}
+| |       ... | ${tg_to_dut1_mac}
+| | When Set up Lisp topology
+| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
+| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
+| |      ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| |      ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
+| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
+| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
+| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4o6}
+| |      ... | ${dut2_to_dut1_ip4o6_reconf} | ${dut_prefix4o6}
+| |      ... | ${dut1_ip4o6_static_adjacency}
+| |      ... | ${dut1_ip4o6_static_adjacency_reconf}
+| | Then Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6}
+| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | And Send Packet And Check Headers
+| |      ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6}
+| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
+| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file
diff --git a/tests/func/lisp/lisp_ipv6_lispgpe_ipv6.robot b/tests/func/lisp/ipv6_lispgpe_ipv6.robot
index c176b7908b..c176b7908b 100644
--- a/tests/func/lisp/lisp_ipv6_lispgpe_ipv6.robot
+++ b/tests/func/lisp/ipv6_lispgpe_ipv6.robot
diff --git a/tests/func/lisp/lisp_dataplane_untagged.robot b/tests/func/lisp/lisp_dataplane_untagged.robot
deleted file mode 100644
index f2da80a2db..0000000000
--- a/tests/func/lisp/lisp_dataplane_untagged.robot
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Resource | resources/libraries/robot/traffic.robot
-| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library  | resources.libraries.python.IPUtil
-| Library  | resources.libraries.python.Trace
-# import additional Lisp settings from resource file
-| Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
-| ... | VM_ENV | HW_ENV
-| Test Setup | Run Keywords | Setup all DUTs before test
-| ...        | AND          | Setup all TGs before traffic script
-| ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ...           | AND          | Show vpp trace dump on all DUTs
-| Documentation | *LISP static adjacency test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2,
-| ... | Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing over LISPoIPv4 tunnel;
-| ... | Eth-IPv6-LISP-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUTn for
-| ... | IPv6 routing over LISPoIPv6 tunnel; Eth-IPv6-LISP-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing over LISPoIPv6
-| ... | tunnel; Eth-IPv4-LISP-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on
-| ... | TG-DUTn for IPv6 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4 (IPv6)
-| ... | routing and static routes. LISPoIPv4 (oIPv6) tunnel is configured
-| ... | between DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets
-| ... | are sent in both directions by TG on links to DUT1 and DUT2; on receive
-| ... | TG verifies packets for correctness and their IPv4 (IPv6) src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 route IPv4 bidirectionally over LISPoIPv4 tunnel
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. \
-| | ... | [Enc] Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on
-| | ... | TG-DUTn.
-| | ... | [Cfg] On DUT1 and DUT2 configure IPv4 LISP static adjacencies.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across both
-| | ... | DUTs and LISP tunnel between them; verify IPv4 headers on received
-| | ... | packets are correct.
-| | ... | [Cfg2] Reconf LISP.
-| | ... | [Ver2] Verify packets are received again via LISP tunnel.
-| | ... | [Ref] RFC6830.
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2}
-| |       ... | ${dut1_to_dut2_ip4} | ${prefix4}
-| |       ... | ${dut1_node} | ${dut1_to_tg}
-| |       ... | ${dut1_to_tg_ip4} | ${prefix4}
-| |       ... | ${dut2_node} | ${dut2_to_dut1}
-| |       ... | ${dut2_to_dut1_ip4} | ${prefix4}
-| |       ... | ${dut2_node} | ${dut2_to_tg}
-| |       ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4}
-| |       ... | ${tg_to_dut2_mac}
-| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4}
-| |       ... | ${tg_to_dut1_mac}
-| | When Set up Lisp topology
-| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| |      ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| |      ... | ${dut1_to_dut2_ip4_static_adjacency}
-| |      ... | ${dut2_to_dut1_ip4_static_adjacency}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
-| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
-| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4}
-| |      ... | ${dut2_to_dut1_ip4_reconf} | ${prefix4}
-| |      ... | ${dut1_to_dut2_ip4_static_adjacency}
-| |      ... | ${dut1_to_dut2_ip4_static_adjacency_reconf}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-| TC02: DUT1 and DUT2 route IPv6 bidirectionally over LISPoIPv6 tunnel
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. \
-| | ... | [Enc] Eth-IPv6-LISP-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on
-| | ... | TG-DUTn.
-| | ... | [Cfg] On DUT1 and DUT2 configure IPv6 LISP static adjacencies.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across both
-| | ... | DUTs and LISP tunnel between them; verify IPv4 headers on received
-| | ... | packets are correct.
-| | ... | [Cfg2] Reconf LISP.
-| | ... | [Ver2] Verify packets are received again via LISP tunnel.
-| | ... | [Ref] RFC6830.
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2}
-| |       ... | ${dut1_to_dut2_ip6} | ${prefix6}
-| |       ... | ${dut1_node} | ${dut1_to_tg}
-| |       ... | ${dut1_to_tg_ip6} | ${prefix6}
-| |       ... | ${dut2_node} | ${dut2_to_dut1}
-| |       ... | ${dut2_to_dut1_ip6} | ${prefix6}
-| |       ... | ${dut2_node} | ${dut2_to_tg}
-| |       ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6}
-| |       ... | ${tg_to_dut2_mac}
-| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6}
-| |       ... | ${tg_to_dut1_mac}
-| | When Set up Lisp topology
-| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| |      ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| |      ... | ${dut1_to_dut2_ip6_static_adjacency}
-| |      ... | ${dut2_to_dut1_ip6_static_adjacency}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
-| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
-| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6}
-| |      ... | ${dut2_to_dut1_ip6_reconf} | ${prefix6}
-| |      ... | ${dut1_to_dut2_ip6_static_adjacency}
-| |      ... | ${dut1_to_dut2_ip6_static_adjacency_reconf}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-| TC03: DUT1 and DUT2 route IPv4 bidirectionally over LISPoIPv6 tunnel
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. \
-| | ... | [Enc] Eth-IPv6-LISP-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on
-| | ... | TG-DUTn.
-| | ... | [Cfg] On DUT1 and DUT2 configure IPv6 LISP static adjacencies.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across both
-| | ... | DUTs and LISP tunnel between them; verify IPv4 headers on received
-| | ... | packets are correct.
-| | ... | [Cfg2] Reconf LISP.
-| | ... | [Ver2] Verify packets are received again via LISP tunnel.
-| | ... | [Ref] RFC6830.
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2}
-| |       ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6}
-| |       ... | ${dut1_node} | ${dut1_to_tg}
-| |       ... | ${dut1_to_tg_ip4o6} | ${tg_prefix4o6}
-| |       ... | ${dut2_node} | ${dut2_to_dut1}
-| |       ... | ${dut2_to_dut1_ip4o6} | ${dut_prefix4o6}
-| |       ... | ${dut2_node} | ${dut2_to_tg}
-| |       ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4o6}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4o6}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4o6}
-| |       ... | ${tg_to_dut2_mac}
-| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6}
-| |       ... | ${tg_to_dut1_mac}
-| | When Set up Lisp topology
-| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| |      ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| |      ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
-| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
-| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4o6}
-| |      ... | ${dut2_to_dut1_ip4o6_reconf} | ${dut_prefix4o6}
-| |      ... | ${dut1_ip4o6_static_adjacency}
-| |      ... | ${dut1_ip4o6_static_adjacency_reconf}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-| TC04: DUT1 and DUT2 route IPv6 bidirectionally over LISPoIPv4 tunnel
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. \
-| | ... | [Enc] Eth-IPv4-LISP-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on
-| | ... | TG-DUTn.
-| | ... | [Cfg] On DUT1 and DUT2 configure IPv4 LISP static adjacencies.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across both
-| | ... | DUTs and LISP tunnel between them; verify IPv4 headers on received
-| | ... | packets are correct.
-| | ... | [Cfg2] Reconf LISP.
-| | ... | [Ver2] Verify packets are received again via LISP tunnel.
-| | ... | [Ref] RFC6830.
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2}
-| |       ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4}
-| |       ... | ${dut1_node} | ${dut1_to_tg}
-| |       ... | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4}
-| |       ... | ${dut2_node} | ${dut2_to_dut1}
-| |       ... | ${dut2_to_dut1_ip6o4} | ${dut_prefix6o4}
-| |       ... | ${dut2_node} | ${dut2_to_tg}
-| |       ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4}
-| |       ... | ${tg_to_dut2_mac}
-| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4}
-| |       ... | ${tg_to_dut1_mac}
-| | When Set up Lisp topology
-| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| |      ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| |      ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node}
-| |      ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac}
-| |      ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6o4}
-| |      ... | ${dut2_to_dut1_ip6o4_reconf} | ${dut_prefix6o4}
-| |      ... | ${dut1_ip6o4_static_adjacency}
-| |      ... | ${dut1_ip6o4_static_adjacency_reconf}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-
-| TC05: DUT1 and DUT2 route IPv4 over LISPoIPv4 tunnel after disable-enable
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. \
-| | ... | [Enc] Eth-IPv4-LISP-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on
-| | ... | TG-DUTn.
-| | ... | [Cfg1] On DUT1 and DUT2 configure IPv4 LISP static adjacencies.
-| | ... | [Ver1] Make TG send ICMPv4 Echo Req between its interfaces across
-| | ... | both DUTs and LISP tunnel between them; verify IPv4 headers on
-| | ... | received packets are correct.
-| | ... | [Cfg2] Disable LISP.
-| | ... | [Ver2] Verify packets are not received via LISP tunnel.
-| | ... | [Cfg3] Re-enable LISP.
-| | ... | [Ver3] Verify packets are received again via LISP tunnel.
-| | ... | [Ref] RFC6830.
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2}
-| |       ... | ${dut1_to_dut2_ip4} | ${prefix4}
-| |       ... | ${dut1_node} | ${dut1_to_tg}
-| |       ... | ${dut1_to_tg_ip4} | ${prefix4}
-| |       ... | ${dut2_node} | ${dut2_to_dut1}
-| |       ... | ${dut2_to_dut1_ip4} | ${prefix4}
-| |       ... | ${dut2_node} | ${dut2_to_tg}
-| |       ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4}
-| |       ... | ${tg_to_dut2_mac}
-| | And   Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4}
-| |       ... | ${tg_to_dut1_mac}
-| | When Set up Lisp topology
-| |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
-| |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
-| |      ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| |      ... | ${dut1_to_dut2_ip4_static_adjacency}
-| |      ... | ${dut2_to_dut1_ip4_static_adjacency}
-| | Then Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Disable Lisp | ${dut1_node}
-| | Then Send packet from Port to Port should failed
-| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send packet from Port to Port should failed
-| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
-| | When Enable Lisp | ${dut1_node}
-| | And Vpp Add Lisp Adjacency | ${dut1_node} 
-| |     ... | ${dut1_to_dut2_ip4_static_adjacency['vni']}
-| |     ... | ${dut1_to_dut2_ip4_static_adjacency['deid']}
-| |     ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']}
-| |     ... | ${dut1_to_dut2_ip4_static_adjacency['seid']}
-| |     ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']}
-| | And Vpp Add Lisp Adjacency | ${dut2_node} 
-| |     ... | ${dut2_to_dut1_ip4_static_adjacency['vni']}
-| |     ... | ${dut2_to_dut1_ip4_static_adjacency['deid']}
-| |     ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']}
-| |     ... | ${dut2_to_dut1_ip4_static_adjacency['seid']}
-| |     ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']}
-| | Then Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers
-| |      ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
-| |      ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
-| |      ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}