X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=d0feed277dc5d86f49d6da269a5421a647ad01c2;hp=58c8f568d14200e6950a9064d268077261a7069f;hb=5f6802ba1d16005e7562f0eace81512dddab6762;hpb=81fc408c0dfcce0e093733810d80598abf25866a

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 58c8f568d1..d0feed277d 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -73,7 +73,7 @@
 | | ... | Return From Keyword | 353.83333
 | | Return From Keyword | ${framesize}
 
-| 2-node circular Topology Variables Setup
+| Set variables in 2-node circular topology
 | | [Documentation]
 | | ... | Compute path for testing on two given nodes in circular
 | | ... | topology and set corresponding suite variables.
@@ -99,7 +99,7 @@
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
 
-| 3-node circular Topology Variables Setup
+| Set variables in 3-node circular topology
 | | [Documentation]
 | | ... | Compute path for testing on three given nodes in circular
 | | ... | topology and set corresponding suite variables.
@@ -112,8 +112,8 @@
 | | ... | - dut1_if1 - DUT1 interface towards TG.
 | | ... | - dut1_if2 - DUT1 interface towards DUT2.
 | | ... | - dut2 - DUT2 node
-| | ... | - dut2_if1 - DUT2 interface towards TG.
-| | ... | - dut2_if2 - DUT2 interface towards DUT1.
+| | ... | - dut2_if1 - DUT2 interface towards DUT1.
+| | ... | - dut2_if2 - DUT2 interface towards TG.
 | | ...
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ... | ${nodes['TG']}
@@ -134,7 +134,7 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
-| 2-node circular Topology Variables Setup with DUT interface model
+| Set variables in 2-node circular topology with DUT interface model
 | | [Documentation]
 | | ... | Compute path for testing on two given nodes in circular topology
 | | ... | based on interface model provided as an argument and set
@@ -153,7 +153,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 2-node circular Topology Variables Setup with DUT interface model \
+| | ... | \| Set variables in 2-node circular topology with DUT interface model\
 | | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${iface_model}
@@ -174,7 +174,7 @@
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
 
-| 3-node circular Topology Variables Setup with DUT interface model
+| Set variables in 3-node circular topology with DUT interface model
 | | [Documentation]
 | | ... | Compute path for testing on three given nodes in circular topology
 | | ... | based on interface model provided as an argument and set
@@ -196,7 +196,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 3-node circular Topology Variables Setup with DUT interface model \
+| | ... | \| Set variables in 3-node circular topology with DUT interface model\
 | | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${iface_model}
@@ -223,7 +223,7 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
-| VPP interfaces in path are up in a 2-node circular topology
+| Set interfaces in path in 2-node circular topology up
 | | [Documentation]
 | | ... | *Set UP state on VPP interfaces in path on nodes in 2-node circular
 | | ... | topology.*
@@ -232,7 +232,7 @@
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Vpp Node Interfaces Ready Wait | ${dut1}
 
-| VPP interfaces in path are up in a 3-node circular topology
+| Set interfaces in path in 3-node circular topology up
 | | [Documentation]
 | | ... | *Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology.*
@@ -244,7 +244,50 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1}
 | | Vpp Node Interfaces Ready Wait | ${dut2}
 
-| IPv4 forwarding initialized in a 3-node circular topology
+| Initialize IPSec in 3-node circular topology
+| | [Documentation]
+| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
+| | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
+| | ... | interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG and
+| | ... | DUT1-DUT2 links. Set routing for encrypted traffic on both DUT nodes
+| | ... | with prefix /8 and next hop of neighbour DUT or TG interface IPv4
+| | ... | address.
+| | ...
+| | VPP Show Crypto Device Mapping | ${dut1}
+| | VPP Show Crypto Device Mapping | ${dut2}
+| | Set interfaces in path in 3-node circular topology up
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_mac}= | Get Interface MAC | ${dut2} | ${dut2_if2}
+| | Set Interface State | ${dut1} | ${dut1_if1} | up
+| | Set Interface State | ${dut1} | ${dut1_if2} | up
+| | Set Interface State | ${dut2} | ${dut2_if1} | up
+| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | Set Test Variable | ${tg_if1_mac}
+| | Set Test Variable | ${tg_if2_mac}
+| | Set Test Variable | ${dut1_if1_mac}
+| | Set Test Variable | ${dut1_if2_mac}
+| | Set Test Variable | ${dut2_if1_mac}
+| | Set Test Variable | ${dut2_if2_mac}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
+| | ... | ${dut1_if1_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
+| | ... | ${dut1_if2_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
+| | ... | ${dut2_if1_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
+| | ... | ${dut2_if2_ip4} | 24
+| | Add arp on dut | ${dut1} | ${dut1_if1} | ${tg_if1_ip4} | ${tg_if1_mac}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_if1_ip4} | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_if2_ip4} | ${dut1_if2_mac}
+| | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | ${tg_if1_ip4} | ${dut1_if1}
+| | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | ${tg_if2_ip4} | ${dut2_if2}
+
+| Initialize IPv4 forwarding in 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
@@ -272,7 +315,7 @@
 | | dut2_v4.set_route | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| IPv4 forwarding initialized in a 2-node switched topology
+| Initialize IPv4 forwarding in 2-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular
 | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
@@ -290,7 +333,7 @@
 | | dut1_v4.set_ip | ${dut1_if2} | 20.20.20.2 | 24
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Scale IPv4 forwarding initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | [Documentation]
 | | ... | Custom setup of IPv4 topology with scalability of ip routes on all
 | | ... | DUT nodes in 3-node circular topology
@@ -303,8 +346,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Scale IPv4 forwarding initialized in a 3-node circular topology \
-| | ... | \| 100000 \|
+| | ... | \| Initialize IPv4 forwarding with scaling in 3-node circular \
+| | ... | topology \| 100000 \|
 | | ...
 | | [Arguments] | ${count}
 | | ...
@@ -320,10 +363,10 @@
 | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${dut1_if2_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if2} | 3.3.3.1 | ${tg1_if2_mac}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | 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
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses 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}
 | | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2}
@@ -334,7 +377,7 @@
 | | ... | count=${count}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| IPv4 forwarding with vhost initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | [Documentation]
 | | ... | Create vhost-user interfaces in VPP. Set UP state of all VPP
 | | ... | interfaces in path on nodes in 3-node circular topology. Create 2
@@ -359,14 +402,14 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Set interfaces in path in 3-node circular topology up
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
 | | ${dut2_vif1}= | Set Variable | ${vhost_if1}
 | | ${dut2_vif2}= | Set Variable | ${vhost_if2}
@@ -404,14 +447,14 @@
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif2} | ${fib_table_2}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30
-| | 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.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -453,7 +496,7 @@
 | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 5.5.5.2 | ${dut2_vif2}
 | | ... | vrf=${fib_table_2}
 
-| IPv4 forwarding with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with vhost for '${nr}' VMs in 3-node circular topology
 | | [Documentation]
 | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all
 | | ... | VPP nodes. Set UP state of all VPP interfaces in path. Create ${nr}+1
@@ -480,7 +523,7 @@
 | | ... | \| IPv4 forwarding with Vhost-User for '2' VMs initialized in \
 | | ... | a 3-node circular topology \|
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
+| | Set interfaces in path in 3-node circular topology up
 | | ${fib_table_1}= | Set Variable | ${101}
 | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr}
 | | ${dut1_if1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if1}
@@ -499,10 +542,10 @@
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | 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.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
 | | ${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}
@@ -531,7 +574,7 @@
 | |      | ... | ${ip_base_vif1}.${ip_base_vif1}.${ip_base_vif1}
 | |      | ${ip_net_vif2}= | Set Variable
 | |      | ... | ${ip_base_vif2}.${ip_base_vif2}.${ip_base_vif2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
 | |      | ... | dut1-vhost-${number}-if2
 | |      | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up
@@ -540,7 +583,7 @@
 | |      | ... | ${dut1-vhost-${number}-if1}
 | |      | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | |      | ... | dut2-vhost-${number}-if2
 | |      | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if1} | up
@@ -565,7 +608,7 @@
 | |      | ... | ${fib_table_1}
 | |      | Assign Interface To Fib Table | ${dut2} | ${dut2-vhost-${number}-if2}
 | |      | ... | ${fib_table_2}
-| |      | IP addresses are set on interfaces
+| |      | Configure IP addresses on interfaces
 | |      | ... | ${dut1} | ${dut1-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30
 | |      | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${ip_net_vif2}.1 | 30
 | |      | ... | ${dut2} | ${dut2-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30
@@ -605,7 +648,7 @@
 | |      | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | ${ip_net_vif2}.2
 | |      | ... | ${dut2-vhost-${number}-if2} | vrf=${fib_table_2}
 
-| IPv4 policer 2r3c-${t} initialized in a 3-node circular topology
+| Initialize IPv4 policer 2r3c-${t} in 3-node circular topology
 | | [Documentation]
 | | ... | Setup of 2r3c color-aware or color-blind policer with dst ip match
 | | ... | on all DUT nodes in 3-node circular topology. Policer is applied on
@@ -635,7 +678,7 @@
 | | Policer Classify Set Match IP | 10.10.10.2 | ${False}
 | | Policer Set Configuration
 
-| IPv6 forwarding initialized in a 3-node circular topology
+| Initialize IPv6 forwarding in 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology. Get the interface MAC addresses and setup neighbour on all
@@ -652,7 +695,7 @@
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | 2001:3::1 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | 2001:2::1 | ${prefix}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${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_if2} | 2001:3::2 | ${dut2_if1_mac}
@@ -660,7 +703,7 @@
 | | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2}
 | | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1}
 
-| Scale IPv6 forwarding initialized in a 3-node circular topology
+| Initialize IPv6 forwarding with scaling in 3-node circular topology
 | | [Documentation]
 | | ... | Custom setup of IPv6 topology with scalability of ip routes on all
 | | ... | DUT nodes in 3-node circular topology
@@ -673,8 +716,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Scale IPv6 forwarding initialized in a 3-node circular topology \
-| | ... | \| 100000 \|
+| | ... | \| Initialize IPv6 forwarding with scaling in 3-node circular \
+| | ... | topology \| 100000 \|
 | | ...
 | | [Arguments] | ${count}
 | | ...
@@ -688,7 +731,7 @@
 | | ${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 nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:3::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:4::2 | ${dut2_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac}
@@ -702,7 +745,7 @@
 | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
 | | ... | interface=${dut2_if2} | count=${count}
 
-| IPv6 iAcl whitelist initialized in a 3-node circular topology
+| Initialize IPv6 iAcl whitelist in 3-node circular topology
 | | [Documentation]
 | | ... | Creates classify L3 table on DUTs. IPv6 iAcl security whitelist
 | | ... | ingress /64 filter entries applied on links TG - DUT1 and DUT2 - TG.
@@ -722,16 +765,16 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx}
 
-| L2 xconnect initialized in a 3-node circular topology
+| Initialize L2 xconnect in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology by cross connecting two interfaces on
 | | ... | each DUT. Interfaces are brought up.
 | | ... |
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology with VXLANoIPv4 by cross connecting
 | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
@@ -739,21 +782,21 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | 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
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses 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
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 
-| L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| Initialize L2 xconnect with Vhost-User in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface.
@@ -769,17 +812,59 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut1} | ${dut1_if2} | ${vhost_if2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | Configure L2XC | ${dut2} | ${dut2_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology
+| Initialize L2 xconnect with Vhost-User for '${nr}' in 3-node circular topology
+| | [Documentation]
+| | ... | Create pairs of Vhost-User interfaces on all defined VPP nodes. Cross
+| | ... | connect each Vhost interface with one physical interface or virtual
+| | ... | interface to create a chain accross DUT node.
+| | ...
+| | ... | *Arguments:*
+| | ... | _None_
+| | ...
+| | ... | *Note:*
+| | ... | Socket paths for VM are defined in following format:
+| | ... | - /tmp/sock-${VM_ID}-1
+| | ... | - /tmp/sock-${VM_ID}-2
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 xconnect with Vhost-User for '2' initialized in a 3-node \
+| | ... | circular topology \|
+| | ...
+| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
+| |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
+| |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
+| |      | ${prev_index}= | Evaluate | ${number}-1
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
+| |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
+| |      | ... | dut1-vhost-${number}-if2
+| |      | ${dut1_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut1_if1}
+| |      | ... | ${dut1-vhost-${prev_index}-if2}
+| |      | Configure L2XC | ${dut1} | ${dut1_xconnect_if1}
+| |      | ... | ${dut1-vhost-${number}-if1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
+| |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
+| |      | ... | dut2-vhost-${number}-if2
+| |      | ${dut2_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut2_if1}
+| |      | ... | ${dut2-vhost-${prev_index}-if2}
+| |      | Configure L2XC | ${dut2} | ${dut2_xconnect_if1}
+| |      | ... | ${dut2-vhost-${number}-if1}
+| |      | Run Keyword If | ${number}==${nr} | Configure L2XC
+| |      | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${dut1_if2}
+| |      | Run Keyword If | ${number}==${nr} | Configure L2XC
+| |      | ... | ${dut2} | ${dut2-vhost-${number}-if2} | ${dut2_if2}
+
+| Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface.
@@ -798,33 +883,33 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | Set interfaces in path in 3-node circular topology up
+| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | L2 tag rewrite method setup on interfaces
+| | Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut1} | ${subif_index_1} | ${vhost_if2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut2} | ${subif_index_2} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domain initialized in a 3-node circular topology
+| Initialize L2 bridge domain in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 DB topology by adding two interfaces on each DUT into BD
 | | ... | that is created automatically with index 1. Learning is enabled.
 | | ... | Interfaces are brought up.
 | | ...
-| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure L2BD forwarding | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -843,21 +928,21 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${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}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User for '${nr}' VMs in 3-node circular topology
 | | [Documentation]
 | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all
 | | ... | defined VPP nodes. Add each Vhost-User interface into L2 bridge
@@ -878,30 +963,30 @@
 | | ... | a 3-node circular topology \|
 | | ...
 | | ${bd_id2}= | Evaluate | ${nr}+1
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${1}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${1}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${1}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
 | |      | ... | dut1-vhost-${number}-if2
 | |      | ${bd_id2}= | Evaluate | ${number}+1
-| |      | Interface is added to bridge domain | ${dut1}
+| |      | Add interface to bridge domain | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if1} | ${number}
-| |      | Interface is added to bridge domain | ${dut1}
+| |      | Add interface to bridge domain | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if2} | ${bd_id2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | |      | ... | dut2-vhost-${number}-if2
-| |      | Interface is added to bridge domain | ${dut2}
+| |      | Add interface to bridge domain | ${dut2}
 | |      | ... | ${dut2-vhost-${number}-if1} | ${number}
-| |      | Interface is added to bridge domain | ${dut2}
+| |      | Add interface to bridge domain | ${dut2}
 | |      | ... | ${dut2-vhost-${number}-if2} | ${bd_id2}
 
-| L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 bridge domain topology with VXLANoIPv4 by connecting
 | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
@@ -909,9 +994,9 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | 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
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses 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}
@@ -920,11 +1005,11 @@
 | | ... | 172.16.0.1 | 172.16.0.2
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
-| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | Configure L2BD forwarding | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -947,28 +1032,28 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | 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
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
 | | ... | 172.16.0.1 | 172.16.0.2
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User initialized in a 2-node circular topology
+| Initialize L2 bridge domains with Vhost-User in 2-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -987,15 +1072,15 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -1019,27 +1104,27 @@
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
 | | ... | ${tag_rewrite}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | Set interfaces in path in 3-node circular topology up
+| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | L2 tag rewrite method setup on interfaces
+| | Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${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} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| 2-node Performance Suite Setup with DUT's NIC model
+| Set up 2-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1057,13 +1142,12 @@
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
 | | Show vpp version on all DUTs
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
-| | Setup 2-node startup configuration of VPP on all DUTs
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 
-| 2-node-switched Performance Suite Setup with DUT's NIC model
+| Set up 2-node-switched performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1085,14 +1169,13 @@
 | | ... | ${tg_if2_dest_mac}
 | | ...
 | | Show vpp version on all DUTs
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
-| | Setup 2-node startup configuration of VPP on all DUTs
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 | | ... | ${tg_if1_dest_mac} | ${tg_if2_dest_mac}
 
-| 3-node Performance Suite Setup with DUT's NIC model
+| Set up 3-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1105,24 +1188,24 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
+| | ... | \| Set up 3-node performance topology with DUT's NIC model \| L2 \
+| | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
 | | Show vpp version on all DUTs
-| | 3-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 3-node circular topology with DUT interface model
 | | ... | ${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}
 
-| 3-node Performance Suite Teardown
+| Tear down 3-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ...
 | | Teardown traffic generator | ${tg}
 
-| 2-node Performance Suite Teardown
+| Tear down 2-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ...
@@ -1494,7 +1577,7 @@
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
 | | ...
 | | Return From Keyword If | ${rate} <= 10000 | ${-1}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is 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
@@ -1524,7 +1607,7 @@
 | | ...
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ... | ${rate} | ${framesize} | ${topology_type}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is 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
@@ -1555,7 +1638,7 @@
 | | ...
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ... | ${rate} | ${framesize} | ${topology_type}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is 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
@@ -1584,26 +1667,26 @@
 | | ...
 | | Send traffic on tg | -1 | ${rate} | ${framesize} | ${topology_type}
 | | ... | warmup_time=0 | async_call=${True} | latency=${False}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is DPDK performance test
 | | Run Keyword If | ${ret}==${FALSE} | Clear runtime counters on all DUTs
 | | Sleep | ${duration}
 | | Run Keyword If | ${ret}==${FALSE} | Show runtime counters on all DUTs
 | | Stop traffic on tg
 
-| Add PCI devices to DUTs from 3-node single link topology
+| Add PCI devices to DUTs in 3-node single link topology
 | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
 | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
 | | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci}
-| | Add PCI device | ${dut2} | ${dut2_if1_pci} | ${dut2_if2_pci}
+| | Run keyword | DUT1.Add DPDK Dev | ${dut1_if1_pci} | ${dut1_if2_pci}
+| | Run keyword | DUT2.Add DPDK Dev | ${dut2_if1_pci} | ${dut2_if2_pci}
 
-| Add PCI devices to DUTs from 2-node single link topology
+| Add PCI devices to DUTs in 2-node single link topology
 | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
 | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci}
+| | Run keyword | DUT1.Add DPDK Dev | ${dut1_if1_pci} | ${dut1_if2_pci}
 
-| Guest VM with dpdk-testpmd connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1624,10 +1707,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
-| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \
 | | ... | \| qemu_id=${2} \|
 | | ...
@@ -1647,18 +1730,20 @@
 | | ... | skip_cnt=${skip_cnt} | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
+| | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| '${nr}' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| Configure '${nr}' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology
 | | [Documentation]
 | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd for defined number of VMs on all defined VPP nodes.
@@ -1673,23 +1758,23 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| '2' Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| '2' Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | in a 3-node circular topology \|
 | | ...
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
 | |      | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
-| |      | ${vm1}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| |      | ${vm1}= | Configure guest VM with dpdk-testpmd connected via vhost-user
 | |      | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number}
 | |      | ...     | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1}
-| |      | ${vm2}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| |      | ${vm2}= | Configure guest VM with dpdk-testpmd connected via vhost-user
 | |      | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number}
 | |      | ...     | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2}
 
-| Guest VM with dpdk-testpmd using SMT connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1722,18 +1807,20 @@
 | | ... | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
+| | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1768,7 +1855,7 @@
 | | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${6} | ${count}=${5}
 | | ... | ${qemu_id}=${1}
 | | ...
-| | Import Library | resources.libraries.python.QemuUtils
+| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
 | | ... | WITH NAME | ${vm_name}
 | | ${serial_port}= | Evaluate | ${qemu_id} + ${4555}
 | | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port}
@@ -1781,19 +1868,21 @@
 | | ... | skip_cnt=${skip_cnt} | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
+| | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| '${nr}' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| Configure '${nr}' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology
 | | [Documentation]
 | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd with fwd mode set to mac rewrite for defined number of
@@ -1816,20 +1905,20 @@
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
 | |      | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
-| |      | ${vm1}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| |      | ${vm1}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | |      | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number}
 | |      | ... | ${dut1-vhost-${number}-if1_mac}
 | |      | ... | ${dut1-vhost-${number}-if2_mac} | skip=${skip_cpus}
 | |      | ... | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1}
-| |      | ${vm2}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| |      | ${vm2}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | |      | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number}
 | |      | ... | ${dut2-vhost-${number}-if1_mac}
 | |      | ... | ${dut2-vhost-${number}-if2_mac} | skip=${skip_cpus}
 | |      | ... | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2}
 
-| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd-mac using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1849,8 +1938,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user \
-| | ... | is setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
+| | ... | \| Configure guest VM with dpdk-testpmd-mac using SMT connected via \
+| | ... | vhost-user \| ${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}
@@ -1864,19 +1953,21 @@
 | | ... | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
+| | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| Guest VM with Linux Bridge connected via vhost-user is setup
+| Configure guest VM with linux bridge connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | linux bridge. Qemu Guest uses 2048M.
@@ -1891,7 +1982,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with Linux Bridge connected via vhost-user is setup \
+| | ... | \| Configure guest VM with linux bridge connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
 | | ...
@@ -1906,13 +1997,14 @@
 | | ... | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
@@ -1922,7 +2014,7 @@
 | | 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
+| Configure guest VM with linux bridge using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | linux bridge. Qemu Guest uses 2048M.
@@ -1952,13 +2044,14 @@
 | | ... | 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}.Build QEMU | ${dut_node} | apply_patch=${True}
+| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin}
 | | 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 | ${perf_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}
@@ -1968,7 +2061,7 @@
 | | Set Interface State | ${vm} | ${br} | up | if_type=name
 | | Return From Keyword | ${vm}
 
-| Guest VM with dpdk-testpmd Teardown
+| Tear down guest VM with dpdk-testpmd
 | | [Documentation]
 | | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}.
 | | ... | Argument is dictionary of all qemu nodes running with its names.
@@ -1980,7 +2073,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd Teardown \| ${node['DUT1']} \
+| | ... | \| Tear down guest VM with dpdk-testpmd \| ${node['DUT1']} \
 | | ... | \| ${dut_vm_refs} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${dut_vm_refs}
@@ -1992,9 +2085,9 @@
 | | | Dpdk Testpmd Stop | ${vm}
 | | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node}
 | | | Run Keyword | ${vm_name}.Qemu Clear Socks
-| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill
+| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
 
-| Guest VM Teardown
+| Tear down guest VM
 | | [Documentation]
 | | ... | Stop all qemu processes running on ${dut_node}.
 | | ... | Argument is dictionary of all qemu nodes running with its names.
@@ -2005,7 +2098,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM Teardown \| ${node['DUT1']} \
+| | ... | \| Tear down guest VM \| ${node['DUT1']} \
 | | ... | \| ${dut_vm_refs} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${dut_vm_refs}
@@ -2016,9 +2109,9 @@
 | | | ${index}= | Evaluate | ${index} + 1
 | | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node}
 | | | Run Keyword | ${vm_name}.Qemu Clear Socks
-| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill
+| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
 
-| Lisp IPv4 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv4 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \
 | | ... | Don`t set route.
 | | ...
@@ -2033,7 +2126,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv4 forwarding initialized in a 3-node circular topology \
+| | ... | \| Initialize LISP IPv4 forwarding in 3-node circular topology \
 | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
@@ -2048,17 +2141,57 @@
 | | ${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}
-| | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
-| | dut1_v4.set_arp | ${dut1_if2} | ${dut2_dut1_address} | ${dut2_if1_mac}
-| | dut2_v4.set_arp | ${dut2_if1} | ${dut1_dut2_address} | ${dut1_if2_mac}
-| | dut2_v4.set_arp | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
-| | dut1_v4.set_ip | ${dut1_if1} | ${dut1_tg_address} | ${duts_prefix}
-| | dut1_v4.set_ip | ${dut1_if2} | ${dut1_dut2_address} | ${duts_prefix}
-| | dut2_v4.set_ip | ${dut2_if1} | ${dut2_dut1_address} | ${duts_prefix}
-| | dut2_v4.set_ip | ${dut2_if2} | ${dut2_tg_address} | ${duts_prefix}
+| | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_dut1_address}
+| | ... | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_address}
+| | ... | ${dut1_if2_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
+| | ... | ${dut1_tg_address} | ${duts_prefix}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
+| | ... | ${dut1_dut2_address} | ${duts_prefix}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
+| | ... | ${dut2_dut1_address} | ${duts_prefix}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
+| | ... | ${dut2_tg_address} | ${duts_prefix}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Lisp IPv6 forwarding initialized in a 3-node circular topology
+| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
+| | [Documentation] | Setup Lisp GPE IPv4 forwarding over IPsec.
+| | ...
+| | ... | *Arguments:*
+| | ... | -${encr_alg} - Encryption algorithm. Type: string
+| | ... | -${auth_alg} - Authentication algorithm. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology\
+| | ... | \| ${encr_alg} \| ${auth_alg}
+| | ...
+| | [Arguments] | ${encr_alg} | ${auth_alg}
+| | ...
+| | Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | Initialize LISP IPv4 forwarding in 3-node circular topology
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | Configure LISP GPE topology in 3-node circular topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Configure manual keyed connection for IPSec
+| | ... | ${dut1} | ${dut1_if2} | ${encr_alg} | ${encr_key}
+| | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi}
+| | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4}
+| | Configure manual keyed connection for IPSec
+| | ... | ${dut2} | ${dut2_if1} | ${encr_alg} | ${encr_key}
+| | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi}
+| | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4}
+
+| Initialize LISP IPv6 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2073,7 +2206,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv6 forwarding initialized in a 3-node circular topology \
+| | ... | \| Initialize LISP IPv6 forwarding in 3-node circular topology \
 | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
@@ -2092,7 +2225,7 @@
 | | ... | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_address}
 | | ... | ${prefix}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${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_if2} | ${dut2_dut1_address}
@@ -2100,7 +2233,7 @@
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_address}
 | | ... | ${dut1_if2_mac}
 
-| Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2135,21 +2268,23 @@
 | | ${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}
-| | dut1_v4.set_ip | ${dut1_if1} | ${dut1_tg_ip4_address} | ${prefix4}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
+| | ... | ${dut1_tg_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | ${dut1_dut2_ip6_address}
 | | ... | ${prefix6}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | ${dut2_dut1_ip6_address}
 | | ... | ${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}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
+| | ... | ${dut2_tg_ip4_address} | ${prefix4}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
+| | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip6_address}
 | | ... | ${dut2_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip6_address}
 | | ... | ${dut1_if2_mac}
 
-| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2186,17 +2321,58 @@
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | ${dut1_tg_ip6_address}
 | | ... | ${prefix6}
-| | dut1_v4.set_ip | ${dut1_if2} | ${dut1_dut2_ip4_address} | ${prefix4}
-| | dut2_v4.set_ip | ${dut2_if1} | ${dut2_dut1_ip4_address} | ${prefix4}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
+| | ... | ${dut1_dut2_ip4_address} | ${prefix4}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
+| | ... | ${dut2_dut1_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_ip6_address}
 | | ... | ${prefix6}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${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}
-| | dut1_v4.set_arp | ${dut1_if2} | ${dut2_dut1_ip4_address} | ${dut2_if1_mac}
-| | dut2_v4.set_arp | ${dut2_if1} | ${dut1_dut2_ip4_address} | ${dut1_if2_mac}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip4_address}
+| | ... | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip4_address}
+| | ... | ${dut1_if2_mac}
+
+| Initialize SNAT in 3-node circular topology
+| | [Documentation] | Initialization of 3-node topology with SNAT between DUTs:
+| | ... | - set interfaces up
+| | ... | - set IP addresses
+| | ... | - set ARP
+| | ... | - create routes
+| | ... | - set SNAT - only on DUT1
+| | ...
+| | Set Interface State | ${dut1} | ${dut1_if1} | up
+| | Set Interface State | ${dut1} | ${dut1_if2} | up
+| | Set Interface State | ${dut2} | ${dut2_if1} | up
+| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | All Vpp Interfaces Ready Wait | ${nodes}
+| | ...
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 11.0.0.1 | 20
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 11.0.0.2 | 20
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 12.0.0.1 | 20
+| | ...
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_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}
+| | ...
+| | Add arp on dut | ${dut1} | ${dut1_if1} | 10.0.0.2 | ${tg_if1_mac}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | 11.0.0.2 | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | 11.0.0.1 | ${dut1_if2_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if2} | 12.0.0.2 | ${tg_if2_mac}
+| | ...
+| | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | 11.0.0.2 | ${dut1_if2}
+| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | 10.0.0.2 | ${dut1_if1}
+| | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | 12.0.0.2 | ${dut2_if2}
+| | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | 11.0.0.1 | ${dut2_if1}
+| | ...
+| | Configure inside and outside interfaces | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure deterministic mode for SNAT | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30
 
-| DPDK 2-node Performance Suite Setup with DUT's NIC model
+| Set up DPDK 2-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Updates interfaces on all nodes and setup global
 | | ... | variables used in test cases based on interface model provided as an
@@ -2209,18 +2385,18 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| DPDK 2-node Performance Suite Setup with DUT's NIC model \
+| | ... | \| Set up DPDK 2-node performance topology with DUT's NIC model \
 | | ... | \| L2 \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${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
+| Set up DPDK 3-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Updates interfaces on all nodes and setup global
 | | ... | variables used in test cases based on interface model provided as an
@@ -2237,14 +2413,14 @@
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | 3-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 3-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type}
 | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Initialize DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
-| DPDK 3-node Performance Suite Teardown
+| Tear down DPDK 3-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ... | Cleanup DPDK test environment.
@@ -2253,7 +2429,7 @@
 | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Cleanup DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
-| DPDK 2-node Performance Suite Teardown
+| Tear down DPDK 2-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ... | Cleanup DPDK test environment.
@@ -2261,7 +2437,7 @@
 | | Teardown traffic generator | ${tg}
 | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
-| For DPDK Performance Test
+| Is DPDK performance test
 | | [Documentation]
 | | ... | Return TRUE if variable DPDK_TEST exist, otherwise FALSE.
 | | ${ret} | ${tmp}= | Run Keyword And Ignore Error
@@ -2269,13 +2445,13 @@
 | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
 | | Return From Keyword | ${FALSE}
 
-| Performance test setup
+| Set up performance test
 | | [Documentation] | Common test setup for performance tests.
 | | ...
-| | Setup all DUTs before test
 | | Reset VAT History On All DUTs | ${nodes}
+| | Create base startup configuration of VPP on all DUTs
 
-| Performance test teardown
+| Tear down performance discovery test
 | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
 | | ... | tests.
 | | ...
@@ -2286,7 +2462,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Performance test teardown \| 4.0mpps \| 64 \| 3-node-IPv4 \|
+| | ... | \| Tear down performance discovery test \| 4.0mpps \| 64 \
+| | ... | \| 3-node-IPv4 \|
 | | ...
 | | [Arguments] | ${rate} | ${framesize} | ${topology_type}
 | | ...
@@ -2295,16 +2472,20 @@
 | | Run Keyword If Test Failed
 | | ... | Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
 | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
-| | Remove startup configuration of VPP from all DUTs
 
-| Performance ndrchk test teardown
+| Tear down performance ndrchk test
 | | [Documentation] | Common test teardown for ndrchk performance tests.
 | | ...
 | | Show VAT History On All DUTs | ${nodes}
 | | Show statistics on all DUTs
-| | Remove startup configuration of VPP from all DUTs
 
-| Performance test with vhost and VM with dpdk-testpmd teardown
+| Performance pdrchk test teardown
+| | [Documentation] | Common test teardown for pdrchk performance tests.
+| | ...
+| | Show VAT History On All DUTs | ${nodes}
+| | Show statistics on all DUTs
+
+| Tear down performance test with vhost and VM with dpdk-testpmd
 | | [Documentation] | Common test teardown for performance tests which use
 | | ... | vhost(s) and VM(s) with dpdk-testpmd.
 | | ...
@@ -2319,7 +2500,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Performance test with vhost and VM with dpdk-testpmd teardown \
+| | ... | \| Tear down performance test with vhost and VM with dpdk-testpmd \
 | | ... | \| 4.0mpps \| 64 \| 3-node-IPv4 \| ${node['DUT1']} \| ${dut_vm_refs} \
 | | ... | \| ${node['DUT2']} \| ${dut_vm_refs} \|
 | | ...
@@ -2328,13 +2509,12 @@
 | | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
 | | ...
 | | Show VAT History On All DUTs | ${nodes}
-| | Show Vpp Vhost On All DUTs
+| | Show VPP vhost on all DUTs
 | | Show statistics on all DUTs
 | | Run Keyword If Test Failed
 | | ... | Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
 | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
-| | Remove startup configuration of VPP from all DUTs
 | | Run keyword unless | ${dut1_node}==${None}
-| | ... | Guest VM with dpdk-testpmd Teardown | ${dut1} | ${dut1_vm_refs}
+| | ... | Tear down guest VM with dpdk-testpmd | ${dut1} | ${dut1_vm_refs}
 | | Run keyword unless | ${dut2_node}==${None}
-| | ... | Guest VM with dpdk-testpmd Teardown | ${dut2} | ${dut2_vm_refs}
+| | ... | Tear down guest VM with dpdk-testpmd | ${dut2} | ${dut2_vm_refs}