Update: NDRCHK rate values and typos

Change-Id: I6c8c4f73cb69f53e0ad3ac96a566c4a6272b6d17
Signed-off-by: pmikus <pmikus@cisco.com>

22 files changed, 322 insertions, 322 deletions

diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
index 7254466a10..f97335d94f 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
@@ -58,10 +58,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC with 802.1ad config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 2.9mpps.
+| | ... | frames using single trial throughput test at 2x 4.0mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 2.9mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.0mpps
 | | 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
@@ -85,7 +85,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
 | | ... | frames using single trial throughput test at 2x 810635pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1514
+| | ${framesize}= | Set Variable | ${1514}
 | | ${rate}= | Set Variable | 810635pps
 | | 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
@@ -110,7 +110,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138458pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138458pps
 | | 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
@@ -132,10 +132,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC with 802.1ad config with 2 thread, 2 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.0mpps.
+| | ... | frames using single trial throughput test at 2x 8.5mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 8.5mpps
 | | 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
@@ -159,7 +159,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
 | | ... | frames using single trial throughput test at 2x 810635pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1514
+| | ${framesize}= | Set Variable | ${1514}
 | | ${rate}= | Set Variable | 810635pps
 | | 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
@@ -184,7 +184,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138458pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138458pps
 | | 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
@@ -206,10 +206,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC with 802.1ad config with 4 thread, 4 phy core, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 8.0mpps.
+| | ... | frames using single trial throughput test at 2x 8.6mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 8.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 8.6mpps
 | | 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
@@ -233,7 +233,7 @@
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
 | | ... | frames using single trial throughput test at 2x 810635pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1514
+| | ${framesize}= | Set Variable | ${1514}
 | | ${rate}= | Set Variable | 810635pps
 | | 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
@@ -258,7 +258,7 @@
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138458pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138458pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
index d033886961..c9391af7b7 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
@@ -54,10 +54,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 2.9mpps.
+| | ... | frames using single trial throughput test at 2x 4.0mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 2.9mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.0mpps
 | | 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
@@ -80,7 +80,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 720000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -104,7 +104,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -125,10 +125,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.0mpps.
+| | ... | frames using single trial throughput test at 2x 8.7mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 8.7mpps
 | | 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
@@ -151,7 +151,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 720000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -175,7 +175,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -196,10 +196,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 11.0mpps.
+| | ... | frames using single trial throughput test at 2x 10.3mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 11.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.3mpps
 | | 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
@@ -222,7 +222,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 720000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -246,7 +246,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
index d21cf2b431..514a529107 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
@@ -50,10 +50,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.2mpps.
+| | ... | frames using single trial throughput test at 2x 4.9mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.2mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.9mpps
 | | 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
@@ -68,7 +68,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -84,7 +84,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -97,10 +97,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 6.9mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 6.9mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -115,7 +115,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -131,7 +131,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -144,10 +144,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.4mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.4mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -162,7 +162,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
index 49872c845f..7d04caee97 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
@@ -50,10 +50,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.6mpps.
+| | ... | frames using single trial throughput test at 2x 5.9mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.6mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 5.9mpps
 | | 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
@@ -68,7 +68,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -84,7 +84,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -97,10 +97,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 8.3mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 8.3mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -115,7 +115,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -131,7 +131,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -144,10 +144,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 9.3mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 9.3mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -162,7 +162,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
index a40348a090..1e2cfba640 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
@@ -56,10 +56,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 3.5mpps.
+| | ... | at 2x 4.1mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.1mpps
 | | 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
@@ -81,7 +81,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -104,7 +104,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -124,10 +124,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 6.6mpps.
+| | ... | at 2x 7.2mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 6.6mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 7.2mpps
 | | 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
@@ -149,7 +149,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -172,7 +172,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -192,10 +192,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 10.0mpps.
+| | ... | at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 10.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -217,7 +217,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -240,7 +240,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
index df0083e3ad..15d4f37835 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
@@ -56,10 +56,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 3.1mpps.
+| | ... | at 2x 3.6mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.1mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 3.6mpps
 | | 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
@@ -89,7 +89,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -120,7 +120,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -148,10 +148,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 5.8mpps.
+| | ... | at 2x 6.3mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 5.8mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 6.3mpps
 | | 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
@@ -181,7 +181,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -212,7 +212,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -240,10 +240,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 7.8mpps.
+| | ... | at 2x 9.7mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.8mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 9.7mpps
 | | 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
@@ -273,7 +273,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -304,7 +304,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
index 2ef238c818..2800c9e1b2 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
@@ -59,10 +59,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 1 thread, 1 phy \
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 \
-| | ... | Byte frames using single trial throughput test at 2x 3.1mpps.
+| | ... | Byte frames using single trial throughput test at 2x 3.6mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.1mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 3.6mpps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
@@ -80,7 +80,7 @@
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 \
 | | ... | Byte frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
@@ -99,7 +99,7 @@
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 \
 | | ... | Byte frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
@@ -115,10 +115,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 2 threads, 2 \
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
-| | ... | 64 Byte frames using single trial throughput test at 2x 5.6mpps.
+| | ... | 64 Byte frames using single trial throughput test at 2x 6.2mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 5.6mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 6.2mpps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
@@ -136,7 +136,7 @@
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
@@ -155,7 +155,7 @@
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
@@ -171,10 +171,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 \
-| | ... | Byte frames using single trial throughput test at 2x 8.9mpps.
+| | ... | Byte frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 8.9mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
@@ -192,7 +192,7 @@
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
@@ -211,7 +211,7 @@
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
index f7322da9b8..f330aa26c5 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
@@ -56,10 +56,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.5mpps.
+| | ... | frames using single trial throughput test at 2x 4.6mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.6mpps
 | | 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
@@ -74,7 +74,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -90,7 +90,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -103,10 +103,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.5mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -121,7 +121,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -137,7 +137,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -150,10 +150,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 10.0mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 10.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -168,7 +168,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -184,7 +184,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
index 89f7b4454d..d808fb92d4 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
@@ -45,17 +45,17 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 100000
+| ${rts_per_flow}= | ${100000}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.5mpps.
+| | ... | frames using single trial throughput test at 2x 4.3mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.3mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -88,7 +88,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -102,10 +102,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.5mpps.
+| | ... | frames using single trial throughput test at 2x 9.1mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 9.1mpps
 | | 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
@@ -121,7 +121,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -138,7 +138,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -152,10 +152,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 10.0mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 10.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -171,7 +171,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -188,7 +188,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
index 1a3404685c..fbea40e414 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
@@ -45,17 +45,17 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 10000
+| ${rts_per_flow}= | ${10000}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.5mpps.
+| | ... | frames using single trial throughput test at 2x 4.3mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.3mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -88,7 +88,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -102,10 +102,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.5mpps.
+| | ... | frames using single trial throughput test at 2x 9.0mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 9.0mpps
 | | 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
@@ -121,7 +121,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -138,7 +138,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -152,10 +152,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 10.0mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 10.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -171,7 +171,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -188,7 +188,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
index 35ac274f92..9190d70405 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
@@ -45,17 +45,17 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 1000000
+| ${rts_per_flow}= | ${1000000}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 3.5mpps.
+| | ... | frames using single trial throughput test at 2x 3.7mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 3.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 3.7mpps
 | | 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
@@ -72,7 +72,7 @@
 | | ... | test. DUT runs IPv4 routing config with 1 thread, 1 phy core, 1
 | | ... | receive queue per NIC port at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -90,7 +90,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -105,10 +105,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 7.5mpps.
+| | ... | frames using single trial throughput test at 2x 7.6mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 7.5mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 7.6mpps
 | | 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
@@ -125,7 +125,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -143,7 +143,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -158,10 +158,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 10.0mpps.
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${rate}= | Set Variable | 10.0mpps
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -196,7 +196,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
index 85140059c0..f31dbdeca1 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
@@ -59,7 +59,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial throughput\
 | | ... | test at 2x 1.9mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 1.9mpps
 | | 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
@@ -83,7 +83,7 @@
 | | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1480
+| | ${framesize}= | Set Variable | ${1480}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -107,7 +107,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -130,7 +130,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
 | | ... | throughput test at 2x 3.6mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 3.6mpps
 | | 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
@@ -154,7 +154,7 @@
 | | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1480
+| | ${framesize}= | Set Variable | ${1480}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -201,7 +201,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
 | | ... | throughput test at 2x 3.5mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 3.5mpps
 | | 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
@@ -225,7 +225,7 @@
 | | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1480
+| | ${framesize}= | Set Variable | ${1480}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -249,7 +249,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
index 2983a538fe..1c9cb0ee49 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
@@ -59,7 +59,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
 | | ... | throughput test at 2x 1.53mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 1.53mpps
 | | 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
@@ -83,7 +83,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -107,7 +107,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -130,7 +130,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
 | | ... | throughput test at 2x 3.25mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 3.25mpps
 | | 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
@@ -154,7 +154,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -201,7 +201,7 @@
 | | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
 | | ... | throughput test at 2x 3.12mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 3.12mpps
 | | 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
@@ -225,7 +225,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -249,7 +249,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
index dc7c4618ed..6b3f6aa7c2 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
@@ -53,7 +53,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
 | | ... | frames using single trial throughput test at 2x 2.4mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 2.4mpps
 | | 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
@@ -69,7 +69,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 787153pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 787153pps
 | | 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
@@ -84,7 +84,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 137816pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 137816pps
 | | 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
@@ -95,11 +95,11 @@
 
 | tc04-64B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
 | | ... | frames using single trial throughput test at 2x 5.2mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 5.2mpps
 | | 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
@@ -111,11 +111,11 @@
 
 | tc05-1518B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 787153pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 787153pps
 | | 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
@@ -126,11 +126,11 @@
 
 | tc06-9000B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 137816pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 137816pps
 | | 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
@@ -141,11 +141,11 @@
 
 | tc07-64B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
 | | ... | frames using single trial throughput test at 2x 8.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
+| | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 8.4mpps
 | | 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
@@ -157,11 +157,11 @@
 
 | tc08-1518B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 787153pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 787153pps
 | | 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
@@ -172,11 +172,11 @@
 
 | tc09-9000B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 137816pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 137816pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
index 0410d8085b..c3c93bc9aa 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
@@ -52,10 +52,10 @@
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 2.8mpps.
+| | ... | at 2x 3.1mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 2.8mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 3.1mpps
 | | 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
@@ -77,7 +77,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -100,7 +100,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -120,10 +120,10 @@
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 4.9mpps.
+| | ... | at 2x 5.9mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 4.9mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 5.9mpps
 | | 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
@@ -145,7 +145,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -168,7 +168,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -186,12 +186,12 @@
 | tc07-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 10.1mpps.
+| | ... | at 2x 9.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 10.1mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 9.4mpps
 | | 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
@@ -209,11 +209,11 @@
 | tc08-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -232,11 +232,11 @@
 | tc09-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
index ee01b4a0ae..49df274a7a 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
@@ -51,10 +51,10 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 2.9mpps.
+| | ... | at 2x 3.2mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 2.9mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 3.2mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -89,7 +89,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -104,10 +104,10 @@
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 5.4mpps.
+| | ... | at 2x 5.7mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 5.4mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 5.7mpps
 | | 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
@@ -124,7 +124,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -142,7 +142,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -157,10 +157,10 @@
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 9.5mpps.
+| | ... | at 2x 9.2mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 9.5mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 9.2mpps
 | | 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
@@ -177,7 +177,7 @@
 | | ... | ref-NDR for 1518 Byte frames using single trial throughput test
 | | ... | at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -195,7 +195,7 @@
 | | ... | ref-NDR for 9000 Byte frames using single trial throughput test
 | | ... | at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
index 2792e2c9f0..17025bfd46 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
@@ -49,10 +49,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 2.9mpps.
+| | ... | frames using single trial throughput test at 2x 3.9mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 2.9mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 3.9mpps
 | | 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
@@ -67,7 +67,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -83,7 +83,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -96,10 +96,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 5.9mpps.
+| | ... | frames using single trial throughput test at 2x 8.1mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 5.9mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 8.1mpps
 | | 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
@@ -114,7 +114,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -130,7 +130,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -143,10 +143,10 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 7.3mpps.
+| | ... | frames using single trial throughput test at 2x 9.4mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 7.3mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 9.4mpps
 | | 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
@@ -161,7 +161,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -177,7 +177,7 @@
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
index 430bcb6123..4b949623cf 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
@@ -45,7 +45,7 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 100000
+| ${rts_per_flow}= | ${100000}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale200k-ndrchk
@@ -54,7 +54,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
 | | ... | frames using single trial throughput test at 2x 2.3mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 2.3mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -88,7 +88,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -100,12 +100,12 @@
 
 | tc04-78B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 4.8mpps.
+| | ... | frames using single trial throughput test at 2x 5.0mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 4.8mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 5.0mpps
 | | 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
@@ -117,11 +117,11 @@
 
 | tc05-1518B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -134,11 +134,11 @@
 
 | tc06-9000B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -150,12 +150,12 @@
 
 | tc07-78B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 7.7mpps.
+| | ... | frames using single trial throughput test at 2x 5.7mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 7.7mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 5.7mpps
 | | 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
@@ -167,11 +167,11 @@
 
 | tc08-1518B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -184,11 +184,11 @@
 
 | tc09-9000B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
index 61883be805..a3b864145a 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
@@ -45,7 +45,7 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 10000
+| ${rts_per_flow}= | ${10000}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale20k-ndrchk
@@ -54,7 +54,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
 | | ... | frames using single trial throughput test at 2x 2.9mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 2.9mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -88,7 +88,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -100,12 +100,12 @@
 
 | tc04-78B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 5.9mpps.
+| | ... | frames using single trial throughput test at 2x 7.0mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 5.9mpps
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 7.0mpps
 | | 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
@@ -117,11 +117,11 @@
 
 | tc05-1518B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -134,11 +134,11 @@
 
 | tc06-9000B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -150,11 +150,11 @@
 
 | tc07-78B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 10.0mpps.
+| | ... | frames using single trial throughput test at 2x 9.6mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 10.0mpps
 | | 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
@@ -167,11 +167,11 @@
 
 | tc08-1518B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -184,11 +184,11 @@
 
 | tc09-9000B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
index d00eed7cbf..82a3dc85b3 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
@@ -45,7 +45,7 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| ${rts_per_flow}= | 1000000
+| ${rts_per_flow}= | ${1000000}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale2m-ndrchk
@@ -54,7 +54,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
 | | ... | frames using single trial throughput test at 2x 1.8mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 1.8mpps
 | | 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
@@ -71,7 +71,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -88,7 +88,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -100,11 +100,11 @@
 
 | tc04-78B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
 | | ... | frames using single trial throughput test at 2x 4.0mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 4.0mpps
 | | 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
@@ -117,11 +117,11 @@
 
 | tc05-1518B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -134,11 +134,11 @@
 
 | tc06-9000B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 thread, 2 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
@@ -150,11 +150,11 @@
 
 | tc07-78B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
 | | ... | frames using single trial throughput test at 2x 6.8mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 6.8mpps
 | | 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
@@ -167,11 +167,11 @@
 
 | tc08-1518B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
 | | ... | frames using single trial throughput test at 2x 812743pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
@@ -184,11 +184,11 @@
 
 | tc09-9000B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 thread, 4 phy core, \
+| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
 | | ... | frames using single trial throughput test at 2x 138580pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
index 04baa6ed10..8debdefb83 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
@@ -59,7 +59,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 1.75mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 1.75mpps
 | | 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
@@ -83,7 +83,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -107,7 +107,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -130,7 +130,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 3.42mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 3.42mpps
 | | 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
@@ -154,7 +154,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -178,7 +178,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -201,7 +201,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 3.42mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 3.42mpps
 | | 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
@@ -225,7 +225,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 720000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 720000pps
 | | 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
@@ -249,7 +249,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
index 08e1198e2a..b0f79a749f 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
@@ -55,7 +55,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 1.56mpps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 1.56mpps
 | | 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
@@ -79,7 +79,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -103,7 +103,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -126,7 +126,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 3.2mpps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 3.2mpps
 | | 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
@@ -150,7 +150,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -174,7 +174,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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
@@ -197,7 +197,7 @@
 | | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
 | | ... | throughput test at 2x 3.2mpps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
+| | ${framesize}= | Set Variable | ${78}
 | | ${rate}= | Set Variable | 3.2mpps
 | | 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
@@ -221,7 +221,7 @@
 | | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1460
+| | ${framesize}= | Set Variable | ${1460}
 | | ${rate}= | Set Variable | 740000pps
 | | 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
@@ -245,7 +245,7 @@
 | | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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