8 files changed, 196 insertions, 125 deletions

diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4--ethip4udpgeneve-1tun-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4--ethip4udpgeneve-1tun-ip4base-scapy.robot
index fe20d6dd6d..926c0296ac 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4--ethip4udpgeneve-1tun-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4--ethip4udpgeneve-1tun-ip4base-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -17,40 +17,44 @@
 | Resource | resources/libraries/robot/shared/traffic.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | IP4BASE | UDP | ENCAP | GENEVE
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | ENCAP | GENEVE
 | ... | GENEVE_L3MODE | GENEVE4_1TUN | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4--ethip4udpgeneve-1tun-ip4base
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | geneve4
+| Test Teardown | Tear down test | packet_trace | telemetry | geneve4
 |
 | Test Template | Local Template
 |
-| Documentation | *L2BD with GENEVE L3 mode test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| Documentation | **L2BD with GENEVE L3 mode test cases**
+| ... |
+| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 between TG-if1 and DUT1-if1 and\
-| ... | Eth-IPv4-UDP-GENEVE-Eth-IPv4 between DUT1-if2 and TG-if2 for IPv4\
-| ... | routing over GENEVE tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing over\
-| ... | GENEVE tunnel and 4 static IPv4 /24 route entries.\
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 between TG-if1 and \
+| ... | DUT1-if1 and Eth-IPv4-UDP-GENEVE-Eth-IPv4 between DUT1-if2 and TG-if2 \
+| ... | for IPv4 routing over GENEVE tunnel.
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv4 routing \
+| ... | over GENEVE tunnel and 4 static IPv4 /24 route entries. \
 | ... | DUT1 is tested with ${nic_name}.
-| ... | *[Ver] TG verification:* Test Eth-IPv4 packet is sent by TG-if1 on link\
-| ... | to DUT1-if1; on receive by TG-if2 the encapsulated packet is verified\
-| ... | for correctness and its outer and inner IPv4 and MAC addresses, UDP\
-| ... | ports and GENEVE vni and protocol number. Then test\
-| ... | Eth-IPv4-UDP-GENEVE-Eth-IPv4 packet is sent by TG-if2 on link to\
-| ... | DUT1-if2; on receive by TG-if1 decapsulated packet is verified for\
+| ... |
+| ... | - **[Ver] TG verification:** Test Eth-IPv4 packet is sent by TG-if1 on \
+| ... | link to DUT1-if1; on receive by TG-if2 the encapsulated packet is \
+| ... | verified for correctness and its outer and inner IPv4 and MAC \
+| ... | addresses, UDP ports and GENEVE vni and protocol number. Then test. \
+| ... | Eth-IPv4-UDP-GENEVE-Eth-IPv4 packet is sent by TG-if2 on link to \
+| ... | DUT1-if2; on receive by TG-if1 decapsulated packet is verified for \
 | ... | correctness and its IPv4 and MAC addresses
-| ... | *[Ref] Applicable standard specifications:* RFC791, RFC768, RFC8926.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC791, RFC768, RFC8926.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | geneve_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | geneve_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -68,14 +72,16 @@
 | &{gen_tunnel}=
 | ... | local=1.1.1.2 | remote=1.1.1.1 | vni=${1}
 | ... | src_ip=10.128.1.0 | dst_ip=10.0.1.0 | ip_mask=${24} | if_ip=11.0.1.2
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | |
 | | [Documentation]
-| | ... | [Cfg] DUT runs GENEVE ${gen_mode} mode configuration.
+| | ... | - **[Cfg]** DUT runs GENEVE ${gen_mode} mode configuration. \
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ... | - **[Ver]** Measure NDR and PDR values using MLRsearch algorithm.
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
@@ -99,9 +105,8 @@
 | | ... | ${DUT1_vf1_mac}[0] | ${DUT1_vf2_mac}[0]
 | | ... | ${gen_tunnel}[local] | ${gen_tunnel}[remote] | ${gen_tunnel}[vni]
 | | ... | ${gen_tunnel}[src_ip] | ${gen_tunnel}[dst_ip]
-| | And Show Geneve Tunnel Data | ${nodes['DUT1']}
 
 *** Test Cases ***
-| 64B-ethip4--ethip4udpgeneve-1tun-ip4base-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4--ethip4udpgeneve-1tun-ip4base-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-scapy.robot
index 0d9607129a..a8c9246ec3 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -15,46 +15,52 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
 | ... | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4vxlan-l2bdbasemaclrn
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | telemetry
 |
 | Test Template | Local Template
 |
-| Documentation | *L2BD with VXLANoIPv4 test cases*
-|
-| ... | *[Top] Network topologies:* TG-DUT1-TG 2-node circular topology\
+| Documentation | **L2BD with VXLANoIPv4 test cases**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on\
+| ... |
+| ... | - **[Enc] Packet encapsulations:** Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
 | ... | TG-DUT.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain\
-| ... | switching combined with MAC learning enable.\
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 is configured with L2 \
+| ... | cross-connect switching.combined with MAC learning enable. \
 | ... | VXLAN tunnels are configured on links betwen TG and DUT.
-| ... | *[Ver] TG verification:* Test Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 packet is\
-| ... | sent by TG on link to DUT1; on receive TG verifies packets for\
-| ... | correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
+| ... |
+| ... | - **[Ver] TG verification:** Test Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 \
+| ... | packet is sent by TG on link to DUT1; on receive TG verifies packets \
+| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC7348.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | vxlan_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
 | ${overhead}= | ${50}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send VXLAN encapsulated Ethernet frame; verify\
+| | ... | - **[Ver]** Make TG send VXLAN encapsulated Ethernet frame; verify \
 | | ... | all packets are received.
 | |
 | | ... | *Arguments:*
@@ -80,6 +86,6 @@
 | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0}
 
 *** Test Cases ***
-| 114B-ethip4vxlan-l2bdbasemaclrn-dev
-| | [Tags] | 114B
-| | frame_size=${114} | phy_cores=${0}
+| 64B-0c-ethip4vxlan-l2bdbasemaclrn-scapy
+| | [Tags] | 64B | 0C
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4vxlan-l2xcbase-scapy.robot
index beff215e8f..7b84de1af0 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/2n1l-10ge2p1x710-ethip4vxlan-l2xcbase-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -15,45 +15,51 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | L2XCBASE | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | NIC_Intel-X710 | L2XCBASE | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
 | ... | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4vxlan-l2xcbase
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | telemetry
 |
 | Test Template | Local Template
 |
-| Documentation | *L2XC with VXLANoIPv4 test cases*
-|
-| ... | *[Top] Network topologies:* TG-DUT1-TG 2-node circular topology\
+| Documentation | **L2XC with VXLANoIPv4 test cases**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on\
+| ... |
+| ... | - **[Enc] Packet encapsulations:** Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
 | ... | TG-DUT.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect.\
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 is configured with L2 \
 | ... | VXLAN tunnels are configured on links betwen TG and DUT.
-| ... | *[Ver] TG verification:* Test Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 packet is\
-| ... | sent by TG on link to DUT1; on receive TG verifies packets for\
-| ... | correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
+| ... |
+| ... | - **[Ver] TG verification:** Test Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 \
+| ... | packet is sent by TG on link to DUT1; on receive TG verifies packets \
+| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC7348.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | vxlan_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
 | ${overhead}= | ${50}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send VXLAN encapsulated Ethernet frame; verify\
+| | ... | - **[Ver]** Make TG send VXLAN encapsulated Ethernet frame; verify \
 | | ... | all packets are received.
 | |
 | | ... | *Arguments:*
@@ -79,6 +85,6 @@
 | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0}
 
 *** Test Cases ***
-| 114B-ethip4vxlan-l2xcbase-dev
-| | [Tags] | 114B
-| | frame_size=${114} | phy_cores=${0}
+| 64B-0c-ethip4vxlan-l2xcbase-scapy
+| | [Tags] | 64B | 0C
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lisp-ip4base-scapy.robot
index ed2efca8f2..a3f2c60a8e 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lisp-ip4base-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -17,47 +17,53 @@
 | Variables | resources/test_data/lisp/lisp.py
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISP | LISP_IP4o4 | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | IP4FWD | LISP | LISP_IP4o4 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4lisp-ip4base
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | telemetry
 |
 | Test Template | Local Template
 |
-| Documentation | *ip4-lisp-ip4 encapsulation test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node\
-| ... | circular topology with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4-ICMPv4\
-| ... | on DUT1-TG, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing\
+| Documentation | **ip4-lisp-ip4 encapsulation test cases**
+| ... |
+| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node \
+| ... | circular with single links between nodes.
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-LISP-IPv4-ICMPv4 \
+| ... | on DUT1-TG, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4 routing \
 | ... | over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT is configured with IPv4\
-| ... | routing and static routes. LISPoIPv4 tunnel is\
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT is configured with IPv4. \
+| ... | routing and static routes. LISPoIPv4 tunnel is \
 | ... | configured between DUT1 and TG2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets\
-| ... | are sent by TG on if1 link to DUT1; on receive TG verifies\
-| ... | packets for correctness and their IPv4 src-addr, dst-addr\
+| ... |
+| ... | - **[Ver] TG verification:** Test ICMPv4 Echo Request packets \
+| ... | are sent by TG on if1 link to DUT1; on receive TG verifies \
+| ... | packets for correctness and their IPv4 src-addr, dst-addr \
 | ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC6830.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | lisp_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | lisp_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
 | ${overhead}= | ${54}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] On DUT1 configure LISP.\
+| | ... | - **[Cfg]** On DUT1 configure LISP.
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -86,6 +92,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4}
 
 *** Test Cases ***
-| 46B-ethip4lisp-ip4base-dev
-| | [Tags] | 46B
-| | frame_size=${46} | phy_cores=${0}
+| 64B-0c-ethip4lisp-ip4base-scapy
+| | [Tags] | 64B | 0C
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lispgpe-ip4base-scapy.robot
index f74fe75ca3..e77829a07c 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lispgpe-ip4base-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -17,36 +17,40 @@
 | Variables | resources/test_data/lisp/lisp.py
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISP | LISPGPE_IP4o4 | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | IP4FWD | LISP | LISPGPE_IP4o4 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4lispgpe-ip4base
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | telemetry
 |
 | Test Template | Local Template
 |
-| Documentation | *ip4-lispgpe-ip4 encapsulation test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node\
-| ... | circular topology with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISPGPE-IPv4-ICMPv4\
-| ... |  on DUT1-TG, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4\
+| Documentation | **ip4-lispgpe-ip4 encapsulation test cases**
+| ... |
+| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node \
+| ... | circular with single links between nodes.
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-LISPGPE-IPv4-ICMPv4 \
+| ... |  on DUT1-TG, Eth-IPv4-ICMPv4 on TG-DUTn for IPv4. \
 | ... |  routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and TG(if2) are configured\
-| ... | with IPv4 routing and static routes. LISPoIPv4 tunnel is\
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 and TG(if2) are configured \
+| ... | with IPv4 routing and static routes. LISPoIPv4 tunnel is \
 | ... | configured between DUT1 and TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets\
-| ... | are sent in TG->DUT(if1); On receive TG(if2) verifies packets\
-| ... | for correctness and their IPv4 src-addr, dst-addr and\
+| ... |
+| ... | - **[Ver] TG verification:** Test ICMPv4 Echo Request packets \
+| ... | are sent in TG->DUT(if1); On receive TG(if2) verifies packets \
+| ... | for correctness and their IPv4 src-addr, dst-addr and \
 | ... | MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC6830.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | lisp_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | lisp_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -54,11 +58,13 @@
 | ${nic_vfs}= | 0
 | ${overhead}= | ${54}
 | ${is_gpe}= | ${1}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] On DUT1 configure LISP.
+| | ... | - **[Cfg]** On DUT1 configure LISP.
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -87,6 +93,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4}
 
 *** Test Cases ***
-| 46B-ethip4lispgpe-ip4base-dev
-| | [Tags] | 46B
-| | frame_size=${46} | phy_cores=${0}
+| 64B-0c-ethip4lispgpe-ip4base-scapy
+| | [Tags] | 64B | 0C
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lispgpe-ip6base-scapy.robot
index 263b74890f..741244712a 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/2n1l-10ge2p1x710-ethip4lispgpe-ip6base-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -17,36 +17,40 @@
 | Variables | resources/test_data/lisp/lisp.py
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | IP4FWD | LISP | LISPGPE_IP6o4 | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | IP4FWD | LISP | LISPGPE_IP6o4 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4lispgpe-ip6base
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | telemetry
 |
 | Test Template | Local Template
 |
-| Documentation | *ip4-lispgpe-ip6 encapsulation test cases*
-|
-| ... | *[Top] Network Topologies:* TG(if1)-DUT1-TG(if2) 2-node\
-| ... | circular topology with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISPGPE-IPv6-ICMPv6\
-| ... | on DUT1-TG(if2),Eth-IPv6-ICMPv6 on TG-DUTn for IPv6\
+| Documentation | **ip4-lispgpe-ip6 encapsulation test cases**
+| ... |
+| ... | - **[Top] Network Topologies:** TG(if1)-DUT1-TG(if2) 2-node \
+| ... | circular with single links between nodes.
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-LISPGPE-IPv6-ICMPv6 \
+| ... | on DUT1-TG(if2),Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 \
 | ... | routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and TG(if2) are configured\
-| ... | with IPv6 routing and static routes. LISPoIPv4 tunnel is\
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 and TG(if2) are configured \
+| ... | with IPv6 routing and static routes. LISPoIPv4 tunnel is \
 | ... | configured between DUT1 and TG(if2).
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets\
-| ... | are sent in if1 by TG on links to DUT1; on receive\
-| ... | TG verifies packets for correctness and their IPv6 src-addr,\
+| ... |
+| ... | - **[Ver] TG verification:** Test ICMPv6 Echo Request packets \
+| ... | are sent in if1 by TG on links to DUT1; on receive \
+| ... | TG verifies packets for correctness and their IPv6 src-addr, \
 | ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC6830.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC6830.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | lisp_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | lisp_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -55,11 +59,13 @@
 | ${overhead}= | ${54}
 | ${ot_mode}= | 6to4
 | ${is_gpe}= | ${1}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] On DUT1 configure LISPGPE\
+| | ... | - **[Cfg]** On DUT1 configure LISPGPE.
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -89,6 +95,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4} | ${ot_mode}
 
 *** Test Cases ***
-| 62B-ethip4lispgpe-ip6base-dev
-| | [Tags] | 62B
-| | frame_size=${62} | phy_cores=${0}
+| 64B-0c-ethip4lispgpe-ip6base-scapy
+| | [Tags] | 64B | 0C
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/regenerate_testcases.py b/tests/vpp/device/ip4_tunnels/lisp/regenerate_testcases.py
new file mode 100755
index 0000000000..51070e4864
--- /dev/null
+++ b/tests/vpp/device/ip4_tunnels/lisp/regenerate_testcases.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2022 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.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+Regenerator().regenerate_glob(u"*.robot")
diff --git a/tests/vpp/device/ip4_tunnels/regenerate_testcases.py b/tests/vpp/device/ip4_tunnels/regenerate_testcases.py
new file mode 100755
index 0000000000..51070e4864
--- /dev/null
+++ b/tests/vpp/device/ip4_tunnels/regenerate_testcases.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2022 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.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+Regenerator().regenerate_glob(u"*.robot")