CSIT-662: KWI - KW renaming

 - plus: CSIT-656: Script to rename robot keywords.

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

1 files changed, 112 insertions, 112 deletions

diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
index 3bfcf9044f..6feb74285d 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -18,12 +18,12 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM
 | ...
-| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
 | ... | L3 | Intel-X520-DA2
-| Suite Teardown | 3-node Performance Suite Teardown
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Performance test setup
-| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
+| Test Setup | Set up performance test
+| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
@@ -80,17 +80,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -112,17 +112,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -145,17 +145,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -177,17 +177,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -211,17 +211,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -244,17 +244,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -277,17 +277,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -309,17 +309,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -342,17 +342,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -374,17 +374,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -408,17 +408,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -441,17 +441,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -474,17 +474,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -506,17 +506,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -539,17 +539,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -571,17 +571,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -605,17 +605,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
@@ -638,17 +638,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
-| | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
 | | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}