aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2020-03-31 02:59:44 +0200
committerJan Gelety <jgelety@cisco.com>2020-04-28 15:16:18 +0200
commit99b2e6a806652ea5e55f98f0a9fe31c45e6466d6 (patch)
tree758e91721724efc7daf9b07f2372ae3a637f9277
parentde3a83186108b8f217ad2f313f05fd04f7c0ddf7 (diff)
CSIT-1597 API cleanup: lisp
- cover API changes in VPP: https://gerrit.fd.io/r/c/vpp/+/24663 - update vpp stable to version 20.05-rc0~637 - remove unused L1 and L2 lisp KWs Change-Id: I2672b6a375ad70c82f331dcc991c145e868108b9 Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--VPP_STABLE_VER_CENTOS2
-rw-r--r--VPP_STABLE_VER_UBUNTU_BIONIC2
-rw-r--r--resources/api/vpp/supported_crcs.yaml260
-rw-r--r--resources/libraries/python/LispSetup.py483
-rw-r--r--resources/libraries/python/LispUtil.py427
-rw-r--r--resources/libraries/robot/overlay/lisp.robot78
-rw-r--r--resources/libraries/robot/overlay/lisp_api.robot337
-rw-r--r--resources/libraries/robot/overlay/lisp_static_adjacency.robot167
-rw-r--r--resources/test_data/lisp/lisp.py4
-rw-r--r--resources/test_data/lisp/performance/lisp_static_adjacency.py4
-rw-r--r--tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot2
-rw-r--r--tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot2
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot3
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot3
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot3
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot3
19 files changed, 210 insertions, 1576 deletions
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS
index 3b53666d62..d55fd28602 100644
--- a/VPP_STABLE_VER_CENTOS
+++ b/VPP_STABLE_VER_CENTOS
@@ -1 +1 @@
-20.05-rc0~630_gbc0d9ff~b9351
+20.05-rc0~637-g58db6e1~b9358
diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC
index 094c5babb5..beb6686f61 100644
--- a/VPP_STABLE_VER_UBUNTU_BIONIC
+++ b/VPP_STABLE_VER_UBUNTU_BIONIC
@@ -1 +1 @@
-20.05-rc0~630-gbc0d9ff67
+20.05-rc0~637-g58db6e16c
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml
index d2d3d0a245..2ad83b9fcd 100644
--- a/resources/api/vpp/supported_crcs.yaml
+++ b/resources/api/vpp/supported_crcs.yaml
@@ -30,255 +30,8 @@
# Use bash command "env LC_COLLATE=C sort -u" if not clear.
# https://logs.fd.io/production/vex-yul-rot-jenkins-1
-# /vpp-merge-master-ubuntu1804/1127/
-20.05-rc0~630:
- acl_add_replace: '0x1cabdeab' # dev
- acl_add_replace_reply: '0xac407b0c' # dev
- acl_details: '0x7a97f21c' # perf teardown
- acl_dump: '0xef34fea4' # perf teardown
- acl_interface_list_details: '0xe695d256' # perf teardown
- acl_interface_list_dump: '0xf9e6675e' # perf teardown
- acl_interface_set_acl_list: '0x473982bd' # perf
- acl_interface_set_acl_list_reply: '0xe8d4e804' # perf
- # 6x^ tc01-64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-mrr
- # tc01-64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-mrr
- # ^^ ip4fwdANDiaclANDacl10AND100_flows
- avf_create: '0xdaab8ae2' # dev
- avf_create_reply: '0x5383d31f' # dev
- bond_create: '0x48883c7e' # perf
- bond_create_reply: '0x5383d31f' # perf
- bond_enslave: '0x076ecfa7' # perf
- bond_enslave_reply: '0xe8d4e804' # perf
- # 4x^ tc01-64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
- # ^ l2xcfwdANDlbond_1lANDnf_testpmd
- bridge_domain_add_del: '0x600b7170' # dev
- bridge_domain_add_del_reply: '0xe8d4e804' # dev
- # bridge_domain_dump / details # honeycomb
- classify_add_del_session: '0xf20879f0' # dev
- classify_add_del_session_reply: '0xe8d4e804' # dev
- classify_add_del_table: '0x6849e39e' # dev
- classify_add_del_table_reply: '0x05486349' # dev
- # classify_session_dump / details # honeycomb
- # classify_table_by_interface / reply # honeycomb
- # classify_table_info / reply # honeycomb
- cli_inband: '0xf8377302' # dev setup
- cli_inband_reply: '0x05879051' # dev setup
- cop_interface_enable_disable: '0x5501adee' # dev
- cop_interface_enable_disable_reply: '0xe8d4e804' # dev
- cop_whitelist_enable_disable: '0xdebe13ea' # dev
- cop_whitelist_enable_disable_reply: '0xe8d4e804' # dev
- create_loopback: '0x42bb5d22' # dev
- create_loopback_reply: '0x5383d31f' # dev
- create_subif: '0xcb371063' # perf
- create_subif_reply: '0x5383d31f' # perf
- # ^^ tc01-64B-1c-dot1ad-l2xcbase-mrr
- # ^ 3n: dot1adANDl2xcfwd
- create_vhost_user_if: '0xc785c6fc' # dev
- create_vhost_user_if_reply: '0x5383d31f' # dev
- create_vlan_subif: '0xaf34ac8b' # dev
- create_vlan_subif_reply: '0x5383d31f' # dev
- # dhcp_proxy_dump / details # honeycomb
- gbp_bridge_domain_add: '0x8454bfdf' # dev
- gbp_bridge_domain_add_reply: '0xe8d4e804' # dev
- gbp_contract_add_del: '0x553e275b' # dev
- gbp_contract_add_del_reply: '0x1992deab' # dev
- gbp_endpoint_add: '0x9ce16d5a' # dev
- gbp_endpoint_add_reply: '0x1dd3ff3e' # dev
- gbp_endpoint_group_add: '0x8e0f4054' # dev
- gbp_endpoint_group_add_reply: '0xe8d4e804' # dev
- gbp_ext_itf_add_del: '0x12ed5700' # dev
- gbp_ext_itf_add_del_reply: '0xe8d4e804' # dev
- gbp_route_domain_add: '0x2d0afe38' # dev
- gbp_route_domain_add_reply: '0xe8d4e804' # dev
- gbp_subnet_add_del: '0x888aca35' # dev
- gbp_subnet_add_del_reply: '0xe8d4e804' # dev
- gpe_enable_disable: '0xeb0e943b' # dev
- gpe_enable_disable_reply: '0xe8d4e804' # dev
- # gre_tunnel_add_del / reply # unused L1 keyword: create_gre_tunnel_interface
- hw_interface_set_mtu: '0xe6746899' # dev
- hw_interface_set_mtu_reply: '0xe8d4e804' # dev
- input_acl_set_interface: '0xde7ad708' # dev
- input_acl_set_interface_reply: '0xe8d4e804' # dev
- ip_address_details: '0xb1199745' # dev
- ip_address_dump: '0x2d033de4' # dev
- ip_neighbor_add_del: '0x105518b6' # dev
- ip_neighbor_add_del_reply: '0x1992deab' # dev
- # ip_probe_neighbor / reply # unused L1 keyword vpp_ip_probe
- ip_route_add_del: '0xc1ff832d' # dev
- ip_route_add_del_reply: '0x1992deab' # dev
- # ip_source_check_interface_add_del / reply # unused L1 keyword vpp_ip_source_check_setup
- ip_table_add_del: '0x0ffdaec0' # dev
- ip_table_add_del_reply: '0xe8d4e804' # dev
- ipsec_interface_add_del_spd: '0x80f80cbb' # dev
- ipsec_interface_add_del_spd_reply: '0xe8d4e804' # dev
- ipsec_sad_entry_add_del: '0x57cc13fa' # dev
- ipsec_sad_entry_add_del_reply: '0x9ffac24b' # dev
- ipsec_select_backend: '0x5bcfd3b7' # perf
- ipsec_select_backend_reply: '0xe8d4e804' # perf
- # ^^ tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-mrr
- # ^ nic_intel-xl710ANDipsechwANDipsecintANDtnl_1ANDaes_256_gcm
- ipsec_spd_add_del: '0x20e89a95' # dev
- ipsec_spd_add_del_reply: '0xe8d4e804' # dev
- ipsec_spd_entry_add_del: '0x9f384b8d' # dev
- ipsec_spd_entry_add_del_reply: '0x9ffac24b' # dev
- ipsec_tunnel_if_add_del: '0x2b135e68' # perf
- ipsec_tunnel_if_add_del_reply: '0x5383d31f' # perf
- # ^^ tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr
- # ^ See select_backend.
- # l2_fib_table_dump / details # honeycomb
- l2_interface_vlan_tag_rewrite: '0x62cc0bbc' # dev
- l2_interface_vlan_tag_rewrite_reply: '0xe8d4e804' # dev
- l2_patch_add_del: '0x522f3445' # dev
- l2_patch_add_del_reply: '0xe8d4e804' # dev
- # l2fib_add_del / reply # unused L1 keyword: vpp_add_l2fib_entry
- lb_conf: '0x22ddb739' # perf
- lb_conf_reply: '0xe8d4e804' # perf
- lb_add_del_vip: '0xd15b7ddc' # perf
- lb_add_del_vip_reply: '0xe8d4e804' # perf
- lb_add_del_as: '0x78628987' # perf
- lb_add_del_as_reply: '0xe8d4e804' # perf
- lb_add_del_intf_nat4: '0x47d6e753' # perf
- lb_add_del_intf_nat4_reply: '0xe8d4e804' # perf
- # 8x^ tc01-64B-1c-ethip4-loadbalancer-nat4
- # ^ 2n: loadbalancer_nat4
- lisp_add_del_adjacency: '0xf047390d' # dev
- lisp_add_del_adjacency_reply: '0xe8d4e804' # dev
- lisp_add_del_local_eid: '0xe6d00717' # dev
- lisp_add_del_local_eid_reply: '0xe8d4e804' # dev
- lisp_add_del_locator: '0x006a4240' # dev
- lisp_add_del_locator_reply: '0xe8d4e804' # dev
- lisp_add_del_locator_set: '0x06968e38' # dev
- lisp_add_del_locator_set_reply: '0xb6666db4' # dev
- # lisp_add_del_map_resolver / reply # unused L2 keyword: Configure LISP map resolver address
- lisp_add_del_remote_mapping: '0xb879c3a9' # dev
- lisp_add_del_remote_mapping_reply: '0xe8d4e804' # dev
- lisp_eid_table_add_del_map: '0x59e9975e' # perf
- lisp_eid_table_add_del_map_reply: '0xe8d4e804' # perf
- # ^^ tc01-64B-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr # currently failing before calls
- # ^ ipsecANDlispgpe
- # lisp_eid_table_dump / details # unused L2 keyword: LISP eid address should be set correctly to eid table
- lisp_enable_disable: '0xeb0e943b' # dev
- lisp_enable_disable_reply: '0xe8d4e804' # dev
- # lisp_locator_set_dump / details # unused L2 keyword: LISP locator_set shpuld be configured correctly
- # lisp_map_server_dump / details # honeycomb
- # lisp_map_resolver_dump / details # unused L2 keyword: LISP map resolver address should be configured correctly
- macip_acl_add: '0xd648fd0a' # perf
- macip_acl_add_reply: '0xac407b0c' # perf
- macip_acl_details: '0x57c7482f' # perf teardown
- macip_acl_dump: '0xef34fea4' # perf teardown
- macip_acl_interface_add_del: '0x4b8690b1' # perf
- macip_acl_interface_add_del_reply: '0xe8d4e804' # perf
- macip_acl_interface_get: '0x51077d14' # perf teardown
- macip_acl_interface_get_reply: '0xaccf9b05' # perf teardown
- # 8x^ tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-mrr
- # ^ macipANDacl1AND100_flows
- memif_create: '0xb1b25061' # dev
- memif_create_reply: '0x5383d31f' # dev
- memif_details: '0xd0382c4c' # dev
- memif_dump: '0x51077d14' # dev
- memif_socket_filename_add_del: '0xa2ce1a10' # dev
- memif_socket_filename_add_del_reply: '0xe8d4e804' # dev
- nat44_interface_add_del_feature: '0xf3699b83' # perf
- nat44_interface_add_del_feature_reply: '0xe8d4e804' # perf
- nat_det_add_del_map: '0x112fde05' # perf
- nat_det_add_del_map_reply: '0xe8d4e804' # perf
- nat_show_config: '0x51077d14' # perf teardown
- nat_show_config_reply: '0x7903ef06' # perf teardown
- # 6x^ tc01-64B-1c-ethip4udp-ip4base-nat44-mrr
- # ^ nat44NOTscaleNOTsrc_user_1
- nsim_configure: '0x16ed400f' # perf
- nsim_configure_reply: '0xe8d4e804' # perf
- nsim_output_feature_enable_disable: '0x3865946c' # perf
- nsim_output_feature_enable_disable_reply: '0xe8d4e804' # perf
- # 4x^ tc01-9000B-1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps
- # ^ 3n: nsimAND1stream
- policer_add_del: '0xcb948f6e' # dev
- policer_add_del_reply: '0xa177cef2' # dev
- policer_classify_set_interface: '0xde7ad708' # dev
- policer_classify_set_interface_reply: '0xe8d4e804' # dev
- # 4x^ tc01-64B-ethip4-ip4base-ipolicemarkbase-dev
- rdma_create: '0x076fe418' # perf
- rdma_create_reply: '0x5383d31f' # perf
- # 2x^ Any test with drv_rdma. Currently only available on 2n-clx.
- # - Not testable by devicetest (until we have environment with right NICs).
- # show_lisp_map_register_state / reply # honeycomb
- # show_lisp_map_request_mode / reply # honeycomb
- # show_lisp_pitr / reply # honeycomb
- # show_lisp_rloc_probe_state / reply # honeycomb
- # show_lisp_status / reply # unused L2 keywords: LISP should be enabled / disabled
- # show_lisp_use_petr / reply # honeycomb
- show_threads: '0x51077d14' # dev
- show_threads_reply: '0xefd78e83' # dev
- show_version: '0x51077d14' # dev setup
- show_version_reply: '0xc919bde1' # dev setup
- sr_localsid_add_del: '0x26fa3309' # perf
- sr_localsid_add_del_reply: '0xe8d4e804' # perf
- sr_localsids_details: '0x6a6c0265' # perf teardown
- sr_localsids_dump: '0x51077d14' # perf teardown
- sr_policies_details: '0x07ec2d93' # perf teardown
- sr_policies_dump: '0x51077d14' # perf teardown
- sr_policy_add: '0xec79ee6a' # perf
- sr_policy_add_reply: '0xe8d4e804' # perf
- sr_set_encap_source: '0xd3bad5e1' # perf
- sr_set_encap_source_reply: '0xe8d4e804' # perf
- sr_steering_add_del: '0x3711dace' # perf
- sr_steering_add_del_reply: '0xe8d4e804' # perf
- sr_steering_pol_details: '0x1c1ee786' # perf teardown
- sr_steering_pol_dump: '0x51077d14' # perf teardown
- # 14x^ tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
- # ^ srv6_1sid
- sw_interface_add_del_address: '0x5803d5c4' # dev
- sw_interface_add_del_address_reply: '0xe8d4e804' # dev
- sw_interface_bond_details: '0xf5ef2106' # perf
- sw_interface_bond_dump: '0x51077d14' # perf
- # ^^ see bond_*
- sw_interface_details: '0x17b69fa2' # dev setup
- sw_interface_dump: '0xaa610c27' # dev setup
- # sw_interface_get_table / reply # honeycomb
- sw_interface_ip6nd_ra_config: '0x3eb00b1c' # dev
- sw_interface_ip6nd_ra_config_reply: '0xe8d4e804' # dev
- sw_interface_rx_placement_details: '0xf6d7d024' # perf
- sw_interface_rx_placement_dump: '0xf9e6675e' # perf
- # ^^ tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
- # ^ dot1qANDl2bdmaclrnANDbaseANDmemif
- sw_interface_set_flags: '0x6a2b491a' # dev
- sw_interface_set_flags_reply: '0xe8d4e804' # dev
- sw_interface_set_l2_bridge: '0x2e483cd0' # dev
- sw_interface_set_l2_bridge_reply: '0xe8d4e804' # dev
- sw_interface_set_l2_xconnect: '0x1aaa2dbb' # dev
- sw_interface_set_l2_xconnect_reply: '0xe8d4e804' # dev
- sw_interface_set_mac_address: '0x6aca746a' # perf
- sw_interface_set_mac_address_reply: '0xe8d4e804' # perf
- sw_interface_set_rx_placement: '0xdb65f3c9' # perf
- sw_interface_set_rx_placement_reply: '0xe8d4e804' # perf
- # ^^ see tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr above
- sw_interface_set_table: '0xdf42a577' # dev
- sw_interface_set_table_reply: '0xe8d4e804' # dev
- sw_interface_set_unnumbered: '0x938ef33b' # perf
- sw_interface_set_unnumbered_reply: '0xe8d4e804' # perf
- # ^^ see ipsec_tunnel_if_add_del
- sw_interface_set_vxlan_bypass: '0x65247409' # dev
- sw_interface_set_vxlan_bypass_reply: '0xe8d4e804' # dev
- sw_interface_slave_details: '0x3c4a0e23' # perf
- sw_interface_slave_dump: '0xf9e6675e' # perf
- # ^^ see bond_*
- # sw_interface_span_dump / details # honeycomb
- sw_interface_tap_v2_dump: '0xf9e6675e' # dev
- sw_interface_tap_v2_details: '0xe53c16de' # dev
- sw_interface_vhost_user_details: '0x98530df1' # dev
- sw_interface_vhost_user_dump: '0xf9e6675e' # dev
- tap_create_v2: '0x445835fd' # dev
- tap_create_v2_reply: '0x5383d31f' # dev
- vxlan_add_del_tunnel: '0xa35dc8f5' # dev
- vxlan_add_del_tunnel_reply: '0x5383d31f' # dev
- # vxlan_gpe_tunnel_dump / details # honeycomb
- # vxlan_tunnel_dump /details # unused L2 keyword: Get VXLAN dump
-# Please keep alphabetic order.
-# Use bash command "env LC_COLLATE=C sort -u" if not clear.
-
-
-# https://gerrit.fd.io/r/c/vpp/+/24663
-24663/6:
+# /vpp-merge-master-ubuntu1804/1134/
+20.05-rc0~637:
acl_add_replace: '0x1cabdeab' # dev
acl_add_replace_reply: '0xac407b0c' # dev
acl_details: '0x7a97f21c' # perf teardown
@@ -406,9 +159,6 @@
# lisp_eid_table_dump / details # unused L2 keyword: LISP eid address should be set correctly to eid table
lisp_enable_disable: '0xc264d7bf' # dev
lisp_enable_disable_reply: '0xe8d4e804' # dev
- # lisp_locator_set_dump / details # unused L2 keyword: LISP locator_set shpuld be configured correctly
- # lisp_map_server_dump / details # honeycomb
- # lisp_map_resolver_dump / details # unused L2 keyword: LISP map resolver address should be configured correctly
macip_acl_add: '0xd648fd0a' # perf
macip_acl_add_reply: '0xac407b0c' # perf
macip_acl_details: '0x57c7482f' # perf teardown
@@ -448,12 +198,6 @@
rdma_create_reply: '0x5383d31f' # perf
# 2x^ Any test with drv_rdma. Currently only available on 2n-clx.
# - Not testable by devicetest (until we have environment with right NICs).
- # show_lisp_map_register_state / reply # honeycomb
- # show_lisp_map_request_mode / reply # honeycomb
- # show_lisp_pitr / reply # honeycomb
- # show_lisp_rloc_probe_state / reply # honeycomb
- # show_lisp_status / reply # unused L2 keywords: LISP should be enabled / disabled
- # show_lisp_use_petr / reply # honeycomb
show_threads: '0x51077d14' # dev
show_threads_reply: '0xefd78e83' # dev
show_version: '0x51077d14' # dev setup
diff --git a/resources/libraries/python/LispSetup.py b/resources/libraries/python/LispSetup.py
index 666b6e636d..59cb1a808d 100644
--- a/resources/libraries/python/LispSetup.py
+++ b/resources/libraries/python/LispSetup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2019 Cisco and/or its affiliates.
+# Copyright (c) 2016-2020 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:
@@ -13,11 +13,66 @@
"""Library to set up Lisp in topology."""
+from enum import IntEnum
+
from ipaddress import ip_address
-from resources.libraries.python.L2Util import L2Util
+from resources.libraries.python.IPUtil import IPUtil
from resources.libraries.python.PapiExecutor import PapiSocketExecutor
-from resources.libraries.python.topology import NodeType
+
+
+class EidType(IntEnum):
+ """EID types."""
+ PREFIX = 0
+ MAC = 1
+ NSH = 2
+
+
+class LispEid:
+ """Class for lisp eid."""
+
+ @staticmethod
+ def create_eid(eid, prefix_len):
+ """Create lisp eid object.
+
+ :param eid: Eid value.
+ :param prefix_len: Prefix len if the eid is IP address.
+ :type eid: str
+ :type prefix_len: int
+ """
+ eid_addr = dict(prefix=IPUtil.create_prefix_object(
+ ip_address(eid), prefix_len)
+ ) if prefix_len else dict(mac=str(eid))
+
+ return dict(
+ type=getattr(
+ EidType, u"PREFIX" if prefix_len else u"MAC"
+ ).value,
+ address=eid_addr
+ )
+
+
+class LispRemoteLocator:
+ """Class for lisp remote locator."""
+
+ @staticmethod
+ def create_rloc(ip_addr, priority=0, weight=0):
+ """Create lisp remote locator object.
+
+ :param ip_addr: IP/IPv6 address.
+ :param priority: Priority of the remote locator.
+ :param weight: Weight of the remote locator.
+ :type ip_addr: str
+ :type priority: int
+ :type weight: int
+ """
+ return [
+ dict(
+ priority=priority,
+ weight=weight,
+ ip_address=ip_address(ip_addr)
+ )
+ ]
class LispStatus:
@@ -32,14 +87,14 @@ class LispStatus:
:type node: dict
:type state: str
"""
- args = dict(is_en=0 if state == u"disable" else 1)
-
+ args = dict(is_enable=bool(state == u"enable"))
cmd = u"lisp_enable_disable"
err_msg = f"Failed to set LISP status on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
+
class LispRemoteMapping:
"""Class for lisp remote mapping API."""
@@ -66,39 +121,15 @@ class LispRemoteMapping:
:type rloc: str
:type is_mac: bool
"""
- if not is_mac:
- eid_type = 0 if ip_address(deid).version == 4 else 1
- eid_packed = ip_address(deid).packed
- seid_packed = ip_address(seid).packed
- eid_len = deid_prefix
- seid_len = seid_prefix
- else:
- eid_type = 2
- eid_packed = L2Util.mac_to_bin(deid)
- seid_packed = L2Util.mac_to_bin(seid)
- eid_len = 0
- seid_len = 0
-
- rlocs = [
- dict(
- is_ip4=1 if ip_address(rloc).version == 4 else 0,
- addr=ip_address(rloc).packed
- )
- ]
-
args = dict(
- is_add=1,
- is_src_dst=1,
+ is_add=True,
+ is_src_dst=True,
vni=int(vni),
- eid_type=eid_type,
- eid=eid_packed,
- eid_len=eid_len,
- seid=seid_packed,
- seid_len=seid_len,
+ deid=LispEid.create_eid(deid, deid_prefix if not is_mac else None),
+ seid=LispEid.create_eid(seid, seid_prefix if not is_mac else None),
rloc_num=1,
- rlocs=rlocs
+ rlocs=LispRemoteLocator.create_rloc(rloc)
)
-
cmd = u"lisp_add_del_remote_mapping"
err_msg = f"Failed to add remote mapping on host {node[u'host']}"
@@ -126,47 +157,22 @@ class LispRemoteMapping:
:type rloc: str
"""
# used only with IPs
- is_mac = False
-
- if not is_mac:
- eid_type = 0 if ip_address(deid).version == 4 else 1
- eid_packed = ip_address(deid).packed
- seid_packed = ip_address(seid).packed
- eid_len = deid_prefix
- seid_len = seid_prefix
- else:
- eid_type = 2
- eid_packed = L2Util.mac_to_bin(deid)
- seid_packed = L2Util.mac_to_bin(seid)
- eid_len = 0
- seid_len = 0
-
- rlocs = [
- dict(
- is_ip4=1 if ip_address(str(rloc)).version == 4 else 0,
- addr=ip_address(str(rloc)).packed
- )
- ]
-
args = dict(
- is_add=0,
- is_src_dst=1,
+ is_add=False,
+ is_src_dst=True,
vni=int(vni),
- eid_type=eid_type,
- eid=eid_packed,
- eid_len=eid_len,
- seid=seid_packed,
- seid_len=seid_len,
+ deid=LispEid.create_eid(deid, deid_prefix),
+ seid=LispEid.create_eid(seid, seid_prefix),
rloc_num=1,
- rlocs=rlocs
+ rlocs=LispRemoteLocator.create_rloc(rloc)
)
-
cmd = u"lisp_add_del_remote_mapping"
err_msg = f"Failed to delete remote mapping on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
+
class LispAdjacency:
"""Class for lisp adjacency API."""
@@ -190,29 +196,12 @@ class LispAdjacency:
:type seid_prefix: int
:type is_mac: bool
"""
- if not is_mac:
- eid_type = 0 if ip_address(deid).version == 4 else 1
- reid = ip_address(deid).packed
- leid = ip_address(seid).packed
- reid_len = deid_prefix
- leid_len = seid_prefix
- else:
- eid_type = 2
- reid = L2Util.mac_to_bin(deid)
- leid = L2Util.mac_to_bin(seid)
- reid_len = 0
- leid_len = 0
-
args = dict(
- is_add=1,
+ is_add=True,
vni=int(vni),
- eid_type=eid_type,
- reid=reid,
- reid_len=reid_len,
- leid=leid,
- leid_len=leid_len
+ reid=LispEid.create_eid(deid, deid_prefix if not is_mac else None),
+ leid=LispEid.create_eid(seid, seid_prefix if not is_mac else None)
)
-
cmd = u"lisp_add_del_adjacency"
err_msg = f"Failed to add lisp adjacency on host {node[u'host']}"
@@ -238,39 +227,21 @@ class LispAdjacency:
:type seid_prefix: int
"""
# used only with IPs
- is_mac = False
-
- if not is_mac:
- eid_type = 0 if ip_address(deid).version == 4 else 1
- reid = ip_address(deid).packed
- leid = ip_address(seid).packed
- reid_len = deid_prefix
- leid_len = seid_prefix
- else:
- eid_type = 2
- reid = L2Util.mac_to_bin(deid)
- leid = L2Util.mac_to_bin(seid)
- reid_len = 0
- leid_len = 0
-
args = dict(
- is_add=0,
+ is_add=False,
vni=int(vni),
- eid_type=eid_type,
- reid=reid,
- reid_len=reid_len,
- leid=leid,
- leid_len=leid_len
+ eid=LispEid.create_eid(deid, deid_prefix),
+ leid=LispEid.create_eid(seid, seid_prefix)
)
-
cmd = u"lisp_add_del_adjacency"
err_msg = f"Failed to delete lisp adjacency on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
+
class LispGpeStatus:
- """Clas for LISP GPE status manipulation."""
+ """Class for LISP GPE status manipulation."""
@staticmethod
def vpp_lisp_gpe_enable_disable(node, state):
@@ -281,76 +252,13 @@ class LispGpeStatus:
:type node: dict
:type state: str
"""
- args = dict(is_en=0 if state == u"disable" else 1)
-
+ args = dict(is_enable=bool(state == u"enable"))
cmd = u"gpe_enable_disable"
err_msg = f"Failed to set LISP GPE status on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
-class LispGpeForwardEntry:
- """The functionality needed for these methods is not implemented in VPP
- (VAT). Bug https://jira.fd.io/browse/VPP-334 was open to cover this issue.
-
- TODO: Implement when VPP-334 is fixed.
- """
-
- @staticmethod
- def add_lisp_gpe_forward_entry(node, *args):
- """Not implemented"""
- # TODO: Implement when VPP-334 is fixed.
-
- @staticmethod
- def del_lisp_gpe_forward_entry(node, *args):
- """Not implemented"""
- # TODO: Implement when VPP-334 is fixed.
-
-
-class LispMapResolver:
- """Class for Lisp map resolver API."""
-
- @staticmethod
- def vpp_add_map_resolver(node, map_resolver_ip):
- """Set lisp map resolver on the VPP node in topology.
-
- :param node: VPP node.
- :param map_resolver_ip: IP address of the map resolver.
- :type node: dict
- :type map_resolver_ip: str
- """
- args = dict(
- is_add=1,
- is_ipv6=0 if ip_address(map_resolver_ip).version == 4 else 1,
- ip_address=ip_address(map_resolver_ip).packed
- )
-
- cmd = u"lisp_add_del_map_resolver"
- err_msg = f"Failed to add map resolver on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_reply(err_msg)
-
- @staticmethod
- def vpp_del_map_resolver(node, map_resolver_ip):
- """Unset lisp map resolver on the VPP node in topology.
-
- :param node: VPP node.
- :param map_resolver_ip: IP address of the map resolver.
- :type node: dict
- :type map_resolver_ip: str
- """
- args = dict(
- is_add=0,
- is_ipv6=0 if ip_address(map_resolver_ip).version == 4 else 1,
- ip_address=ip_address(map_resolver_ip).packed
- )
-
- cmd = u"lisp_add_del_map_resolver"
- err_msg = f"Failed to delete map resolver on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- papi_exec.add(cmd, **args).get_reply(err_msg)
class LispLocalEid:
"""Class for Lisp local eid API."""
@@ -362,31 +270,21 @@ class LispLocalEid:
:param node: VPP node.
:param locator_set_name: Name of the locator_set.
- :param vni: vni value.
+ :param vni: Vni value.
:param eid: Eid value.
- :param prefix_len: prefix len if the eid is IP address.
+ :param prefix_len: Prefix len if the eid is IP address.
:type node: dict
:type locator_set_name: str
:type vni: int
:type eid: str
:type prefix_len: int
"""
- if prefix_len:
- eid_type = 0 if ip_address(eid).version == 4 else 1
- eid_packed = ip_address(eid).packed
- else:
- eid_type = 2
- eid_packed = L2Util.mac_to_bin(eid)
-
args = dict(
- is_add=1,
- eid_type=eid_type,
- eid=eid_packed,
- prefix_len=prefix_len,
+ is_add=True,
+ eid=LispEid.create_eid(eid, prefix_len),
locator_set_name=locator_set_name,
vni=int(vni)
)
-
cmd = u"lisp_add_del_local_eid"
err_msg = f"Failed to add local eid on host {node[u'host']}"
@@ -396,41 +294,32 @@ class LispLocalEid:
@staticmethod
def vpp_del_lisp_local_eid(
node, locator_set_name, vni, eid, prefix_len=None):
- """Set lisp eid addres on the VPP node in topology.
+ """Set lisp eid address on the VPP node in topology.
:param node: VPP node.
:param locator_set_name: Name of the locator_set.
- :param vni: vni value.
+ :param vni: Vni value.
:param eid: Eid value.
- :param prefix_len: prefix len if the eid is IP address.
+ :param prefix_len: Prefix len if the eid is IP address.
:type node: dict
:type locator_set_name: str
:type vni: int
:type eid: str
:type prefix_len: int
"""
- if prefix_len:
- eid_type = 0 if ip_address(eid).version == 4 else 1
- eid_packed = ip_address(eid).packed
- else:
- eid_type = 2
- eid_packed = L2Util.mac_to_bin(eid)
-
args = dict(
- is_add=0,
- eid_type=eid_type,
- eid=eid_packed,
- prefix_len=prefix_len,
+ is_add=False,
+ eid=LispEid.create_eid(eid, prefix_len),
locator_set_name=locator_set_name,
vni=int(vni)
)
-
cmd = u"lisp_add_del_local_eid"
err_msg = f"Failed to delete local eid on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
+
class LispLocator:
"""Class for the Lisp Locator API."""
@@ -440,9 +329,9 @@ class LispLocator:
:param node: VPP node.
:param locator_name: Name of the locator_set.
- :param sw_if_index: sw_if_index if the interface.
- :param priority: priority of the locator.
- :param weight: weight of the locator.
+ :param sw_if_index: Sw_if_index if the interface.
+ :param priority: Priority of the locator.
+ :param weight: Weight of the locator.
:type node: dict
:type locator_name: str
:type sw_if_index: int
@@ -451,13 +340,12 @@ class LispLocator:
"""
args = dict(
- is_add=1,
+ is_add=True,
locator_set_name=locator_name,
sw_if_index=sw_if_index,
priority=priority,
weight=weight
)
-
cmd = u"lisp_add_del_locator"
err_msg = f"Failed to add locator on host {node[u'host']}"
@@ -470,9 +358,9 @@ class LispLocator:
:param node: VPP node.
:param locator_name: Name of the locator_set.
- :param sw_if_index: sw_if_index if the interface.
- :param priority: priority of the locator.
- :param weight: weight of the locator.
+ :param sw_if_index: Sw_if_index if the interface.
+ :param priority: Priority of the locator.
+ :param weight: Weight of the locator.
:type node: dict
:type locator_name: str
:type sw_if_index: int
@@ -480,19 +368,19 @@ class LispLocator:
:type weight: int
"""
args = dict(
- is_add=0,
+ is_add=False,
locator_set_name=locator_name,
sw_if_index=sw_if_index,
priority=priority,
weight=weight
)
-
cmd = u"lisp_add_del_locator"
err_msg = f"Failed to delete locator on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
+
class LispLocatorSet:
"""Class for Lisp Locator Set API."""
@@ -506,12 +394,11 @@ class LispLocatorSet:
:type name: str
"""
args = dict(
- is_add=1,
+ is_add=True,
locator_set_name=name,
locator_num=0,
locators=[]
)
-
cmd = u"lisp_add_del_locator_set"
err_msg = f"Failed to add locator set on host {node[u'host']}"
@@ -528,154 +415,17 @@ class LispLocatorSet:
:type name: str
"""
args = dict(
- is_add=0,
+ is_add=False,
locator_set_name=name,
locator_num=0,
locators=[]
)
-
cmd = u"lisp_add_del_locator_set"
err_msg = f"Failed to delete locator set on host {node[u'host']}"
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
-class LispSetup:
- """Lisp setup in topology."""
-
- @staticmethod
- def vpp_set_lisp_locator_set(node, locator_set_list):
- """Set lisp locator_sets on VPP node in topology.
-
- :param node: VPP node.
- :param locator_set_list: List of locator_set.
- :type node: dict
- :type locator_set_list: list
- """
-
- if node[u"type"] != NodeType.DUT:
- raise ValueError(u"Node is not DUT")
-
- lisp_locator = LispLocator()
- lisp_locator_set = LispLocatorSet()
- for locator_set in locator_set_list:
- locator_set_name = locator_set.get(u"locator-set")
- locator_list = locator_set.get(u"locator")
- lisp_locator_set.vpp_add_lisp_locator_set(node, locator_set_name)
- for locator in locator_list:
- sw_if_index = locator.get(u"locator-index")
- priority = locator.get(u"priority")
- weight = locator.get(u"weight")
- lisp_locator.vpp_add_lisp_locator(
- node, locator_set_name, sw_if_index, priority, weight
- )
-
- @staticmethod
- def vpp_unset_lisp_locator_set(node, locator_set_list):
- """Unset lisp locator_sets on VPP node in topology.
-
- :param node: VPP node.
- :param locator_set_list: List of locator_set.
- :type node: dict
- :type locator_set_list: list
- """
- if node[u"type"] != NodeType.DUT:
- raise ValueError(u"Lisp locator set, node is not DUT")
-
- lisp_locator = LispLocator()
- lisp_locator_set = LispLocatorSet()
- for locator_set in locator_set_list:
- locator_set_name = locator_set.get(u"locator-set")
- locator_list = locator_set.get(u"locator")
- for locator in locator_list:
- sw_if_index = locator.get(u"locator-index")
- priority = locator.get(u"priority")
- weight = locator.get(u"weight")
- lisp_locator.vpp_del_lisp_locator(
- node, locator_set_name, sw_if_index, priority, weight
- )
-
- lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
-
- @staticmethod
- def vpp_set_lisp_eid_table(node, eid_table):
- """Set lisp eid tables on VPP node in topology.
-
- :param node: VPP node.
- :param eid_table: Dictionary containing information of eid_table.
- :type node: dict
- :type eid_table: dict
- """
- if node[u"type"] != NodeType.DUT:
- raise ValueError(u"Node is not DUT")
-
- lisp_locator_set = LispLocatorSet()
- lisp_eid = LispLocalEid()
- for eid in eid_table:
- vni = eid.get(u"vni")
- eid_address = eid.get(u"eid")
- eid_prefix_len = eid.get(u"eid-prefix-len")
- locator_set_name = eid.get(u"locator-set")
- lisp_locator_set.vpp_add_lisp_locator_set(node, locator_set_name)
- lisp_eid.vpp_add_lisp_local_eid(
- node, locator_set_name, vni, eid_address, eid_prefix_len
- )
-
- @staticmethod
- def vpp_unset_lisp_eid_table(node, eid_table):
- """Unset lisp eid tables on VPP node in topology.
-
- :param node: VPP node.
- :param eid_table: Dictionary containing information of eid_table.
- :type node: dict
- :type eid_table: dict
- """
- if node[u"type"] != NodeType.DUT:
- raise ValueError(u"Node is not DUT")
-
- locator_set_list = []
- lisp_locator_set = LispLocatorSet()
- lisp_eid = LispLocalEid()
- for eid in eid_table:
- vni = eid.get(u"vni")
- eid_address = eid.get(u"eid")
- eid_prefix_len = eid.get(u"eid-prefix-len")
- locator_set_name = eid.get(u"locator-set")
- if locator_set_name not in locator_set_list:
- locator_set_list.append(locator_set_name)
-
- lisp_eid.vpp_del_lisp_local_eid(
- node, locator_set_name, vni, eid_address, eid_prefix_len
- )
-
- for locator_set_name in locator_set_list:
- lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
-
- @staticmethod
- def vpp_set_lisp_map_resolver(node, map_resolver):
- """Set lisp map resolvers on VPP node in topology.
-
- :param node: VPP node.
- :param map_resolver: Dictionary containing information of map resolver.
- :type node: dict
- :type map_resolver: dict
- """
- lisp_map_res = LispMapResolver()
- for map_ip in map_resolver:
- lisp_map_res.vpp_add_map_resolver(node, map_ip.get(u"map resolver"))
-
- @staticmethod
- def vpp_unset_lisp_map_resolver(node, map_resolver):
- """Unset lisp map resolvers on VPP node in topology.
-
- :param node: VPP node.
- :param map_resolver: Dictionary containing information of map resolver.
- :type node: dict
- :type map_resolver: dict
- """
- lisp_map_res = LispMapResolver()
- for map_ip in map_resolver:
- lisp_map_res.vpp_del_map_resolver(node, map_ip.get(u"map resolver"))
class LispEidTableMap:
"""
@@ -697,28 +447,15 @@ class LispEidTableMap:
:type vrf: int
"""
# adding default mapping vni=0, vrf=0 needs to be skipped
- skip = False
-
- if bd_id:
- is_l2 = 1
- dp_table = bd_id
- else:
- is_l2 = 0
- dp_table = vrf
- # skip adding default mapping
- if (int(vrf) == 0) and (int(vni) == 0):
- skip = True
-
- args = dict(
- is_add=1,
- vni=int(vni),
- dp_table=int(dp_table),
- is_l2=is_l2
- )
-
- cmd = u"lisp_eid_table_add_del_map"
- err_msg = f"Failed to add eid table map on host {node[u'host']}"
+ if bd_id is not None or int(vrf if vrf else 0) or int(vni):
+ args = dict(
+ is_add=True,
+ vni=int(vni),
+ dp_table=int(bd_id) if bd_id is not None else int(vrf),
+ is_l2=bool(bd_id is not None)
+ )
+ cmd = u"lisp_eid_table_add_del_map"
+ err_msg = f"Failed to add eid table map on host {node[u'host']}"
- if not skip:
with PapiSocketExecutor(node) as papi_exec:
papi_exec.add(cmd, **args).get_reply(err_msg)
diff --git a/resources/libraries/python/LispUtil.py b/resources/libraries/python/LispUtil.py
deleted file mode 100644
index a77f4ad854..0000000000
--- a/resources/libraries/python/LispUtil.py
+++ /dev/null
@@ -1,427 +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.
-
-"""Lisp utilities library."""
-
-from ipaddress import IPv4Address, IPv6Address
-from robot.api import logger
-
-from resources.libraries.python.L2Util import L2Util
-from resources.libraries.python.PapiExecutor import PapiSocketExecutor
-from resources.libraries.python.topology import Topology
-
-class LispUtil:
- """Implements keywords for Lisp tests."""
-
- @staticmethod
- def vpp_show_lisp_state(node):
- """Get lisp state from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: Lisp gpe state.
- :rtype: dict
- """
- cmd = u"show_lisp_status"
- err_msg = f"Failed to get LISP status on host {node['host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"feature_status"] = u"enabled" if reply[u"feature_status"] \
- else u"disabled"
- data[u"gpe_status"] = u"enabled" if reply[u"gpe_status"] \
- else u"disabled"
- return data
-
- @staticmethod
- def vpp_show_lisp_locator_set(node, items_filter):
- """Get lisp locator_set from VPP node.
-
- :param node: VPP node.
- :param items_filter: Filter which specifies which items should be
- retrieved - local, remote, empty string = both.
- :type node: dict
- :type items_filter: str
- :returns: Lisp locator_set data as python list.
- :rtype: list
- """
- ifilter = {u"_": 0, u"_local": 1, u"_remote": 2}
- args = dict(
- filter=ifilter[u"_" + items_filter]
- )
-
- cmd = u"lisp_locator_set_dump"
- err_msg = f"Failed to get LISP locator set on host {node['host']}"
-
- try:
- with PapiSocketExecutor(node) as papi_exec:
- details = papi_exec.add(cmd, **args).get_details(err_msg)
- data = list()
- for locator in details:
- data.append(
- {u"ls_name": locator[u"ls_name"].rstrip(b'\0'),
- u"ls_index": locator[u"ls_index"]}
- )
- return data
- except (ValueError, LookupError) as err:
- logger.warn(f"Failed to get LISP locator set {err}")
- return list()
-
- @staticmethod
- def vpp_show_lisp_eid_table(node):
- """Get lisp eid table from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: Lisp eid table as python list.
- :rtype: list
- """
- cmd = u"lisp_eid_table_dump"
- err_msg = f"Failed to get LISP eid table on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- details = papi_exec.add(cmd).get_details(err_msg)
-
- data = list()
- for eid_details in details:
- eid = u"Bad eid type"
- if eid_details[u"eid_type"] == 0:
- prefix = str(eid_details[u"eid_prefix_len"])
- eid = str(IPv4Address(eid_details[u"eid"][0:4])) + u"/" + \
- prefix
- elif eid_details[u"eid_type"] == 1:
- prefix = str(eid_details[u"eid_prefix_len"])
- eid = str(IPv6Address(eid_details[u"eid"])) + u"/" + prefix
- elif eid_details[u"eid_type"] == 2:
- eid = str(L2Util.bin_to_mac(eid_details[u"eid"][0:6]))
- data.append(
- {
- u"action": eid_details[u"action"],
- u"is_local": eid_details[u"is_local"],
- u"eid": eid,
- u"vni": eid_details[u"vni"],
- u"ttl": eid_details[u"ttl"],
- u"authoritative": eid_details[u"authoritative"]
- }
- )
- return data
-
- @staticmethod
- def vpp_show_lisp_map_resolver(node):
- """Get lisp map resolver from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: Lisp map resolver as python list.
- :rtype: list
- """
- cmd = u"lisp_map_resolver_dump"
- err_msg = f"Failed to get LISP map resolver on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- details = papi_exec.add(cmd).get_details(err_msg)
-
- data = list()
- for resolver in details:
- address = u"Bad is_ipv6 flag"
- if resolver[u"is_ipv6"] == 0:
- address = str(IPv4Address(resolver[u"ip_address"][0:4]))
- elif resolver[u"is_ipv6"] == 1:
- address = str(IPv6Address(resolver[u"ip_address"]))
- data.append({u"map resolver": address})
- return data
-
- @staticmethod
- def vpp_show_lisp_map_register(node):
- """Get LISP Map Register from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: LISP Map Register as python dict.
- :rtype: dict
- """
- cmd = u"show_lisp_map_register_state"
- err_msg = f"Failed to get LISP map register state on host " \
- f"{node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"state"] = u"enabled" if reply[u"is_enabled"] else u"disabled"
- logger.info(data)
- return data
-
- @staticmethod
- def vpp_show_lisp_map_request_mode(node):
- """Get LISP Map Request mode from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: LISP Map Request mode as python dict.
- :rtype: dict
- """
- cmd = u"show_lisp_map_request_mode"
- err_msg = f"Failed to get LISP map request mode on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"map_request_mode"] = u"src-dst" if reply[u"mode"] \
- else u"dst-only"
- logger.info(data)
- return data
-
- @staticmethod
- def vpp_show_lisp_map_server(node):
- """Get LISP Map Server from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: LISP Map Server as python list.
- :rtype: list
- """
- cmd = u"lisp_map_server_dump"
- err_msg = f"Failed to get LISP map server on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- details = papi_exec.add(cmd).get_details(err_msg)
-
- data = list()
- for server in details:
- address = u"Bad is_ipv6 flag"
- if server[u"is_ipv6"] == 0:
- address = str(IPv4Address(server[u"ip_address"][0:4]))
- elif server[u"is_ipv6"] == 1:
- address = str(IPv6Address(server[u"ip_address"]))
- data.append({u"map-server": address})
- logger.info(data)
- return data
-
- @staticmethod
- def vpp_show_lisp_petr_config(node):
- """Get LISP PETR configuration from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: LISP PETR configuration as python dict.
- :rtype: dict
- """
- # Note: VAT is returning ipv6 address instead of ipv4
- cmd = u"show_lisp_use_petr"
- err_msg = f"Failed to get LISP petr config on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"status"] = u"enabled" if reply[u"status"] else u"disabled"
- address = u"Bad is_ip4 flag"
- if reply[u"is_ip4"] == 0:
- address = str(IPv6Address(reply[u"address"]))
- elif reply[u"is_ip4"] == 1:
- address = str(IPv4Address(reply[u"address"][0:4]))
- data[u"address"] = address
- logger.info(data)
- return data
-
- @staticmethod
- def vpp_show_lisp_rloc_config(node):
- """Get LISP RLOC configuration from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: LISP RLOC configuration as python dict.
- :rtype: dict
- """
- cmd = u"show_lisp_rloc_probe_state"
- err_msg = f"Failed to get LISP rloc config on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"state"] = u"enabled" if reply[u"is_enabled"] else u"disabled"
- logger.info(data)
- return data
-
- @staticmethod
- def vpp_show_lisp_pitr(node):
- """Get Lisp PITR feature config from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: Lisp PITR config data.
- :rtype: dict
- """
- cmd = u"show_lisp_pitr"
- err_msg = f"Failed to get LISP pitr on host {node[u'host']}"
-
- with PapiSocketExecutor(node) as papi_exec:
- reply = papi_exec.add(cmd).get_reply(err_msg)
-
- data = dict()
- data[u"status"] = u"enabled" if reply[u"status"] else u"disabled"
- return data
-
- @staticmethod
- def lisp_should_be_equal(lisp_val1, lisp_val2):
- """Fail if the lisp values are not equal.
-
- :param lisp_val1: First lisp value.
- :param lisp_val2: Second lisp value.
- :type lisp_val1: list
- :type lisp_val2: list
- """
- len1 = len(lisp_val1)
- len2 = len(lisp_val2)
-
- if len1 != len2:
- raise RuntimeError(
- f"Values are not same. Value 1 {lisp_val1} \n"
- f"Value 2 {lisp_val2}."
- )
-
- for tmp in lisp_val1:
- if tmp not in lisp_val2:
- raise RuntimeError(
- f"Value {tmp} not found in vpp:\n{lisp_val2}"
- )
-
- def lisp_locator_s_should_be_equal(self, locator_set1, locator_set2):
- """Fail if the lisp values are not equal.
-
- :param locator_set1: Generate lisp value.
- :param locator_set2: Lisp value from VPP.
- :type locator_set1: list
- :type locator_set2: list
- """
- locator_set_list = list()
-
- for item in locator_set1:
- if item not in locator_set_list:
- locator_set_list.append(item)
-
- self.lisp_should_be_equal(locator_set_list, locator_set2)
-
- @staticmethod
- def generate_unique_lisp_locator_set_data(node, locator_set_number):
- """Generate a list of lisp locator_set we want set to VPP and
- then check if it is set correctly. All locator_sets are unique.
-
- :param node: VPP node.
- :param locator_set_number: Generate n locator_set.
- :type node: dict
- :type locator_set_number: str
- :returns: list of lisp locator_set, list of lisp locator_set expected
- from VAT.
- :rtype: tuple
- """
- topo = Topology()
- locator_set_list = list()
- locator_set_list_vat = list()
-
- i = 0
- for num in range(0, int(locator_set_number)):
- locator_list = list()
- for interface in list(node[u"interfaces"].values()):
- link = interface.get(u"link")
- i += 1
- if link is None:
- continue
-
- if_name = topo.get_interface_by_link_name(node, link)
- sw_if_index = topo.get_interface_sw_index(node, if_name)
- if if_name is not None:
- locator = {
- u"locator-index": sw_if_index,
- u"priority": i,
- u"weight": i
- }
- locator_list.append(locator)
-
- l_name = f"ls{num}"
- locator_set = {
- u"locator-set": l_name,
- u"locator": locator_list
- }
- locator_set_list.append(locator_set)
-
- locator_set_vat = {
- u"ls_name": l_name,
- u"ls_index": num
- }
- locator_set_list_vat.append(locator_set_vat)
-
- return locator_set_list, locator_set_list_vat
-
- @staticmethod
- def generate_duplicate_lisp_locator_set_data(node, locator_set_number):
- """Generate a list of lisp locator_set we want set to VPP and
- then check if it is set correctly. Some locator_sets are duplicated.
-
- :param node: VPP node.
- :param locator_set_number: Generate n locator_set.
- :type node: dict
- :type locator_set_number: str
- :returns: list of lisp locator_set, list of lisp locator_set expected
- from VAT.
- :rtype: tuple
- """
- topo = Topology()
- locator_set_list = list()
- locator_set_list_vat = list()
-
- i = 0
- for num in range(0, int(locator_set_number)):
- locator_list = []
- for interface in list(node[u"interfaces"].values()):
- link = interface.get(u"link")
- i += 1
- if link is None:
- continue
-
- if_name = topo.get_interface_by_link_name(node, link)
- sw_if_index = topo.get_interface_sw_index(node, if_name)
- if if_name is not None:
- l_name = f"ls{num}"
- locator = {
- u"locator-index": sw_if_index,
- u"priority": i,
- u"weight": i
- }
- locator_list.append(locator)
- locator_set = {
- u"locator-set": l_name,
- u"locator": locator_list
- }
- locator_set_list.append(locator_set)
-
- locator_set_vat = {
- u"ls_name": l_name,
- u"ls_index": num
- }
- locator_set_list_vat.append(locator_set_vat)
-
- return locator_set_list, locator_set_list_vat
-
- def lisp_is_empty(self, lisp_params):
- """Check if the input param are empty.
-
- :param lisp_params: Should be empty list.
- :type lisp_params: list
- """
- self.lisp_should_be_equal([], lisp_params)
diff --git a/resources/libraries/robot/overlay/lisp.robot b/resources/libraries/robot/overlay/lisp.robot
index 16d04767e9..6ca75b4570 100644
--- a/resources/libraries/robot/overlay/lisp.robot
+++ b/resources/libraries/robot/overlay/lisp.robot
@@ -12,13 +12,16 @@
# limitations under the License.
*** Settings ***
+| Library | resources.libraries.python.IPUtil
| Library | resources.libraries.python.LispSetup.LispAdjacency
| Library | resources.libraries.python.LispSetup.LispEidTableMap
-| Library | resources.libraries.python.LispSetup.LispLocalEid
| Library | resources.libraries.python.LispSetup.LispLocator
+| Library | resources.libraries.python.LispSetup.LispLocalEid
| Library | resources.libraries.python.LispSetup.LispLocatorSet
| Library | resources.libraries.python.LispSetup.LispRemoteMapping
+|
| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/overlay/lisp_api.robot
*** Keywords ***
| Configure topology for IPv4 LISP testing
@@ -57,6 +60,79 @@
| | VPP Add IP Neighbor
| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${tg_if2_ip6} | ${TG_pf2_mac}[0]
+| Configure LISP topology in 3-node circular topology
+| | [Documentation] | Set up Lisp static adjacency topology.
+| |
+| | ... | *Arguments:*
+| | ... | - dut1_node - DUT1 node. Type: dictionary
+| | ... | - dut1_int_name - DUT1 node interface name. Type: string
+| | ... | - dut1_int_index - DUT1 node interface index. Type: integer
+| | ... | - dut2_node - DUT2 node. Type: dictionary
+| | ... | - dut2_int_name - DUT2 node interface name. Type: string
+| | ... | - dut2_int_index - DUT2 node interface index. Type: integer
+| | ... | - locator_set - Locator set values. Type: dictionary
+| | ... | - dut1_eid - Dut1 node eid address. Type: dictionary
+| | ... | - dut2_eid - Dut2 node eid address. Type: dictionary
+| | ... | - dut1_static_adjacency - Dut1 static adjacency. Type: dictionary
+| | ... | - dut2_static_adjacency - Dut2 static address. Type: dictionary
+| |
+| | ... | *Return:*
+| | ... | - No value returned
+| |
+| | ... | *Example:*
+| | ... | \| Configure LISP topology in 3-node circular topology \
+| | ... | \| ${dut1_node} \| ${interface_name} \| None \
+| | ... | \| ${dut2_node} \| ${interface_name} \| None \
+| | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \
+| | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \|
+| |
+| | [Arguments] | ${dut1_node} | ${dut1_int_name} | ${dut1_int_index}
+| | ... | ${dut2_node} | ${dut2_int_name} | ${dut2_int_index}
+| | ... | ${locator_set} | ${dut1_eid} | ${dut2_eid}
+| | ... | ${dut1_static_adjacency} | ${dut2_static_adjacency}
+| | ${dut1_int_index}= | Run Keyword If | ${dut1_int_index} is None
+| | ... | Get Interface Sw Index | ${dut1_node} | ${dut1_int_name}
+| | ... | ELSE | Set Variable | ${dut1_int_index}
+| | ${dut2_int_index}= | Run Keyword If | ${dut2_int_index} is None
+| | ... | Get Interface Sw Index | ${dut2_node} | ${dut2_int_name}
+| | ... | ELSE | Set Variable | ${dut2_int_index}
+| | Enable Lisp | ${dut1_node}
+| | Vpp Add Lisp Locator Set | ${dut1_node} | ${locator_set['locator_name']}
+| | Vpp Add Lisp Locator | ${dut1_node} | ${locator_set['locator_name']}
+| | ... | ${dut1_int_index} | ${locator_set['priority']}
+| | ... | ${locator_set['weight']}
+| | Vpp Add Lisp Local Eid | ${dut1_node} | ${dut1_eid['locator_name']}
+| | ... | ${dut1_eid['vni']} | ${dut1_eid['eid']} | ${dut1_eid['prefix']}
+| | Vpp Add Lisp Remote Mapping | ${dut1_node} | ${dut1_static_adjacency['vni']}
+| | ... | ${dut1_static_adjacency['deid']}
+| | ... | ${dut1_static_adjacency['prefix']}
+| | ... | ${dut1_static_adjacency['seid']}
+| | ... | ${dut1_static_adjacency['prefix']}
+| | ... | ${dut1_static_adjacency['rloc']}
+| | Vpp Add Lisp Adjacency | ${dut1_node} | ${dut1_static_adjacency['vni']}
+| | ... | ${dut1_static_adjacency['deid']}
+| | ... | ${dut1_static_adjacency['prefix']}
+| | ... | ${dut1_static_adjacency['seid']}
+| | ... | ${dut1_static_adjacency['prefix']}
+| | Enable Lisp | ${dut2_node}
+| | Vpp Add Lisp Locator Set | ${dut2_node} | ${locator_set['locator_name']}
+| | Vpp Add Lisp Locator | ${dut2_node} | ${locator_set['locator_name']}
+| | ... | ${dut2_int_index} | ${locator_set['priority']}
+| | ... | ${locator_set['weight']}
+| | Vpp Add Lisp Local Eid | ${dut2_node} | ${dut2_eid['locator_name']}
+| | ... | ${dut2_eid['vni']} | ${dut2_eid['eid']} | ${dut2_eid['prefix']}
+| | Vpp Add Lisp Remote Mapping | ${dut2_node} | ${dut2_static_adjacency['vni']}
+| | ... | ${dut2_static_adjacency['deid']}
+| | ... | ${dut2_static_adjacency['prefix']}
+| | ... | ${dut2_static_adjacency['seid']}
+| | ... | ${dut2_static_adjacency['prefix']}
+| | ... | ${dut2_static_adjacency['rloc']}
+| | Vpp Add Lisp Adjacency | ${dut2_node} | ${dut2_static_adjacency['vni']}
+| | ... | ${dut2_static_adjacency['deid']}
+| | ... | ${dut2_static_adjacency['prefix']}
+| | ... | ${dut2_static_adjacency['seid']}
+| | ... | ${dut2_static_adjacency['prefix']}
+
| Configure LISP in 2-node circular topology
| | [Documentation] | Configure LISP topology in 2-node circular topology.
| |
diff --git a/resources/libraries/robot/overlay/lisp_api.robot b/resources/libraries/robot/overlay/lisp_api.robot
index 21f17d51f1..d2245c3f9a 100644
--- a/resources/libraries/robot/overlay/lisp_api.robot
+++ b/resources/libraries/robot/overlay/lisp_api.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -13,293 +13,12 @@
*** Settings ***
| Resource | resources/libraries/robot/shared/interfaces.robot
+|
| Library | resources.libraries.python.NodePath
| Library | resources.libraries.python.LispSetup.LispStatus
-| Library | resources.libraries.python.LispSetup.LispSetup
| Library | resources.libraries.python.LispSetup.LispGpeStatus
-| Library | resources.libraries.python.LispUtil
*** Keywords ***
-
-| Generate LISP locator_set data
-| | [Documentation] | Generate lisp locator_set data for test
-| | ... | the lisp locator_set and locator API.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - locator_set_number - Number how many locator_set data
-| | ... | will be generated. Type: integer
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - locator_set_values - New generated locator_set data.
-| | ... | - locator_set_values_vat - New generated locator_set data expected\
-| | ... | from VAT.
-| |
-| | ... | *Example:*
-| | ... | \| Given Generate LISP locator_set data \| ${nodes['DUT1']} \
-| | ... | \| ${locator_set_number} \|
-| |
-| | [Arguments] | ${dut_node} | ${locator_set_number}
-| | ${locator_set_values} | ${locator_set_values_vat}=
-| | ... | Generate Unique Lisp Locator Set Data
-| | ... | ${dut_node} | ${locator_set_number}
-| | Set Test Variable | ${locator_set_values}
-| | Set Test Variable | ${locator_set_values_vat}
-
-| Configure LISP locator_set data
-| | [Documentation] | Set the lisp locator_set and locator on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - locator_set_values - Generated locator_set data from
-| | ... | KW locator_set data is prepared, which will be set on the VPP node.
-| |
-| | ... | *Example:*
-| | ... | \| When Configure LISP locator_set data \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | Vpp Set Lisp Locator Set | ${dut_node} | ${locator_set_values}
-
-| LISP locator_set shpuld be configured correctly
-| | [Documentation] | Test if the locator_set is set correctly on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - locator_set_values_vat - Generated locator_set data from
-| | ... | KW locator_set data is prepared, which are expected from VPP via VAT.
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP locator_set should be configured correctly \
-| | ... | \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | local
-| | Lisp Locator S Should Be Equal
-| | ... | ${locator_set_values_vat} | ${show_locator_set}
-
-| Delete all LISP locator_set from VPP
-| | [Documentation] | Delete all lisp locator_set on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - locator_set_values - Generated locator_set data from
-| | ... | KW locator_set data is prepared, which was set on the VPP node.
-| |
-| | ... | *Example:*
-| | ... | \| When Delete all LISP locator_set from VPP \
-| | ... | \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | Vpp Unset Lisp Locator Set | ${dut_node} | ${locator_set_values}
-
-| LISP locator_set should be unset
-| | [Documentation] | Test if all locator_set are unset from VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP locator_set should be unset \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | ${EMPTY}
-| | Lisp Is Empty | ${show_locator_set}
-
-| Lisp locator_set data use for test reset locator_set are prepared
-| | [Documentation] | Generate lisp special type of locator_set data.
-| | ... | This data will be use for test reset locator_set.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - locator_set_number - Number how many locator_set data
-| | ... | it will generate. Type: integer
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - locator_set_values - New generate locator_set data.
-| | ... | - locator_set_values_vat - New generated locator_set data expected\
-| | ... | from VAT.
-| |
-| | ... | *Example:*
-| | ... | \| Given Lisp locator_set data use for test reset locator_set \
-| | ... | are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \|
-| |
-| | [Arguments] | ${dut_node} | ${locator_set_number}
-| | ${locator_set_values} | ${locator_set_values_vat}=
-| | ... | Generate Duplicate Lisp Locator Set Data
-| | ... | ${dut_node} | ${locator_set_number}
-| | Set Test Variable | ${locator_set_values}
-| | Set Test Variable | ${locator_set_values_vat}
-
-| Configure LISP eid address
-| | [Documentation] | Set the lisp eid address on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - set_eid - Test eid data. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| When Configure LISP eid address \| ${nodes['DUT1']} \
-| | ... | \| ${eid_table} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_eid}
-| | Vpp Set Lisp Eid Table | ${dut_node} | ${set_eid}
-
-| LISP eid address should be set correctly to eid table
-| | [Documentation] | Test if the locator_set is set correctly on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - set_eid - Example eid data, which was set to the VPP node.
-| | ... | Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - set_eid - Generated eid data, which will be set to the VPP node.
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP eid address should be set correctly to eid table \
-| | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_eid}
-| | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node}
-| | Lisp Should Be Equal | ${set_eid} | ${show_eid}
-
-| Delete all LISP eid address from VPP
-| | [Documentation] | Delete all lisp eid address from the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - set_eid - Eid data which will be removed from the VPP node.
-| | ... | Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| When Delete all LISP eid address from VPP \
-| | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_eid}
-| | Vpp Unset Lisp Eid Table | ${dut_node} | ${set_eid}
-
-| LISP eid table should be empty
-| | [Documentation] | Test if the eid table is empty.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP eid table should be empty \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node}
-| | Lisp Is Empty | ${show_eid}
-
-| Configure LISP map resolver address
-| | [Documentation] | Set the lisp map resolver address in the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - set_map_resolver - Map resolver data, which will be set on
-| | ... | the VPP node. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| When Configure LISP map resolver address \| ${nodes['DUT1']} \
-| | ... | \| ${map_resolver} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_map_resolver}
-| | Vpp Set Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
-
-| LISP map resolver address should be configured correctly
-| | [Documentation] | Test if the map resolver address is set correctly
-| | ... | on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - set_map_resolver - Map resolver data, which was set on
-| | ... | the VPP node. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP map resolver address should be configured correctly \
-| | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_map_resolver}
-| | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
-| | Lisp Should Be Equal | ${set_map_resolver} | ${show_map_resolver}
-
-| Delete all LISP map resolver address from VPP
-| | [Documentation] | Delete all lisp map resolver address on the VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - map_resolver - Map resolver data, which will be remove from
-| | ... | the VPP. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| When Delete all LISP map resolver address from VPP \
-| | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
-| |
-| | [Arguments] | ${dut_node} | ${set_map_resolver}
-| | Vpp Unset Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
-
-| LISP map resolver address should be empty
-| | [Documentation] | Test if the map resolver are empty.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Then LISP map resolver address should be empty \
-| | ... | \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
-| | Lisp Is Empty | ${show_map_resolver}
-
| Enable LISP
| | [Documentation] | Enable LISP on VPP node.
| |
@@ -315,25 +34,6 @@
| | [Arguments] | ${dut_node}
| | Vpp Lisp Enable Disable | ${dut_node} | enable
-| LISP should be enabled
-| | [Documentation] | Check if the lisp is enabled.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - lisp_status_data - Lisp status data, which was set on
-| | ... | the VPP node. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| LISP should be enabled \| ${nodes['DUT1']} \
-| | ... | \| ${lisp_status_data} \|
-| |
-| | [Arguments] | ${dut_node} | ${lisp_status_data}
-| | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node}
-| | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[1]}
-
| Disable LISP
| | [Documentation] | Disable LISP on VPP node.
| |
@@ -349,24 +49,6 @@
| | [Arguments] | ${dut_node}
| | Vpp Lisp Enable Disable | ${dut_node} | disable
-| LISP Should be disabled
-| | [Documentation] | LISP Should be disabled.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - lisp_status_data - Lisp status data, which was set on
-| | ... | the VPP node. Type: list
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| LISP Should be disabled \| ${nodes['DUT1']} \
-| | ... | \| ${lisp_status_data} \|
-| |
-| | [Arguments] | ${dut_node} | ${lisp_status_data}
-| | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node}
-| | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[0]}
| Enable Lisp Gpe
| | [Documentation] | Enable Lisp Gpe on VPP node.
@@ -382,18 +64,3 @@
| |
| | [Arguments] | ${dut_node}
| | Vpp Lisp Gpe Enable Disable | ${dut_node} | enable
-
-| Disable Lisp Gpe
-| | [Documentation] | Disable Lisp Gpe on VPP node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Disable Lisp Gpe \| ${nodes['DUT1']} \|
-| |
-| | [Arguments] | ${dut_node}
-| | Vpp Lisp Gpe Enable Disable | ${dut_node} | disable
diff --git a/resources/libraries/robot/overlay/lisp_static_adjacency.robot b/resources/libraries/robot/overlay/lisp_static_adjacency.robot
deleted file mode 100644
index a68bb7e747..0000000000
--- a/resources/libraries/robot/overlay/lisp_static_adjacency.robot
+++ /dev/null
@@ -1,167 +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.LispSetup.LispAdjacency
-| Library | resources.libraries.python.LispSetup.LispLocator
-| Library | resources.libraries.python.LispSetup.LispLocalEid
-| Library | resources.libraries.python.LispSetup.LispLocatorSet
-| Library | resources.libraries.python.LispSetup.LispRemoteMapping
-|
-| Resource | resources/libraries/robot/overlay/lisp_api.robot
-|
-| Documentation | Lisp static adjacency suite keywords
-
-*** Keywords ***
-| Configure LISP topology in 3-node circular topology
-| | [Documentation] | Set up Lisp static adjacency topology.
-| |
-| | ... | *Arguments:*
-| | ... | - dut1_node - DUT1 node. Type: dictionary
-| | ... | - dut1_int_name - DUT1 node interface name. Type: string
-| | ... | - dut1_int_index - DUT1 node interface index. Type: integer
-| | ... | - dut2_node - DUT2 node. Type: dictionary
-| | ... | - dut2_int_name - DUT2 node interface name. Type: string
-| | ... | - dut2_int_index - DUT2 node interface index. Type: integer
-| | ... | - locator_set - Locator set values. Type: dictionary
-| | ... | - dut1_eid - Dut1 node eid address. Type: dictionary
-| | ... | - dut2_eid - Dut2 node eid address. Type: dictionary
-| | ... | - dut1_static_adjacency - Dut1 static adjacency. Type: dictionary
-| | ... | - dut2_static_adjacency - Dut2 static address. Type: dictionary
-| |
-| | ... | *Return:*
-| | ... | - No value returned
-| |
-| | ... | *Example:*
-| | ... | \| Configure LISP topology in 3-node circular topology \
-| | ... | \| ${dut1_node} \| ${interface_name} \| None \
-| | ... | \| ${dut2_node} \| ${interface_name} \| None \
-| | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \
-| | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \|
-| |
-| | [Arguments] | ${dut1_node} | ${dut1_int_name} | ${dut1_int_index}
-| | ... | ${dut2_node} | ${dut2_int_name} | ${dut2_int_index}
-| | ... | ${locator_set} | ${dut1_eid} | ${dut2_eid}
-| | ... | ${dut1_static_adjacency} | ${dut2_static_adjacency}
-| | ${dut1_int_index}= | Run Keyword If | ${dut1_int_index} is None
-| | ... | Get Interface Sw Index | ${dut1_node} | ${dut1_int_name}
-| | ... | ELSE | Set Variable | ${dut1_int_index}
-| | ${dut2_int_index}= | Run Keyword If | ${dut2_int_index} is None
-| | ... | Get Interface Sw Index | ${dut2_node} | ${dut2_int_name}
-| | ... | ELSE | Set Variable | ${dut2_int_index}
-| | Enable Lisp | ${dut1_node}
-| | Vpp Add Lisp Locator Set | ${dut1_node} | ${locator_set['locator_name']}
-| | Vpp Add Lisp Locator | ${dut1_node} | ${locator_set['locator_name']}
-| | ... | ${dut1_int_index} | ${locator_set['priority']}
-| | ... | ${locator_set['weight']}
-| | Vpp Add Lisp Local Eid | ${dut1_node} | ${dut1_eid['locator_name']}
-| | ... | ${dut1_eid['vni']} | ${dut1_eid['eid']} | ${dut1_eid['prefix']}
-| | Vpp Add Lisp Remote Mapping | ${dut1_node} | ${dut1_static_adjacency['vni']}
-| | ... | ${dut1_static_adjacency['deid']}
-| | ... | ${dut1_static_adjacency['prefix']}
-| | ... | ${dut1_static_adjacency['seid']}
-| | ... | ${dut1_static_adjacency['prefix']}
-| | ... | ${dut1_static_adjacency['rloc']}
-| | Vpp Add Lisp Adjacency | ${dut1_node} | ${dut1_static_adjacency['vni']}
-| | ... | ${dut1_static_adjacency['deid']}
-| | ... | ${dut1_static_adjacency['prefix']}
-| | ... | ${dut1_static_adjacency['seid']}
-| | ... | ${dut1_static_adjacency['prefix']}
-| | Enable Lisp | ${dut2_node}
-| | Vpp Add Lisp Locator Set | ${dut2_node} | ${locator_set['locator_name']}
-| | Vpp Add Lisp Locator | ${dut2_node} | ${locator_set['locator_name']}
-| | ... | ${dut2_int_index} | ${locator_set['priority']}
-| | ... | ${locator_set['weight']}
-| | Vpp Add Lisp Local Eid | ${dut2_node} | ${dut2_eid['locator_name']}
-| | ... | ${dut2_eid['vni']} | ${dut2_eid['eid']} | ${dut2_eid['prefix']}
-| | Vpp Add Lisp Remote Mapping | ${dut2_node} | ${dut2_static_adjacency['vni']}
-| | ... | ${dut2_static_adjacency['deid']}
-| | ... | ${dut2_static_adjacency['prefix']}
-| | ... | ${dut2_static_adjacency['seid']}
-| | ... | ${dut2_static_adjacency['prefix']}
-| | ... | ${dut2_static_adjacency['rloc']}
-| | Vpp Add Lisp Adjacency | ${dut2_node} | ${dut2_static_adjacency['vni']}
-| | ... | ${dut2_static_adjacency['deid']}
-| | ... | ${dut2_static_adjacency['prefix']}
-| | ... | ${dut2_static_adjacency['seid']}
-| | ... | ${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 IP Addresses | ${dut2_node} | ${dut2_to_dut1}
-| | 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']}
-| | VPP Interface Set IP Address | ${dut2_node} | ${dut2_to_dut1}
-| | ... | ${new_dut2_ip} | ${prefix}
-| | VPP Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${new_dut2_ip}
-| | ... | ${dut2_to_dut1_mac}
-| | VPP Add IP Neighbor | ${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/test_data/lisp/lisp.py b/resources/test_data/lisp/lisp.py
index f6a4152fda..d52b7a9ecd 100644
--- a/resources/test_data/lisp/lisp.py
+++ b/resources/test_data/lisp/lisp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -14,7 +14,7 @@
"""Test variables of lisp and lispgpe (ip4/ip6) encapsulation test suite."""
# Lisp default global value
-locator_name = b"tst_locator"
+locator_name = u"tst_locator"
# Test configuration data
tg_if1_ip4= u"6.0.0.2"
diff --git a/resources/test_data/lisp/performance/lisp_static_adjacency.py b/resources/test_data/lisp/performance/lisp_static_adjacency.py
index 29ab80ad73..4351a40f55 100644
--- a/resources/test_data/lisp/performance/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/performance/lisp_static_adjacency.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -14,7 +14,7 @@
"""Test variables for Lisp remote static mapping test suite."""
# Lisp default global value
-locator_name = b"ls1"
+locator_name = u"ls1"
# Lisp default locator_set value
duts_locator_set = {
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
index 49969d0d52..70b80c0353 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
@@ -17,7 +17,7 @@
| Variables | resources/test_data/lisp/lisp.py
|
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISP_IP4o4 | DRV_VFIO_PCI
+| ... | NIC_Virtual | IP4FWD | LISP | LISP_IP4o4 | DRV_VFIO_PCI
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4lisp-ip4base
|
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
index bad95ee210..7892553871 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
@@ -17,7 +17,7 @@
| Variables | resources/test_data/lisp/lisp.py
|
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISPGPE_IP4o4 | DRV_VFIO_PCI
+| ... | NIC_Virtual | IP4FWD | LISP | LISPGPE_IP4o4 | DRV_VFIO_PCI
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4lispgpe-ip4base
|
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
index 191d5c8bb3..ac901b18ba 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
@@ -17,7 +17,7 @@
| Variables | resources/test_data/lisp/lisp.py
|
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISPGPE_IP6o4 | DRV_VFIO_PCI
+| ... | NIC_Virtual | IP4FWD | LISP | LISPGPE_IP6o4 | DRV_VFIO_PCI
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip4lispgpe-ip6base
|
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
index c3458a1d02..6ee31292f4 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
@@ -17,7 +17,7 @@
| Variables | resources/test_data/lisp/lisp.py
|
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP6FWD | LISPGPE_IP4o6 | DRV_VFIO_PCI
+| ... | NIC_Virtual | IP6FWD | LISP | LISPGPE_IP4o6 | DRV_VFIO_PCI
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip6lispgpe-ip4base
|
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
index 0b6bfab91c..e8ef624065 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
@@ -17,7 +17,7 @@
| Variables | resources/test_data/lisp/lisp.py
|
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP6FWD | LISPGPE_IP6o6 | DRV_VFIO_PCI
+| ... | NIC_Virtual | IP6FWD | LISP | LISPGPE_IP6o6 | DRV_VFIO_PCI
| ... | RXQ_SIZE_0 | TXQ_SIZE_0
| ... | ethip6lispgpe-ip6base
|
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
index ac73e45fa6..ff719d31ca 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
@@ -13,7 +13,8 @@
*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/overlay/lisp.robot
+|
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
|
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
index f41a5a05bb..9f1b22504a 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
@@ -13,7 +13,8 @@
*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/overlay/lisp.robot
+|
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
|
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
index 77040b2ebe..2007c6ba19 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
@@ -13,7 +13,8 @@
*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/overlay/lisp.robot
+|
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
|
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index 7154a7757a..cd9fe8353b 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -13,7 +13,8 @@
*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/overlay/lisp.robot
+|
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
|
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR