X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=2e2eb84e2f274968db5a56a704353e9141f0352c;hp=231004700c1a92154d9eac0ad289600b7fa366a4;hb=cdf557ef070d004617ede4fc5a47dd6064d1c946;hpb=974d52d1976f802c99738712bbfe56e16d56d650

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 231004700c..2e2eb84e2f 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -38,26 +38,22 @@
 | Documentation | Performance suite keywords - configuration.
 
 *** Keywords ***
-| Set interfaces in path in 2-node circular topology up
+| Set interfaces in path up
 | | [Documentation]
-| | ... | *Set UP state on VPP interfaces in path on nodes in 2-node circular
-| | ... | topology.*
+| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set
+| | ... | maximal MTU.*
 | | ...
-| | Set Interface State | ${dut1} | ${dut1_if1} | up
-| | Set Interface State | ${dut1} | ${dut1_if2} | up
-| | Vpp Node Interfaces Ready Wait | ${dut1}
-
-| 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.*
-| | ...
-| | 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
-| | Vpp Node Interfaces Ready Wait | ${dut1}
-| | Vpp Node Interfaces Ready Wait | ${dut2}
+# TODO: Rework KW to set all interfaces in path UP and set MTU (including
+# software interfaces. Run KW at the end phase of VPP setup to split
+# from other "functial" configuration. This will allow modularity of this
+# library
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up
+| | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1}
+| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up
+| | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2}
+| | | VPP Node Interfaces Ready Wait | ${nodes['${dut}']}
 
 | Initialize IPSec in 3-node circular topology
 | | [Documentation]
@@ -68,6 +64,7 @@
 | | ... | with prefix /8 and next hop of neighbour DUT or TG interface IPv4
 | | ... | address.
 | | ...
+| | Set interfaces in path up
 | | VPP Show Crypto Device Mapping | ${dut1}
 | | VPP Show Crypto Device Mapping | ${dut2}
 | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
@@ -104,8 +101,7 @@
 | | ... | interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG links and
 | | ... | /30 prefix on DUT1 link.
 | | ...
-| | Set Interface State | ${dut1} | ${dut1_if1} | up
-| | Set Interface State | ${dut1} | ${dut1_if2} | up
+| | Set interfaces in path up
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
@@ -114,7 +110,6 @@
 | | ... | 10.10.10.1 | 24
 | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
 | | ... | 20.20.20.1 | 24
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv4 forwarding in 3-node circular topology
 | | [Documentation]
@@ -124,10 +119,7 @@
 | | ... | /30 prefix on DUT1-DUT2 link. Set routing on both DUT nodes with
 | | ... | prefix /24 and next hop of neighbour DUT interface IPv4 address.
 | | ...
-| | 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 interfaces in path up
 | | ${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}
@@ -146,7 +138,6 @@
 | | ... | 20.20.20.1 | 24
 | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2}
 | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | [Documentation]
@@ -166,10 +157,7 @@
 | | ...
 | | [Arguments] | ${count}
 | | ...
-| | 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 interfaces in path up
 | | ${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}
@@ -190,7 +178,6 @@
 | | ... | count=${count}
 | | Vpp Route Add | ${dut2} | 20.0.0.0 | 32 | 3.3.3.1 | ${dut2_if2}
 | | ... | count=${count}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | [Documentation]
@@ -225,7 +212,7 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2} | dut1_vhost_if1 | dut1_vhost_if2
 | | ${dut1_vif1}= | Set Variable | ${dut1_vhost_if1}
@@ -350,7 +337,7 @@
 | | ... | \| IPv4 forwarding with Vhost-User for '2' VMs initialized in \
 | | ... | a 3-node circular topology \|
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | ${fib_table_1}= | Set Variable | ${101}
 | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr}
 | | Add Fib Table | ${dut1} | ${fib_table_1}
@@ -520,6 +507,7 @@
 | | ... | VPP interfaces. Setup IPv6 addresses with /128 prefixes on all
 | | ... | interfaces.
 | | ...
+| | Set interfaces in path up
 | | ${prefix}= | Set Variable | 64
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -528,7 +516,6 @@
 | | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:2::2 | ${tg1_if2_mac}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv6 forwarding in 3-node circular topology
 | | [Documentation]
@@ -538,6 +525,7 @@
 | | ... | interfaces. Set routing on both DUT nodes with prefix /64 and
 | | ... | next hop of neighbour DUT interface IPv6 address.
 | | ...
+| | Set interfaces in path up
 | | ${prefix}= | Set Variable | 64
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -554,7 +542,6 @@
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac}
 | | 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}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv6 forwarding with scaling in 3-node circular topology
 | | [Documentation]
@@ -574,6 +561,7 @@
 | | ...
 | | [Arguments] | ${count}
 | | ...
+| | Set interfaces in path up
 | | ${subn_prefix}= | Set Variable | 64
 | | ${host_prefix}= | Set Variable | 128
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | 2001:3::1 | ${subn_prefix}
@@ -597,7 +585,6 @@
 | | ... | interface=${dut2_if1} | count=${count}
 | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
 | | ... | interface=${dut2_if2} | count=${count}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize IPv6 iAcl whitelist in 3-node circular topology
 | | [Documentation]
@@ -696,6 +683,7 @@
 | | Run Keyword If | "${n}" == "2" and "${prepos}" == "without"
 | | ... | Vpp Route Add | ${dut1} | ${dut1_sid2_2} | ${sid_prefix}
 | | ... | ${tg_if1_ip6_subnet}2 | ${dut1_if1}
+| | Set interfaces in path up
 
 | Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via '${behavior}' behaviour in 3-node circular topology
 | | [Documentation]
@@ -719,9 +707,13 @@
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1}
 | | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq_count_int}
 | | ... | ${rxq_count_int}
+| | VPP Set interface MTU | ${dut1} | ${dut1-memif-1-if1}
+| | VPP Set interface MTU | ${dut1} | ${dut1-memif-1-if2}
 | | Set up memif interfaces on DUT node | ${dut2} | ${sock2} | ${sock2}
 | | ... | ${1} | dut2-memif-1-if1 | dut2-memif-1-if2 | ${rxq_count_int}
 | | ... | ${rxq_count_int}
+| | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if1}
+| | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if2}
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | Show Memif | ${nodes['${dut}']}
@@ -804,7 +796,7 @@
 | | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2} | end.am
 | | ... | next_hop=${dut1_nh} | out_if=${dut1_out_if} | in_if=${dut1_in_if}
 | | ... | ELSE | Fail | Unsupported behaviour: ${behavior}
-| | All Vpp Interfaces Ready Wait | ${nodes}
+| | Set interfaces in path up
 
 | Initialize L2 patch
 | | [Documentation]
@@ -814,24 +806,24 @@
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | Configure L2patch | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
+| | Set interfaces in path up
 
 | Initialize L2 xconnect in 2-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology by cross connecting two interfaces on
 | | ... | each DUT. Interfaces are brought up.
 | | ...
+| | Set interfaces in path up
 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | 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.
 | | ... |
+| | Set interfaces in path up
 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
@@ -841,7 +833,7 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | interfaces.
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path 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}
@@ -949,7 +941,7 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | Configure L2 tag rewrite method on interfaces
@@ -985,9 +977,12 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
+| | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology
 | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1}
 | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1}
 | | ... | ${subid}
@@ -1029,15 +1024,17 @@
 | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode}
 | | ... | ${lb_mode}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode}
 | | ... | ${lb_mode}
 | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2}
 | | ... | ${dut1_eth_bond_if1}
 | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | ${dut2} | ${bond_mode}
 | | ... | ${lb_mode}
 | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1}
 | | ... | ${dut2_eth_bond_if1}
 | | VPP Show Bond Data On All Nodes | ${nodes} | details=${TRUE}
@@ -1071,9 +1068,9 @@
 | | ...
 | | [Arguments] | ${bd_id}=${1}
 | | ...
+| | Set interfaces in path up
 | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id}
 | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domain in 3-node circular topology
 | | [Documentation]
@@ -1090,11 +1087,11 @@
 | | ...
 | | [Arguments] | ${bd_id}=${1}
 | | ...
+| | Set interfaces in path up
 | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id}
 | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Configure IPv4 ACLs
 | | [Documentation]
@@ -1214,9 +1211,9 @@
 | | ... | - ${dut2_if1} - DUT2 interface towards DUT1.
 | | ... | - ${dut2_if2} - DUT2 interface towards TG.
 | | ...
+| | Set interfaces in path up
 | | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 | | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
 | Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
@@ -1244,10 +1241,7 @@
 | | ... | - ${dut2_if1} - DUT2 interface towards DUT1.
 | | ... | - ${dut2_if2} - DUT2 interface towards TG.
 | | ...
-| | 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 interfaces in path up
 | | ${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}
@@ -1266,7 +1260,6 @@
 | | ... | ${dut2} | ${dut2_if2} | 20.20.20.1 | 24
 | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2}
 | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 | | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
 | Configure MACIP ACLs
@@ -1385,9 +1378,9 @@
 | | ... | - ${dut2_if1} - DUT2 interface towards DUT1.
 | | ... | - ${dut2_if2} - DUT2 interface towards TG.
 | | ...
+| | Set interfaces in path up
 | | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 | | Configure MACIP ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
 | Initialize L2 bridge domains with Vhost-User in 3-node circular topology
@@ -1482,7 +1475,7 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | interfaces.
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path 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
@@ -1497,7 +1490,6 @@
 | | ... | 172.16.0.2 | 172.16.0.1
 | | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
 | | Configure L2BD forwarding | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
@@ -1522,11 +1514,11 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | 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
+| | Set interfaces in path up
 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
 | | ... | 172.16.0.1 | 172.16.0.2
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
@@ -1585,6 +1577,7 @@
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | ${dut1_route_subnet} |
 | | ... | ${dut1_route_mask} | ${dut2_route_subnet} | ${dut2_route_mask}
 | | ...
+| | Set interfaces in path up
 | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} |
 | | ... | ${dut1_address} | ${dut1_address_subnet}
 | | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} |
@@ -1664,7 +1657,7 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | Configure L2 tag rewrite method on interfaces
@@ -1674,7 +1667,6 @@
 | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id1}
 | | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology
 | | [Documentation]
@@ -1700,7 +1692,7 @@
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
 | | ... | ${tag_rewrite}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | Configure L2 tag rewrite method on interfaces
@@ -1745,9 +1737,12 @@
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
 | | ... | ${tag_rewrite}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
+| | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology
 | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1}
 | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1}
 | | ... | ${subid}
@@ -1797,15 +1792,17 @@
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | ...
-| | Set interfaces in path in 3-node circular topology up
+| | Set interfaces in path up
 | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode}
 | | ... | ${lb_mode}
 | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2}
 | | ... | ${dut1_eth_bond_if1}
 | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | ${dut2} | ${bond_mode}
 | | ... | ${lb_mode}
 | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up
+| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1}
 | | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1}
 | | ... | ${dut2_eth_bond_if1}
 | | VPP Show Bond Data On All Nodes | ${nodes} | details=${TRUE}
@@ -2351,10 +2348,7 @@
 | | [Arguments] | ${dut1_dut2_address} | ${dut1_tg_address}
 | | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${duts_prefix}
 | | ...
-| | Set Interface State | ${dut1} | ${dut1_if1} | up
-| | Set Interface State | ${dut1} | ${dut1_if2} | up
-| | Set Interface State | ${dut2} | ${dut2_if1} | up
-| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | Set interfaces in path up
 | | ${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}
@@ -2373,7 +2367,6 @@
 | | ... | ${dut2_dut1_address} | ${duts_prefix}
 | | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
 | | ... | ${dut2_tg_address} | ${duts_prefix}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | [Documentation] | Setup Lisp GPE IPv4 forwarding over IPsec.
@@ -2408,7 +2401,6 @@
 | | ... | ${dut2} | ${dut2_if1} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi}
 | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4}
-| | Set interfaces in path in 3-node circular topology up
 
 | Initialize LISP IPv6 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv6 topology on all DUT nodes \
@@ -2432,6 +2424,7 @@
 | | [Arguments] | ${dut1_dut2_address} | ${dut1_tg_address}
 | | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${prefix}
 | | ...
+| | Set interfaces in path up
 | | ${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}
@@ -2479,10 +2472,7 @@
 | | ... | ${dut2_dut1_ip6_address} | ${dut2_tg_ip4_address}
 | | ... | ${prefix4} | ${prefix6}
 | | ...
-| | Set Interface State | ${dut1} | ${dut1_if1} | up
-| | Set Interface State | ${dut1} | ${dut1_if2} | up
-| | Set Interface State | ${dut2} | ${dut2_if1} | up
-| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | Set interfaces in path up
 | | ${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}
@@ -2530,10 +2520,7 @@
 | | ... | ${dut2_dut1_ip4_address} | ${dut2_tg_ip6_address}
 | | ... | ${prefix6} | ${prefix4}
 | | ...
-| | Set Interface State | ${dut1} | ${dut1_if1} | up
-| | Set Interface State | ${dut1} | ${dut1_if2} | up
-| | Set Interface State | ${dut2} | ${dut2_if1} | up
-| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | Set interfaces in path up
 | | ${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}
@@ -2562,11 +2549,7 @@
 | | ... | - create routes
 | | ... | - set NAT44 - 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}
+| | Set interfaces in path up
 | | ...
 | | 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
@@ -2614,10 +2597,6 @@
 | | ... | \| Initialize L2 xconnect for 1 memif pairs in 3-node circular \
 | | ... | topology \|
 | | ...
-| | 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
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
 | | | ${sock1}= | Set Variable | memif-DUT1_VNF
 | | | ${sock2}= | Set Variable | memif-DUT1_VNF
@@ -2642,7 +2621,7 @@
 | | | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2}
 | | | Run Keyword If | ${number}==${nr} | Configure L2XC
 | | | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
+| | Set interfaces in path up
 | | Show Memif on all DUTs | ${nodes}
 
 | Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology
@@ -2688,7 +2667,7 @@
 | | | ... | ${dut2-memif-${number}-if1} | ${number}
 | | | Add interface to bridge domain | ${dut2}
 | | | ... | ${dut2-memif-${number}-if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
+| | Set interfaces in path up
 | | Show Memif on all DUTs | ${nodes}
 
 | Initialize L2 xconnect for single memif in 3-node circular topology