X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=47fde7300756c80cd5deae58d146d5bfd7abfbe1;hp=20f2f0b0b20936917542b126fd3ba8e2353ff9c4;hb=21702fb09c470511cc3ed7b34ca5ab0f8d30b68f;hpb=f8eca5691c63479e5b4c59b5d65456553d4999dd

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 20f2f0b0b2..47fde73007 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -66,7 +66,7 @@
 | | ... | \| Get Frame Size \| IMIX_v4_1
 | | [Arguments] | ${framesize}
 | | Run Keyword If | '${framesize}' == 'IMIX_v4_1'
-| | ...            | Return From Keyword | 353.83333
+| | ... | Return From Keyword | 353.83333
 | | Return From Keyword | ${framesize}
 
 | Setup performance global Variables
@@ -125,7 +125,7 @@
 | | ... | - dut2_if2 - DUT2 interface towards DUT1.
 | | ...
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
-| | ...          | ${nodes['TG']}
+| | ... | ${nodes['TG']}
 | | Compute Path
 | | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
@@ -328,13 +328,13 @@
 | | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
 | | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.2 | 30
 | | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | 1.1.1.1 | ${dut1_if1}
-| | ...           | count=${count}
+| | ... | count=${count}
 | | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2}
-| | ...           | count=${count}
+| | ... | count=${count}
 | | Vpp Route Add | ${dut2} | 10.0.0.0 | 32 | 2.2.2.1 | ${dut2_if1}
-| | ...           | count=${count}
+| | ... | count=${count}
 | | Vpp Route Add | ${dut2} | 20.0.0.0 | 32 | 3.3.3.1 | ${dut2_if2}
-| | ...           | count=${count}
+| | ... | count=${count}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
 | IPv4 forwarding with vhost initialized in a 3-node circular topology
@@ -362,15 +362,13 @@
 | | [Arguments] | ${sock1} | ${sock2}
 | | VPP interfaces in path are up in a 3-node circular topology
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | ${dut1_vif1}= | Set Variable | ${vhost_if1}
 | | ${dut1_vif2}= | Set Variable | ${vhost_if2}
 | | Set Interface State | ${dut1} | ${dut1_vif1} | up
 | | Set Interface State | ${dut1} | ${dut1_vif2} | up
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | ${dut2_vif1}= | Set Variable | ${vhost_if1}
 | | ${dut2_vif2}= | Set Variable | ${vhost_if2}
 | | Set Interface State | ${dut2} | ${dut2_vif1} | up
@@ -551,13 +549,13 @@
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:5::2 | ${tg1_if2_mac}
 | | Vpp Route Add | ${dut1} | 2001:2::0 | ${host_prefix} | 2001:4::2
-| | ...           | interface=${dut1_if2} | count=${count}
+| | ... | interface=${dut1_if2} | count=${count}
 | | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | 2001:3::2
-| | ...           | interface=${dut1_if1} | count=${count}
+| | ... | interface=${dut1_if1} | count=${count}
 | | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} | 2001:4::1
-| | ...           | interface=${dut2_if1} | count=${count}
+| | ... | interface=${dut2_if1} | count=${count}
 | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
-| | ...           | interface=${dut2_if2} | count=${count}
+| | ... | interface=${dut2_if2} | count=${count}
 
 | IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | [Documentation]
@@ -597,19 +595,17 @@
 | | ... | interfaces.
 | | ...
 | | VPP interfaces in path are up in a 3-node circular topology
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1
-| | ...                                | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2
-| | ...                                | 24
+| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac}
 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
-| | ...             | 172.16.0.1 | 172.16.0.2
+| | ... | 172.16.0.1 | 172.16.0.2
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
-| | ...             | 172.16.0.2 | 172.16.0.1
+| | ... | 172.16.0.2 | 172.16.0.1
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 
 | L2 xconnect with Vhost-User initialized in a 3-node circular topology
@@ -624,16 +620,14 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| L2 xconnect with Vhost-User initialized in a 3-node \
-| | ... |    circular topology \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | circular topology \| /tmp/sock1 \| /tmp/sock2 \|
 | | [Arguments] | ${sock1} | ${sock2}
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if2} | ${vhost_if2}
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${vhost_if1}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
@@ -698,18 +692,16 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| L2 bridge domains with Vhost-User initialized in a 3-node \
-| | ... |    circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \|
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
 | | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
 | | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
 | | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
 | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
-| | ...                                                | ${sock1}
-| | ...                                                | ${sock2}
+| | ... | ${sock1} | ${sock2}
 | | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1}
 | | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
 | | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
@@ -930,9 +922,7 @@
 | | ... | ${nic_model}
 | | Setup default startup configuration of VPP on all DUTs
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
-| | ...                          | ${dut1} | ${dut1_if1}
-| | ...                          | ${dut2} | ${dut2_if2}
-| | ...                          | ${topology_type}
+| | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type}
 
 | 3-node Performance Suite Teardown
 | | [Documentation]
@@ -963,10 +953,12 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Find NDR using linear search and pps \| 64 \| 5000000 \| \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952
+| | ... | \| Find NDR using linear search and pps \| 64 \| 5000000 \
+| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \|
+| | ...
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate}
+| | ... | ${topology_type} | ${min_rate} | ${max_rate}
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -979,19 +971,18 @@
 | | ${latency}= | Create List | ${tmp}
 | | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
 | | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 50%NDR | ${lat_50p}
 | | Append To List | ${latency} | ${tmp}
 | | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
 | | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 10%NDR | ${lat_10p}
 | | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${latency}
+| | ... | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ...                              | ${framesize} | ${topology_type}
-| | ...                              | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
 
 | Find PDR using linear search and pps
 | | [Documentation]
@@ -1011,10 +1002,12 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Find PDR using linear search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 0.5 \| percentage
+| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 0.5 \| percentage \|
+| | ...
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate}
-| | ...         | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ... | ${topology_type} | ${min_rate} | ${max_rate}
+| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -1023,19 +1016,16 @@
 | | Set Search Rate Type pps
 | | Set Loss Acceptance | ${loss_acceptance}
 | | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ...            | Set Loss Acceptance Type Percentage
+| | ... | Set Loss Acceptance Type Percentage
 | | Linear Search | ${start_rate} | ${topology_type}
 | | ${rate_per_stream} | ${lat}= | Verify Search Result
 | | ${tmp}= | Create List | 100%PDR | ${lat}
 | | ${latency}= | Create List | ${tmp}
 | | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${loss_acceptance} | ${loss_acceptance_type}
-| | ...                          | ${latency}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
 | | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ...                                   | ${framesize} | ${topology_type}
-| | ...                                   | ${loss_acceptance}
-| | ...                                   | ${loss_acceptance_type}
-| | ...                                   | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
+| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
 
 | Find NDR using binary search and pps
 | | [Documentation]
@@ -1053,9 +1043,11 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Find NDR using binary search and pps \| 64 \| 6000000 \
-| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000
+| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 \|
+| | ...
 | | [Arguments] | ${framesize} | ${binary_min} | ${binary_max}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -1068,19 +1060,18 @@
 | | ${latency}= | Create List | ${tmp}
 | | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
 | | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 50%NDR | ${lat_50p}
 | | Append To List | ${latency} | ${tmp}
 | | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
 | | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 10%NDR | ${lat_10p}
 | | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${latency}
+| | ... | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ...                              | ${framesize} | ${topology_type}
-| | ...                              | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
 
 | Find PDR using binary search and pps
 | | [Documentation]
@@ -1102,10 +1093,12 @@
 | | ...
 | | ... | \| Find PDR using binary search and pps \| 64 \| 6000000 \
 | | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 \| 0.5 \
-| | ... | \| percentage
+| | ... | \| percentage \|
+| | ...
 | | [Arguments] | ${framesize} | ${binary_min} | ${binary_max}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ...         | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -1113,20 +1106,17 @@
 | | Set Search Rate Type pps
 | | Set Loss Acceptance | ${loss_acceptance}
 | | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ...            | Set Loss Acceptance Type Percentage
+| | ... | Set Loss Acceptance Type Percentage
 | | Set Binary Convergence Threshold | ${threshold}
 | | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
 | | ${rate_per_stream} | ${lat}= | Verify Search Result
 | | ${tmp}= | Create List | 100%PDR | ${lat}
 | | ${latency}= | Create List | ${tmp}
 | | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${loss_acceptance} | ${loss_acceptance_type}
-| | ...                          | ${latency}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
 | | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ...                                   | ${framesize} | ${topology_type}
-| | ...                                   | ${loss_acceptance}
-| | ...                                   | ${loss_acceptance_type}
-| | ...                                   | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
+| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
 
 | Find NDR using combined search and pps
 | | [Documentation]
@@ -1145,9 +1135,11 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Find NDR using combined search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000
+| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 \|
+| | ...
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -1161,19 +1153,19 @@
 | | ${latency}= | Create List | ${tmp}
 | | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
 | | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 50%NDR | ${lat_50p}
 | | Append To List | ${latency} | ${tmp}
 | | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
 | | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ...                               | ${framesize} | ${topology_type}
+| | ... | ${framesize} | ${topology_type}
 | | ${tmp}= | Create List | 10%NDR | ${lat_10p}
 | | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${latency}
+| | ... | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ...                              | ${framesize} | ${topology_type}
-| | ...                              | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type}
+| | ... | fail_on_loss=${False}
 
 | Find PDR using combined search and pps
 | | [Documentation]
@@ -1195,10 +1187,12 @@
 | | ...
 | | ... | \| Find PDR using combined search and pps \| 64 \| 5000000 \
 | | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 \| 0.5 \
-| | ... | \| percentage
+| | ... | \| percentage \|
+| | ...
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ...         | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
+| | ...
 | | ${duration}= | Set Variable | 10
 | | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
@@ -1207,20 +1201,17 @@
 | | Set Search Rate Type pps
 | | Set Loss Acceptance | ${loss_acceptance}
 | | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ...            | Set Loss Acceptance Type Percentage
+| | ... | Set Loss Acceptance Type Percentage
 | | Set Binary Convergence Threshold | ${threshold}
 | | Combined Search | ${start_rate} | ${topology_type}
 | | ${rate_per_stream} | ${lat}= | Verify Search Result
 | | ${tmp}= | Create List | 100%PDR | ${lat}
 | | ${latency}= | Create List | ${tmp}
 | | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ...                          | ${loss_acceptance} | ${loss_acceptance_type}
-| | ...                          | ${latency}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
 | | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ...                                   | ${framesize} | ${topology_type}
-| | ...                                   | ${loss_acceptance}
-| | ...                                   | ${loss_acceptance_type}
-| | ...                                   | fail_on_loss=${False}
+| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
+| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
 
 | Display result of NDR search
 | | [Documentation]
@@ -1241,16 +1232,16 @@
 | | ...
 | | ... | \| Display result of NDR search \| 4400000 \| 64 \| 2 \
 | | ... | \| [100%NDR, [10/10/10, 1/2/3]] \|
-| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
-| | ...         | ${latency}
+| | ...
+| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams} | ${latency}
+| | ...
 | | ${framesize}= | Get Frame Size | ${framesize}
 | | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams}
 | | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9)
 | | Set Test Message | FINAL_RATE: ${rate_total} pps
-| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps)
-| | ...              | append=yes
+| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes
 | | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
-| | ...              | append=yes
+| | ... | append=yes
 | | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
 | | :FOR | ${lat} | IN | @{latency}
 | | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
@@ -1276,21 +1267,23 @@
 | | ...
 | | ... | \| Display result of PDR search \| 4400000 \| 64 \| 2 \| 0.5 \
 | | ... | \| percentage \| [100%NDR, [10/10/10, 1/2/3]] \|
+| | ...
 | | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
-| | ...         | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
+| | ...
 | | ${framesize}= | Get Frame Size | ${framesize}
 | | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams}
 | | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9)
 | | Set Test Message | FINAL_RATE: ${rate_total} pps
-| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps)
-| | ...              | append=yes
+| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes
 | | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
-| | ...              | append=yes
+| | ... | append=yes
 | | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
 | | :FOR | ${lat} | IN | @{latency}
 | | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
-| | Set Test Message | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
-| | ...              | append=yes
+| | Set Test Message
+| | ... | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
+| | ... | append=yes
 
 | Measure latency pps
 | | [Documentation]
@@ -1304,13 +1297,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Measure latency \| 10 \| 4.0 \| 64 \| 3-node-IPv4
+| | ... | \| Measure latency \| 10 \| 4.0 \| 64 \| 3-node-IPv4 \|
+| | ...
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | ...
 | | Return From Keyword If | ${rate} <= 10000 | ${-1}
 | | ${ret}= | For DPDK Performance Test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate}pps | ${framesize}
-| | ...                | ${topology_type} | warmup_time=0
+| | ... | ${topology_type} | warmup_time=0
 | | Run Keyword If | ${ret}==${FALSE} | Show statistics on all DUTs
 | | Run keyword and return | Get latency
 
@@ -1328,15 +1323,17 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Traffic should pass with no loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4
+| | ... | \| 3-node-IPv4 \|
+| | ...
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | ...         | ${fail_on_loss}=${True}
+| | ... | ${fail_on_loss}=${True}
+| | ...
 | | Clear and show runtime counters with running traffic | ${duration}
-| | ...  | ${rate} | ${framesize} | ${topology_type}
+| | ... | ${rate} | ${framesize} | ${topology_type}
 | | ${ret}= | For DPDK Performance Test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate} | ${framesize}
-| | ...                | ${topology_type} | warmup_time=0
+| | ... | ${topology_type} | warmup_time=0
 | | Run Keyword If | ${ret}==${FALSE} | Show statistics on all DUTs
 | | Run Keyword If | ${fail_on_loss} | No traffic loss occurred
 
@@ -1356,19 +1353,21 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Traffic should pass with partial loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \| 0.5 \| percentage
+| | ... | \| 3-node-IPv4 \| 0.5 \| percentage \|
+| | ...
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | ...         | ${loss_acceptance} | ${loss_acceptance_type}
-| | ...         | ${fail_on_loss}=${True}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type}
+| | ... | ${fail_on_loss}=${True}
+| | ...
 | | Clear and show runtime counters with running traffic | ${duration}
-| | ...  | ${rate} | ${framesize} | ${topology_type}
+| | ... | ${rate} | ${framesize} | ${topology_type}
 | | ${ret}= | For DPDK Performance Test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate} | ${framesize}
-| | ...                | ${topology_type} | warmup_time=0
+| | ... | ${topology_type} | warmup_time=0
 | | Run Keyword If | ${ret}==${FALSE} | Show statistics on all DUTs
 | | Run Keyword If | ${fail_on_loss} | Partial traffic loss accepted
-| | ...            | ${loss_acceptance} | ${loss_acceptance_type}
+| | ... | ${loss_acceptance} | ${loss_acceptance_type}
 
 | Clear and show runtime counters with running traffic
 | | [Documentation]
@@ -1385,11 +1384,12 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Traffic should pass with partial loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \| 0.5 \| percentage
+| | ... | \| 3-node-IPv4 \| 0.5 \| percentage \|
+| | ...
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | Send traffic on tg | -1 | ${rate} | ${framesize}
-| | ...                | ${topology_type} | warmup_time=0 | async_call=${True}
-| | ...                | latency=${False}
+| | ...
+| | Send traffic on tg | -1 | ${rate} | ${framesize} | ${topology_type}
+| | ... | warmup_time=0 | async_call=${True} | latency=${False}
 | | ${ret}= | For DPDK Performance Test
 | | Run Keyword If | ${ret}==${FALSE} | Clear runtime counters on all DUTs
 | | Sleep | ${duration}
@@ -1412,11 +1412,10 @@
 | Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
-| | ... | DPDK testpmd. Qemu Guest is using 5 cores pinned to physical cores
-| | ... | 5-9, and 2048M. Testpmd is using 5 cores (1 main core and 4 cores
-| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64,
-| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so
-| | ... | and fwd mode is io.
+| | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
+| | ... | uses 5 cores (1 main core and 4 cores dedicated to io) mem-channel=4,
+| | ... | txq/rxq=256, burst=64, disable-hw-vlan, disable-rss,
+| | ... | driver usr/lib/librte_pmd_virtio.so and fwd mode is io.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
@@ -1429,19 +1428,62 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${5} \
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
 | | ...
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${5}
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${6}
+| | ... | ${count}=${5}
+| | ...
+| | Import Library | resources.libraries.python.QemuUtils
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
+| | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
+| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
+| | ${vm}= | Run keyword | ${vm_name}.Qemu Start
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
+| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f | eal_mem_channels=4
+| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True}
+| | Return From Keyword | ${vm}
+
+| Guest VM with dpdk-testpmd using SMT connected via vhost-user is setup
+| | [Documentation]
+| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
+| | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
+| | ... | uses 5 cores (1 main core and 4 cores dedicated to io) mem-channel=4,
+| | ... | txq/rxq=256, burst=64, disable-hw-vlan, disable-rss,
+| | ... | driver usr/lib/librte_pmd_virtio.so and fwd mode is io.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
+| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
+| | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Guest VM with dpdk-testpmd using SMT connected via vhost-user is \
+| | ... | setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
+| | ... | \| ${6} \| ${5} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${6}
 | | ... | ${count}=${5}
 | | ...
 | | Import Library | resources.libraries.python.QemuUtils
 | | ... | WITH NAME | ${vm_name}
 | | ${dut_numa}= | Get interfaces numa node | ${dut_node}
 | | ... | ${dut1_if1} | ${dut1_if2}
-| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
-| | ${end_idx}= | Evaluate | ${skip} + ${count}
-| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${True}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
@@ -1458,11 +1500,10 @@
 | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
-| | ... | DPDK testpmd. Qemu Guest is using 5 cores pinned to physical cores
-| | ... | 5-9 and 2048M. Testpmd is using 5 cores (1 main core and 4 cores
-| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64,
-| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so
-| | ... | and fwd mode is mac rewrite.
+| | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
+| | ... | uses 5 cores (1 main core and 4 cores dedicated to io) mem-channel=4,
+| | ... | txq/rxq=256, burst=64, disable-hw-vlan, disable-rss,
+| | ... | driver usr/lib/librte_pmd_virtio.so and fwd mode is mac rewrite.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
@@ -1478,18 +1519,64 @@
 | | ...
 | | ... | \| Guest VM with dpdk-testpmd for Vhost L2BD forwarding is setup \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
-| | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${5} \| ${5} \|
+| | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${6} \| ${5} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
-| | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${5} | ${count}=${5}
+| | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${6} | ${count}=${5}
 | | ...
 | | Import Library | resources.libraries.python.QemuUtils
 | | ... | WITH NAME | ${vm_name}
 | | ${dut_numa}= | Get interfaces numa node | ${dut_node}
 | | ... | ${dut1_if1} | ${dut1_if2}
-| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
-| | ${end_idx}= | Evaluate | ${skip} + ${count}
-| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
+| | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
+| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
+| | ${vm}= | Run keyword | ${vm_name}.Qemu Start
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
+| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f
+| | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac}
+| | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${True}
+| | Return From Keyword | ${vm}
+
+| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user is setup
+| | [Documentation]
+| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
+| | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
+| | ... | uses 5 cores (1 main core and 4 cores dedicated to io) mem-channel=4,
+| | ... | txq/rxq=256, burst=64, disable-hw-vlan, disable-rss,
+| | ... | driver usr/lib/librte_pmd_virtio.so and fwd mode is mac rewrite.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
+| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
+| | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - eth0_mac - MAC address of first Vhost interface. Type: string
+| | ... | - eth1_mac - MAC address of second Vhost interface. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user \
+| | ... | is setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
+| | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${6} \| ${5} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
+| | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${6} | ${count}=${5}
+| | ...
+| | Import Library | resources.libraries.python.QemuUtils
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${True}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
@@ -1507,8 +1594,7 @@
 | Guest VM with Linux Bridge connected via vhost-user is setup
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
-| | ... | linux bridge. Qemu Guest is using 3 cores pinned to physical cores 5,
-| | ... | 6, 7 and 2048M.
+| | ... | linux bridge. Qemu Guest uses 2048M.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
@@ -1521,19 +1607,64 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Guest VM with Linux Bridge connected via vhost-user is setup \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${5} \
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
 | | ...
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${5}
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${6}
 | | ... | ${count}=${5}
 | | ...
 | | Import Library | resources.libraries.python.QemuUtils
 | | ... | WITH NAME | ${vm_name}
 | | ${dut_numa}= | Get interfaces numa node | ${dut_node}
 | | ... | ${dut1_if1} | ${dut1_if2}
-| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
-| | ${end_idx}= | Evaluate | ${skip} + ${count}
-| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
+| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
+| | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
+| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
+| | ${vm}= | Run keyword | ${vm_name}.Qemu Start
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
+| | ${br}= | Set Variable | br0
+| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
+| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
+| | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2}
+| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
+| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
+| | Set Interface State | ${vm} | ${br} | up | if_type=name
+| | Return From Keyword | ${vm}
+
+| Guest VM with Linux Bridge using SMT connected via vhost-user is setup
+| | [Documentation]
+| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
+| | ... | linux bridge. Qemu Guest uses 2048M.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
+| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
+| | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Guest VM with Linux Bridge using SMT connected via vhost-user is \
+| | ... | setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
+| | ... | \| ${6}\| ${5} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${6}
+| | ... | ${count}=${5}
+| | ...
+| | Import Library | resources.libraries.python.QemuUtils
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
+| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${True}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
@@ -1598,7 +1729,7 @@
 
 | Lisp IPv4 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \
-| | ...             | Don`t set route.
+| | ... | Don`t set route.
 | | ...
 | | ... | *Arguments:*
 | | ... | -${dut1_dut2_address} - Ip address from DUT1 to DUT2. Type: string
@@ -1616,8 +1747,8 @@
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
 | | [Arguments] | ${dut1_dut2_address} | ${dut1_tg_address}
-| | ...         | ${dut2_dut1_address} | ${dut2_tg_address}
-| | ...         | ${duts_prefix}
+| | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${duts_prefix}
+| | ...
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
@@ -1638,7 +1769,7 @@
 
 | Lisp IPv6 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv6 topology on all DUT nodes \
-| | ...             | Don`t set route.
+| | ... | Don`t set route.
 | | ...
 | | ... | *Arguments:*
 | | ... | -${dut1_dut2_address} - Ip address from DUT1 to DUT2. Type: string
@@ -1656,56 +1787,55 @@
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
 | | [Arguments] | ${dut1_dut2_address} | ${dut1_tg_address}
-| | ...         | ${dut2_dut1_address} | ${dut2_tg_address}
-| | ...         | ${prefix}
+| | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${prefix}
+| | ...
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | ${dut1_tg_address}
-| | ...                  | ${prefix}
+| | ... | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | ${dut1_dut2_address}
-| | ...                  | ${prefix}
+| | ... | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | ${dut2_dut1_address}
-| | ...                  | ${prefix}
+| | ... | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_address}
-| | ...                  | ${prefix}
+| | ... | ${prefix}
 | | Vpp nodes ra suppress link layer | ${nodes}
-| | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2
-| | ...             | ${tg1_if1_mac}
-| | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2
-| | ...             | ${tg1_if2_mac}
+| | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
+| | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_address}
-| | ...             | ${dut2_if1_mac}
+| | ... | ${dut2_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_address}
-| | ...             | ${dut1_if2_mac}
+| | ... | ${dut1_if2_mac}
 
 | Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
-| | ...             | Don`t set route.
+| | ... | Don`t set route.
 | | ...
 | | ... | *Arguments:*
-| | ... | -${dut1_dut2_ip6_address} - IPv6 address from DUT1 to DUT2.
-| | ... |                             Type: string
-| | ... | -${dut1_tg_ip4_address} - IPv4 address from DUT1 to tg. Type: string
-| | ... | -${dut2_dut1_ip6_address} - IPv6 address from DUT2 to DUT1.
-| | ... |                             Type: string
-| | ... | -${dut1_tg_ip4_address} - IPv4 address from DUT1 to tg. Type: string
-| | ... | -${prefix4} - IPv4 prefix. Type: int
-| | ... | -${prefix6} - IPv6 prefix. Type: int
+| | ... | - ${dut1_dut2_ip6_address} - IPv6 address from DUT1 to DUT2.
+| | ... | Type: string
+| | ... | - ${dut1_tg_ip4_address} - IPv4 address from DUT1 to tg. Type: string
+| | ... | - ${dut2_dut1_ip6_address} - IPv6 address from DUT2 to DUT1.
+| | ... | Type: string
+| | ... | - ${dut1_tg_ip4_address} - IPv4 address from DUT1 to tg. Type: string
+| | ... | - ${prefix4} - IPv4 prefix. Type: int
+| | ... | - ${prefix6} - IPv6 prefix. Type: int
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology \
-| | ... | \| ${dut1_dut2_ip6_address} \| ${dut1_tg_ip4_address} \
+| | ... | \| Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular \
+| | ... | topology \| ${dut1_dut2_ip6_address} \| ${dut1_tg_ip4_address} \
 | | ... | \| ${dut2_dut1_ip6_address} \| ${dut2_tg_ip4_address} \
 | | ... | \| ${prefix4} \| ${prefix6} \|
 | | ...
 | | [Arguments] | ${dut1_dut2_ip6_address} | ${dut1_tg_ip4_address}
-| | ...         | ${dut2_dut1_ip6_address} | ${dut2_tg_ip4_address}
-| | ...         | ${prefix4} | ${prefix6}
+| | ... | ${dut2_dut1_ip6_address} | ${dut2_tg_ip4_address}
+| | ... | ${prefix4} | ${prefix6}
+| | ...
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
@@ -1716,44 +1846,45 @@
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | dut1_v4.set_ip | ${dut1_if1} | ${dut1_tg_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | ${dut1_dut2_ip6_address}
-| | ...                  | ${prefix6}
+| | ... | ${prefix6}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | ${dut2_dut1_ip6_address}
-| | ...                  | ${prefix6}
+| | ... | ${prefix6}
 | | dut2_v4.set_ip | ${dut2_if2} | ${dut2_tg_ip4_address} | ${prefix4}
 | | Vpp nodes ra suppress link layer | ${nodes}
 | | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
 | | dut2_v4.set_arp | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip6_address}
-| | ...             | ${dut2_if1_mac}
+| | ... | ${dut2_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip6_address}
-| | ...             | ${dut1_if2_mac}
+| | ... | ${dut1_if2_mac}
 
 | Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
-| | ...             | Don`t set route.
+| | ... | Don`t set route.
 | | ...
 | | ... | *Arguments:*
-| | ... | -${dut1_dut2_ip4_address} - IPv4 address from DUT1 to DUT2.
-| | ... |                             Type: string
-| | ... | -${dut1_tg_ip6_address} - IPv6 address from DUT1 to tg. Type: string
-| | ... | -${dut2_dut1_ip4_address} - IPv4 address from DUT2 to DUT1.
-| | ... |                             Type: string
-| | ... | -${dut1_tg_ip6_address} - IPv6 address from DUT1 to tg. Type: string
-| | ... | -${prefix4} - IPv4 prefix. Type: int
-| | ... | -${prefix6} - IPv6 prefix. Type: int
+| | ... | - ${dut1_dut2_ip4_address} - IPv4 address from DUT1 to DUT2.
+| | ... | Type: string
+| | ... | - ${dut1_tg_ip6_address} - IPv6 address from DUT1 to tg. Type: string
+| | ... | - ${dut2_dut1_ip4_address} - IPv4 address from DUT2 to DUT1.
+| | ... | Type: string
+| | ... | - ${dut1_tg_ip6_address} - IPv6 address from DUT1 to tg. Type: string
+| | ... | - ${prefix4} - IPv4 prefix. Type: int
+| | ... | - ${prefix6} - IPv6 prefix. Type: int
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology \
-| | ... | \| ${dut1_dut2_ip4_address} \| ${dut1_tg_ip6_address} \
+| | ... | \| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular \
+| | ... | topology \| ${dut1_dut2_ip4_address} \| ${dut1_tg_ip6_address} \
 | | ... | \| ${dut2_dut1_ip4_address} \| ${dut2_tg_ip6_address} \
 | | ... | \| ${prefix6} \| ${prefix4} \|
 | | ...
 | | [Arguments] | ${dut1_dut2_ip4_address} | ${dut1_tg_ip6_address}
-| | ...         | ${dut2_dut1_ip4_address} | ${dut2_tg_ip6_address}
-| | ...         | ${prefix6} | ${prefix4}
+| | ... | ${dut2_dut1_ip4_address} | ${dut2_tg_ip6_address}
+| | ... | ${prefix6} | ${prefix4}
+| | ...
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
@@ -1763,11 +1894,11 @@
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | ${dut1_tg_ip6_address}
-| | ...                  | ${prefix6}
+| | ... | ${prefix6}
 | | dut1_v4.set_ip | ${dut1_if2} | ${dut1_dut2_ip4_address} | ${prefix4}
 | | dut2_v4.set_ip | ${dut2_if1} | ${dut2_dut1_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_ip6_address}
-| | ...                  | ${prefix6}
+| | ... | ${prefix6}
 | | Vpp nodes ra suppress link layer | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
@@ -1789,14 +1920,14 @@
 | | ...
 | | ... | \| DPDK 2-node Performance Suite Setup with DUT's NIC model \
 | | ... | \| L2 \| Intel-X520-DA2 \|
+| | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
+| | ...
 | | Setup performance global Variables
 | | 2-node circular Topology Variables Setup with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
-| | ...                          | ${dut1} | ${dut1_if1}
-| | ...                          | ${dut1} | ${dut1_if2}
-| | ...                          | ${topology_type}
+| | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
 | DPDK 3-node Performance Suite Setup with DUT's NIC model
@@ -1813,14 +1944,14 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
+| | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
+| | ...
 | | Setup performance global Variables
 | | 3-node circular Topology Variables Setup with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
-| | ...                          | ${dut1} | ${dut1_if1}
-| | ...                          | ${dut2} | ${dut2_if2}
-| | ...                          | ${topology_type}
+| | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type}
 | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Initialize DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
@@ -1848,4 +1979,3 @@
 | | ... | Variable Should Exist | ${DPDK_TEST}
 | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
 | | Return From Keyword | ${FALSE}
-