7 files changed, 184 insertions, 133 deletions

diff --git a/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-scapy.robot
index 7c9b37b954..2eb255e140 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,35 +15,38 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID
+| ... | DRV_VFIO_PCI | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6ip6-ip6base-srv6enc1sid
 |
 | 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 | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with one SID\
-| ... | (SRH not inserted) test suite.*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with one SID \
+| ... | (SRH not inserted) test suite.**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with one SID - Segment Routing Header not inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -66,14 +69,16 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and one SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and one SR \
 | | ... | behaviour (function) - End.DX6 - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -98,6 +103,6 @@
 | | ... | ${dut1_sid1} | ${dut1_sid2} | ${dut2_sid2} | ${dut2_sid1}
 
 *** Test Cases ***
-| 78B-ethip6ip6-ip6base-srv6enc1sid-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6ip6-ip6base-srv6enc1sid-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-scapy.robot
index d78b9a0800..a8e5674271 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,36 +15,39 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_NODECAP
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_NODECAP
 | ... | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6srhip6-ip6base-srv6enc2sids-nodecaps
 |
 | 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 | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with two SIDs\
-| ... | (SRH inserted) test suite.*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with two SIDs \
+| ... | (SRH inserted) test suite.**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with two SIDs - Segment Routing Header inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -69,14 +72,16 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and one SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and one SR \
 | | ... | behaviour (function) - End - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -102,6 +107,6 @@
 | | ... | ${dut1_sid2_2} | ${dut2_sid1_2} | decap=${False}
 
 *** Test Cases ***
-| 78B-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-scapy.robot
index 38ce990d90..a6972e5e10 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,36 +15,39 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_DECAP
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_DECAP
 | ... | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6srhip6-ip6base-srv6enc2sids
 |
 | 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 | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with two SIDs\
-| ... | (SRH inserted) test suite.*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with two SIDs \
+| ... | (SRH inserted) test suite.**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with two SIDs - Segment Routing Header inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -69,14 +72,16 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and two SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and two SR \
 | | ... | behaviours (functions) - End and End.DX6 - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -102,6 +107,6 @@
 | | ... | ${dut1_sid2_2} | ${dut2_sid1_2}
 
 *** Test Cases ***
-| 78B-ethip6srhip6-ip6base-srv6enc2sids-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6srhip6-ip6base-srv6enc2sids-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-scapy.robot
index 0e62ae3ad3..f0466ea8a7 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,36 +15,40 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
 | ... | SRv6_PROXY_DYN | MEMIF | DOCKER | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6srhip6-ip6base-srv6proxy-dyn
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | container
+| Test Teardown | Tear down test | packet_trace | telemetry | container | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with Dynamic\
-| ... | SRv6 proxy test suite.*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with Dynamic \
+| ... | SRv6 proxy test suite.**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with three SIDs - Segment Routing Header inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6ad_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
+| ... | srv6ad_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -81,14 +85,16 @@
 # Container
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain_functional
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and one SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and one SR \
 | | ... | behaviour (function) - End.AD - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -116,6 +122,6 @@
 | | ... | tg_dstsid3=${out_sid1_2} | dut_dstsid3=${out_sid2_2}
 
 *** Test Cases ***
-| 78B-ethip6srhip6-ip6base-srv6proxy-dyn-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6srhip6-ip6base-srv6proxy-dyn-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-scapy.robot
index f751b73016..106bce9d1e 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,36 +15,40 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
 | ... | SRv6_PROXY_MASQ | MEMIF | DOCKER | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6srhip6-ip6base-srv6proxy-masq
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | container
+| Test Teardown | Tear down test | packet_trace | telemetry | container | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with Masquerading\
-| ... | SRv6 proxy test cases*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with Masquerading \
+| ... | SRv6 proxy test cases**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with three SIDs - Segment Routing Header inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6am_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
+| ... | srv6am_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -81,14 +85,16 @@
 # Container
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain_functional
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and one SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and one SR \
 | | ... | behaviour (function) - End.AM - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -116,6 +122,6 @@
 | | ... | tg_dstsid3=${out_sid1_2} | dut_dstsid3=${out_sid2_2}
 
 *** Test Cases ***
-| 78B-ethip6srhip6-ip6base-srv6proxy-masq-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6srhip6-ip6base-srv6proxy-masq-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-scapy.robot
index 56b43a527e..34c2ff940a 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot
+++ b/tests/vpp/device/srv6/2n1l-10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-scapy.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 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,36 +15,40 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_PROXY
 | ... | SRv6_PROXY_STAT | MEMIF | DOCKER | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip6srhip6-ip6base-srv6proxy-stat
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | container
+| Test Teardown | Tear down test | packet_trace | telemetry | container | srv6
 |
 | Test Template | Local Template
 |
-| Documentation | *Segment routing over IPv6 dataplane with Static\
-| ... | SRv6 proxy test cases.*
-|
-| ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\
+| Documentation | **Segment routing over IPv6 dataplane with Static \
+| ... | SRv6 proxy test cases.**
+| ... |
+| ... | - **[Top] Network topologies:** TG-DUT1 2-node topology with one link \
 | ... | between nodes.
-| ... | *[Cfg] DUT configuration:* On DUT1 configure physical interface IPv6\
-| ... | addresses, static ARP record, route and IPv6 forwarding over SRv6\
+| ... |
+| ... | - **[Cfg] DUT configuration:** On DUT1 configure physical interface \
+| ... | IPv6 addresses, static ARP record, route and IPv6 forwarding over SRv6 \
 | ... | with three SIDs - Segment Routing Header inserted.
-| ... | *[Ver] TG verification:* ETH-IP6 packet is sent from TG to DUT1 in one\
-| ... | direction. Packet is received and verified for correctness on TG. Then\
-| ... | ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet is\
-| ... | received and verified for correctness on TG.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
+| ... |
+| ... | - **[Ver] TG verification:** ETH-IP6 packet is sent from TG to DUT1 in \
+| ... | one direction. Packet is received and verified for correctness on TG. \
+| ... | Then ETH-IP6-IP6 packet is sent from TG in opposite direction. Packet \
+| ... | is received and verified for correctness on TG.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** SRv6 Network \
+| ... | Programming - draft 3.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6as_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
+| ... | srv6as_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
@@ -81,14 +85,16 @@
 # Container
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain_functional
+# Telemetry
+| ${telemetry_profile}= | vppctl_test_teardown
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT1 is configured with IPv6 routing and static route,\
-| | ... | SR policy and steering policy for one direction and one SR\
+| | ... | - **[Cfg]** DUT1 is configured with IPv6 routing and static route, \
+| | ... | SR policy and steering policy for one direction and one SR \
 | | ... | behaviour (function) - End.AS - for other direction.
-| | ... | [Ver] Make TG send IPv6 packets routed over DUT1 interfaces.\
+| | ... | - **[Ver]** Make TG send IPv6 packets routed over DUT1 interfaces. \
 | | ... | Make TG verify IPv6 packets are correct.
 | |
 | | ... | *Arguments:*
@@ -117,6 +123,6 @@
 | | ... | static_proxy=${True}
 
 *** Test Cases ***
-| 78B-ethip6srhip6-ip6base-srv6proxy-stat-dev
-| | [Tags] | 78B
+| 78B-0c-ethip6srhip6-ip6base-srv6proxy-stat-scapy
+| | [Tags] | 78B | 0C
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/regenerate_testcases.py b/tests/vpp/device/srv6/regenerate_testcases.py
new file mode 100755
index 0000000000..2cae24e087
--- /dev/null
+++ b/tests/vpp/device/srv6/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", protocol=u"ip6")