CSIT-339: Add Keywords for SMT

- modify keywords in CpuUtils.py
- add RF keywords

Change-Id: I57230b3948254e8f149b2563a8e24e948bc2ec27
Signed-off-by: Tibor Frank <tifrank@cisco.com>

2 files changed, 72 insertions, 72 deletions

diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index 78f4512c68..a29c1a06a8 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -91,10 +91,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -124,10 +124,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -157,10 +157,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -190,10 +190,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -224,10 +224,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -257,10 +257,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -290,10 +290,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -323,10 +323,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -356,10 +356,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -389,10 +389,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -423,10 +423,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -457,10 +457,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -490,10 +490,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -523,10 +523,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -556,10 +556,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -589,10 +589,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -623,10 +623,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -657,10 +657,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index 3ca2faffa7..9a17a8d153 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -93,10 +93,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -126,10 +126,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -159,10 +159,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -192,10 +192,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -226,10 +226,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -259,10 +259,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -292,10 +292,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -325,10 +325,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -358,10 +358,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -391,10 +391,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -425,10 +425,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -459,10 +459,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -492,10 +492,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -525,10 +525,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -558,10 +558,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -591,10 +591,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -625,10 +625,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -659,10 +659,10 @@
 | | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${5} | ${5}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${5} | ${5}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}