X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Flisp%2Flisp_dataplane_untagged.robot;h=6b4bb0ef1d7b46adb03d6cae16e01a9abcd26329;hp=0808d366c692e7978e1302521639198c2fa03911;hb=49261a55c3f9198a4d1bbf1c2913263d6d77451c;hpb=70cbaaee0e6210682ce6d278ea645b8bea153b67

diff --git a/tests/func/lisp/lisp_dataplane_untagged.robot b/tests/func/lisp/lisp_dataplane_untagged.robot
index 0808d366c6..6b4bb0ef1d 100644
--- a/tests/func/lisp/lisp_dataplane_untagged.robot
+++ b/tests/func/lisp/lisp_dataplane_untagged.robot
@@ -16,13 +16,12 @@
 | 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_mapping.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
-| Library  | resources.libraries.python.IPv4Util.IPv4Util
 # import additional Lisp settings from resource file
-| Variables | resources/test_data/lisp/static_mapping/lisp_static_mapping.py
+| 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
@@ -30,7 +29,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 static remote mapping test cases*
+| Documentation | *LISP static adjacency test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
 | ... | with single links between nodes.
@@ -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 remote static mappings. [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']}
@@ -82,7 +85,22 @@
 | |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | |      ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| |      ... | ${dut1_ip4_static_mapping} | ${dut2_ip4_static_mapping}
+| |      ... | ${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}
@@ -94,12 +112,16 @@
 
 | 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 remote static mappings. [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']}
@@ -123,7 +145,22 @@
 | |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | |      ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| |      ... | ${dut1_ip6_static_mapping} | ${dut2_ip6_static_mapping}
+| |      ... | ${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}
@@ -135,12 +172,16 @@
 
 | 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 remote static mappings. [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']}
@@ -164,7 +205,21 @@
 | |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | |      ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| |      ... | ${dut1_ip4o6_static_mapping} | ${dut2_ip4o6_static_mapping}
+| |      ... | ${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}
@@ -176,12 +231,16 @@
 
 | 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 remote static mappings. [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']}
@@ -205,7 +264,21 @@
 | |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | |      ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| |      ... | ${dut1_ip6o4_static_mapping} | ${dut2_ip6o4_static_mapping}
+| |      ... | ${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}
@@ -217,14 +290,18 @@
 
 | 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 remote static mappings. [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']}
@@ -248,7 +325,8 @@
 | |      ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | |      ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | |      ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| |      ... | ${dut1_ip4_static_mapping} | ${dut2_ip4_static_mapping}
+| |      ... | ${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}