CSIT-203: Expand LISP test

- Change LISP configuration and test if LISP tunnel still work.

Change-Id: I28426d7cc0ede11aa7e826ab40ed1c95c8606abc
Signed-off-by: Andrej Kozemcak <akozemca@cisco.com>

6 files changed, 207 insertions, 37 deletions

diff --git a/resources/libraries/python/LispSetup.py b/resources/libraries/python/LispSetup.py
index 13d0501abb..531510198c 100644
--- a/resources/libraries/python/LispSetup.py
+++ b/resources/libraries/python/LispSetup.py
@@ -99,7 +99,7 @@ class LispRemoteMapping(object):
                                       'lisp/del_lisp_remote_mapping.vat',
                                       vni=vni,
                                       deid=deid,
-                                      deid_predix=deid_prefix,
+                                      deid_prefix=deid_prefix,
                                       seid=seid,
                                       seid_prefix=seid_prefix,
                                       rloc=rloc)
@@ -159,7 +159,7 @@ class LispAdjacency(object):
                                       'lisp/del_lisp_adjacency.vat',
                                       vni=vni,
                                       deid=deid,
-                                      deid_predix=deid_prefix,
+                                      deid_prefix=deid_prefix,
                                       seid=seid,
                                       seid_prefix=seid_prefix)
 
diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot
index 8d0a98c630..faffeb3921 100644
--- a/resources/libraries/robot/lisp/lisp_api.robot
+++ b/resources/libraries/robot/lisp/lisp_api.robot
@@ -130,7 +130,7 @@
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - locator_set_number - Number how many locator_set data
-| | ... |                        it will generate. Type: int
+| | ... |                        it will generate. Type: integer
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
diff --git a/resources/libraries/robot/lisp/lisp_static_adjacency.robot b/resources/libraries/robot/lisp/lisp_static_adjacency.robot
index 79e26c5dc9..92d62eb549 100644
--- a/resources/libraries/robot/lisp/lisp_static_adjacency.robot
+++ b/resources/libraries/robot/lisp/lisp_static_adjacency.robot
@@ -19,6 +19,7 @@
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
 | Library  | resources.libraries.python.LispSetup.LispAdjacency
 | Library  | resources.libraries.python.LispSetup.LispRemoteMapping
+| Library  | resources.libraries.python.IPv4Util.IPv4Util
 
 *** Keywords ***
 | Set up Lisp topology
@@ -95,4 +96,73 @@
 | | ...                    | ${dut2_static_adjacency['deid']}
 | | ...                    | ${dut2_static_adjacency['prefix']}
 | | ...                    | ${dut2_static_adjacency['seid']}
-| | ...                    | ${dut2_static_adjacency['prefix']}
\ No newline at end of file
+| | ...                    | ${dut2_static_adjacency['prefix']}
+
+| Change Lisp Configuration
+| | [Documentation] | Change configuration of the Lisp protocol.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut1_node - DUT1 node. Type: dictionary
+| | ... | - dut2_node - DUT2 node. Type: dictionary
+| | ... | - dut1_to_dut2 - DUT1 towards DUT2 interface name. Type: string
+| | ... | - dut2_to_dut1 - DUT2 towards DUT1 interface name. Type: string
+| | ... | - dut1_to_dut2_mac - DUT1 towards DUT2 interface mac address.
+                               Type: string
+| | ... | - dut2_to_dut1_mac - DUT2 towards DUT1 interface mac address.
+                               Type: string
+| | ... | - new_dut1_ip - New DUT1 towards DUT2 interface IP address.
+                          Type: string
+| | ... | - new_dut2_ip - New DUT2 towards DUT1 interface IP address.
+                          Type: string
+| | ... | - prefix - Prefix of the DUT nodes. Type: integer
+| | ... | - old_dut1_static_adjacency - Old DUT1 static adjacency.
+| | ... |                               Type: dictionary
+| | ... | - new_dut1_static_adjacency - New DUT1 static adjacency.
+| | ... |                               Type: dictionary
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Change Lisp Configuration \| ${dut1_node} \| ${dut2_node} \
+| | ... | \| ${dut1_to_dut2} \| ${dut2_to_dut1} | "08:00:27:20:e0:0d" \
+| | ... | \| "08:00:27:b1:94:b1" \| "6.3.0.1" \| "6.3.0.20" \| "24" \
+| | ... | \| ${old_dut1_static_adjacency} \| ${new_dut1_static_adjacency} \|
+| | ...
+| | [Arguments] | ${dut1_node} | ${dut2_node} | ${dut1_to_dut2}
+| | ...         | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | ${dut2_to_dut1_mac}
+| | ...         | ${new_dut1_ip} | ${new_dut2_ip} | ${prefix}
+| | ...         | ${old_dut1_static_adjacency} | ${new_dut1_static_adjacency}
+| | Flush IPv4 Addresses "${dut2_to_dut1}" "${dut2_node}"
+| | Vpp Del Lisp Remote Mapping | ${dut1_node}
+| | ...                         | ${old_dut1_static_adjacency['vni']}
+| | ...                         | ${old_dut1_static_adjacency['deid']}
+| | ...                         | ${old_dut1_static_adjacency['prefix']}
+| | ...                         | ${old_dut1_static_adjacency['seid']}
+| | ...                         | ${old_dut1_static_adjacency['prefix']}
+| | ...                         | ${old_dut1_static_adjacency['rloc']}
+| | Vpp Del Lisp Adjacency | ${dut1_node}
+| | ...                    | ${old_dut1_static_adjacency['vni']}
+| | ...                    | ${old_dut1_static_adjacency['deid']}
+| | ...                    | ${old_dut1_static_adjacency['prefix']}
+| | ...                    | ${old_dut1_static_adjacency['seid']}
+| | ...                    | ${old_dut1_static_adjacency['prefix']}
+| | Set Interface Address | ${dut2_node} | ${dut2_to_dut1}
+| | ...                   | ${new_dut2_ip} | ${prefix}
+| | Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2} | ${new_dut2_ip}
+| | ...            | ${dut2_to_dut1_mac}
+| | Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${new_dut1_ip}
+| | ...            | ${dut1_to_dut2_mac}
+| | Vpp Add Lisp Remote Mapping | ${dut1_node}
+| | ...                         | ${new_dut1_static_adjacency['vni']}
+| | ...                         | ${new_dut1_static_adjacency['deid']}
+| | ...                         | ${new_dut1_static_adjacency['prefix']}
+| | ...                         | ${new_dut1_static_adjacency['seid']}
+| | ...                         | ${new_dut1_static_adjacency['prefix']}
+| | ...                         | ${new_dut1_static_adjacency['rloc']}
+| | Vpp Add Lisp Adjacency | ${dut1_node}
+| | ...                    | ${new_dut1_static_adjacency['vni']}
+| | ...                    | ${new_dut1_static_adjacency['deid']}
+| | ...                    | ${new_dut1_static_adjacency['prefix']}
+| | ...                    | ${new_dut1_static_adjacency['seid']}
+| | ...                    | ${new_dut1_static_adjacency['prefix']}
diff --git a/resources/templates/vat/lisp/del_lisp_adjacency.vat b/resources/templates/vat/lisp/del_lisp_adjacency.vat
new file mode 100644
index 0000000000..f4eca487e9
--- /dev/null
+++ b/resources/templates/vat/lisp/del_lisp_adjacency.vat
@@ -0,0 +1 @@
+lisp_add_del_adjacency del vni {vni} deid {deid}/{deid_prefix} seid {seid}/{seid_prefix}
diff --git a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
index de7aff068d..b3af598d58 100644
--- a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
@@ -47,6 +47,12 @@ dut2_ip4_eid = {'locator_name': locator_name,
                 'vni': 0,
                 'eid': '6.0.2.0',
                 'prefix': 24}
+dut2_to_dut1_ip4_reconf= '6.0.3.20'
+dut1_to_dut2_ip4_static_adjacency_reconf = {'vni': 0,
+                                            'deid': '6.0.2.0',
+                                            'seid': '6.0.1.0',
+                                            'rloc': '6.0.3.20',
+                                            'prefix': 24}
 
 # IPv6 Lisp static mapping configuration
 dut1_to_dut2_ip6 = '6:0:3::1'
@@ -74,6 +80,12 @@ dut2_ip6_eid = {'locator_name': locator_name,
                 'vni': 0,
                 'eid': '6:0:2::0',
                 'prefix': 64}
+dut2_to_dut1_ip6_reconf= '6:0:3::20'
+dut1_to_dut2_ip6_static_adjacency_reconf = {'vni': 0,
+                                            'deid': '6:0:2::0',
+                                            'seid': '6:0:1::0',
+                                            'rloc': '6:0:3::20',
+                                            'prefix': 64}
 
 # IPv4 over IPv6 Lisp static mapping configuration
 dut1_to_dut2_ip4o6 = '6:0:3::1'
@@ -102,6 +114,12 @@ dut2_ip4o6_eid = {'locator_name': locator_name,
                   'vni': 0,
                   'eid': '6.0.2.0',
                   'prefix': 24}
+dut2_to_dut1_ip4o6_reconf= '6:0:3::20'
+dut1_ip4o6_static_adjacency_reconf = {'vni': 0,
+                                      'deid': '6.0.2.0',
+                                      'seid': '6.0.1.0',
+                                      'rloc': '6:0:3::20',
+                                      'prefix': 24}
 
 # IPv6 over IPv4 Lisp static mapping configuration
 dut1_to_dut2_ip6o4 = '6.0.3.1'
@@ -130,3 +148,9 @@ dut2_ip6o4_eid = {'locator_name': locator_name,
                   'vni': 0,
                   'eid': '6:0:2::0',
                   'prefix': 64}
+dut2_to_dut1_ip6o4_reconf= '6.0.3.20'
+dut1_ip6o4_static_adjacency_reconf = {'vni': 0,
+                                      'deid': '6:0:2::0',
+                                      'seid': '6:0:1::0',
+                                      'rloc': '6.0.3.20',
+                                      'prefix': 64}
diff --git a/tests/func/lisp/lisp_dataplane_untagged.robot b/tests/func/lisp/lisp_dataplane_untagged.robot
index 1b33b4312e..6b4bb0ef1d 100644
--- a/tests/func/lisp/lisp_dataplane_untagged.robot
+++ b/tests/func/lisp/lisp_dataplane_untagged.robot
@@ -20,7 +20,6 @@
 | Resource | resources/libraries/robot/l2_traffic.robot
 | Library  | resources.libraries.python.IPUtil
 | Library  | resources.libraries.python.Trace
-| Library  | resources.libraries.python.IPv4Util.IPv4Util
 # 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
@@ -53,12 +52,16 @@
 *** 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. [Ref] RFC6830.
+| | ... | [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.
 | | [Tags] | EXPECTED_FAILING
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
@@ -92,15 +95,33 @@
 | |      ... | ${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. [Ref] RFC6830.
+| | ... | [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.
 | | [Tags] | EXPECTED_FAILING
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
@@ -134,15 +155,33 @@
 | |      ... | ${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. [Ref] RFC6830.
+| | ... | [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.
 | | [Tags] | EXPECTED_FAILING
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
@@ -175,15 +214,33 @@
 | |      ... | ${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. [Ref] RFC6830.
+| | ... | [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.
 | | [Tags] | EXPECTED_FAILING
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
@@ -216,17 +273,35 @@
 | |      ... | ${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.
+| | ... | [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.
 | | [Tags] | EXPECTED_FAILING
 | | Given Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}