X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fperf%2FLong_Lisp_Intel-X520-DA2.robot;h=8938e214666b34cddf11eeb85d6ac11a56f36ea2;hb=23d1d2bf67f91fe4e5bbcce7aa5525ada82342c3;hp=8812b9e0ed9ca74c244e5049431f3c39c37477d0;hpb=516051c6aabb609d94d442db222c11e33837e124;p=csit.git

diff --git a/tests/perf/Long_Lisp_Intel-X520-DA2.robot b/tests/perf/Long_Lisp_Intel-X520-DA2.robot
index 8812b9e0ed..8938e21466 100644
--- a/tests/perf/Long_Lisp_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Lisp_Intel-X520-DA2.robot
@@ -54,6 +54,10 @@
 | ... | Ethernet L2 frame sizes using either binary search or linear search
 | ... | *[Ref] Applicable standard specifications:* RFC6830.
 
+*** Variables ***
+#X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+
 *** Test Cases ***
 | TC01: 64B NDR binary search - DUT IPv4 over LISPoIPv4 tunnel - 1thread 1core 1rxq
 | | [Documentation]
@@ -63,13 +67,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -95,13 +99,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -128,13 +132,13 @@
 | | ... | [Ver] Find NDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -159,13 +163,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -192,13 +196,13 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -223,13 +227,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -255,13 +259,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -287,13 +291,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -321,13 +325,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -353,13 +357,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -387,13 +391,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -418,13 +422,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -450,13 +454,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -482,13 +486,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -516,13 +520,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -548,13 +552,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1480
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1480}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -582,13 +586,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -613,13 +617,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
@@ -645,13 +649,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -677,13 +681,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -710,13 +714,13 @@
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -742,13 +746,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -775,13 +779,13 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -806,13 +810,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -838,13 +842,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -870,13 +874,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -904,13 +908,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -936,13 +940,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -970,13 +974,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -1001,13 +1005,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -1033,13 +1037,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1065,13 +1069,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1099,13 +1103,13 @@
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1131,13 +1135,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1165,13 +1169,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -1196,13 +1200,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
@@ -1228,13 +1232,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1260,13 +1264,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1293,13 +1297,13 @@
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1325,13 +1329,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1358,13 +1362,13 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1389,13 +1393,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1421,13 +1425,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1453,13 +1457,13 @@
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1487,13 +1491,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1519,13 +1523,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1553,13 +1557,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1584,13 +1588,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1616,13 +1620,13 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1648,13 +1652,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 64
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
+| | ${framesize}= | Set Variable | ${64}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1682,13 +1686,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1714,13 +1718,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1748,13 +1752,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1779,13 +1783,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
@@ -1811,13 +1815,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1843,13 +1847,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6IPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1876,13 +1880,13 @@
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1908,13 +1912,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -1941,13 +1945,13 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
@@ -1972,13 +1976,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
@@ -2004,13 +2008,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2036,13 +2040,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2070,13 +2074,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2102,13 +2106,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2136,13 +2140,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
@@ -2167,13 +2171,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
+| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
@@ -2199,13 +2203,13 @@
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2231,13 +2235,13 @@
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 78
-| | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
+| | ${framesize}= | Set Variable | ${78}
+| | ${min_rate}= | Set Variable | ${100000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2265,13 +2269,13 @@
 | | ... | at 10GE linerate, step 10kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2297,13 +2301,13 @@
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 1460
-| | ${min_rate}= | Set Variable | 10000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
+| | ${framesize}= | Set Variable | ${1460}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
 | | And   Apply startup configuration on all VPP DUTs
@@ -2331,13 +2335,13 @@
 | | ... | at 10GE linerate, step 5kpps.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
@@ -2362,13 +2366,13 @@
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
 | | ...    | SKIP_PATCH
-| | ${framesize}= | Set Variable | 9000
-| | ${min_rate}= | Set Variable | 5000
-| | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
+| | ${framesize}= | Set Variable | ${9000}
+| | ${min_rate}= | Set Variable | ${10000}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
+| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology