diff options
49 files changed, 134 insertions, 139 deletions
diff --git a/resources/libraries/python/IPv6Setup.py b/resources/libraries/python/IPv6Setup.py index 94c95e552f..e0de406a4a 100644 --- a/resources/libraries/python/IPv6Setup.py +++ b/resources/libraries/python/IPv6Setup.py @@ -221,10 +221,11 @@ class IPv6Setup(object): :type interface: str """ sw_if_index = Topology.get_interface_sw_index(node, interface) - VatExecutor.cmd_from_template(node, - 'sw_interface_ip6nd_ra_config.vat', - sw_if_id=sw_if_index, - param='surpress') + if sw_if_index: + VatExecutor.cmd_from_template(node, + 'sw_interface_ip6nd_ra_config.vat', + sw_if_id=sw_if_index, + param='surpress') @staticmethod def vpp_ra_send_after_interval(node, interface, interval=2): @@ -239,10 +240,11 @@ class IPv6Setup(object): :type interval: int """ sw_if_index = Topology.get_interface_sw_index(node, interface) - VatExecutor.cmd_from_template(node, - 'sw_interface_ip6nd_ra_config.vat', - sw_if_id=sw_if_index, - param='interval {0}'.format(interval)) + if sw_if_index: + VatExecutor.cmd_from_template(node, + 'sw_interface_ip6nd_ra_config.vat', + sw_if_id=sw_if_index, + param='interval {0}'.format(interval)) def vpp_all_ra_suppress_link_layer(self, nodes): """Suppress ICMPv6 router advertisement message for link scope address diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 5e3c4c4f99..c5223d5496 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -123,6 +123,53 @@ class InterfaceUtil(object): InterfaceUtil.set_interface_ethernet_mtu(node, ifc, 1500) @staticmethod + def vpp_set_interface_mtu(node, interface, mtu=9200): + """Set Ethernet MTU on interface. + + :param node: VPP node. + :param interface: Interface to setup MTU. Default: 9200. + :param mtu: Ethernet MTU size in Bytes. + :type node: dict + :type interface: str or int + :type mtu: int + """ + if isinstance(interface, basestring): + sw_if_index = Topology.get_interface_sw_index(node, interface) + else: + sw_if_index = interface + + if sw_if_index: + with VatTerminal(node, json_param=False) as vat: + vat.vat_terminal_exec_cmd_from_template( + "hw_interface_set_mtu.vat", sw_if_index=sw_if_index, + mtu=mtu) + + @staticmethod + def vpp_set_interfaces_mtu_on_node(node, mtu=9200): + """Set Ethernet MTU on all interfaces. + + :param node: VPP node. + :param mtu: Ethernet MTU size in Bytes. Default: 9200. + :type node: dict + :type mtu: int + """ + for interface in node['interfaces']: + InterfaceUtil.vpp_set_interface_mtu(node, interface, mtu) + + @staticmethod + def vpp_set_interfaces_mtu_on_all_duts(nodes, mtu=9200): + """Set Ethernet MTU on all interfaces on all DUTs. + + :param nodes: VPP nodes. + :param mtu: Ethernet MTU size in Bytes. Default: 9200. + :type nodes: dict + :type mtu: int + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + InterfaceUtil.vpp_set_interfaces_mtu_on_node(node, mtu) + + @staticmethod def vpp_node_interfaces_ready_wait(node, timeout=10): """Wait until all interfaces with admin-up are in link-up state. 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 diff --git a/resources/templates/vat/hw_interface_set_mtu.vat b/resources/templates/vat/hw_interface_set_mtu.vat new file mode 100644 index 0000000000..645d1a80c5 --- /dev/null +++ b/resources/templates/vat/hw_interface_set_mtu.vat @@ -0,0 +1 @@ +hw_interface_set_mtu sw_if_index {sw_if_index} mtu {mtu} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot index 5bb1473b08..ea15ca251f 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot @@ -102,7 +102,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot index f48ebfaf5e..bc425941d7 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot @@ -107,7 +107,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot index fef81f5f67..eaf38d9843 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot @@ -102,7 +102,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot index c0230ddbd4..1c89ea2b95 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot @@ -107,7 +107,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot index bf24cd746f..584d73f9e5 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot @@ -108,7 +108,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot index 011b58b5ca..966c16c4bf 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -113,7 +113,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot index c7e495fe6b..693454ac31 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot @@ -107,7 +107,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot index b79fb0c12d..b2a3fe573b 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -112,7 +112,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot index e858f9406e..ca82611e5f 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot @@ -104,7 +104,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot index b588d8e93e..e2170d1961 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot @@ -109,7 +109,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot index 8031a975b0..be7b0afdfd 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot @@ -104,7 +104,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot index becf2d6a0d..7af39faf87 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot @@ -109,7 +109,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot index 7f19d6f0d2..f0cd0ae44c 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot @@ -113,7 +113,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot index d5056fd9ff..57034182f8 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -118,7 +118,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot index 36a884f77a..80b20cf928 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot @@ -113,7 +113,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot index 4aaa67d49f..c39f54ee67 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -118,7 +118,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot index dfaf5cf582..bb8881601c 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot @@ -102,7 +102,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot index 2641fdcba5..a6f0af493e 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot @@ -107,7 +107,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot index 4d79dc0490..6ed1ee0a74 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot @@ -102,7 +102,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot index a8ff4af9f4..c07e9991db 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot @@ -107,7 +107,6 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot index a4d5ecce89..f6e1add216 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot @@ -108,7 +108,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot index 679f163666..d9b9b3a35a 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -113,7 +113,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot index 8fd689b4fd..95a9fa0fc7 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot @@ -108,7 +108,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot index 4fa9028bac..f7d2b229ee 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -113,7 +113,6 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4} | | ... | ${addr_range} -| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot index f521200a46..d232e9d2cf 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X710 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-X710 | IP4FWD | BASE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X710 diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-mrr.robot index 5ca0bcbce0..4fb2c81d9e 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-mrr.robot @@ -81,7 +81,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up +| | And Set interfaces in path up | | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrpdr.robot index aceb1eb054..f7f18c1cdf 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrpdr.robot @@ -87,7 +87,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up +| | And Set interfaces in path up | | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot index f76311bc74..8d9648cb2d 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot @@ -77,7 +77,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up +| | And Set interfaces in path up | | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And Configure L2 tag rewrite method on interfaces diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot index 929a453251..2771504df7 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot @@ -83,7 +83,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up | | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And Configure L2 tag rewrite method on interfaces diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot index 60cb307d16..8e7fb01cd5 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot @@ -77,7 +77,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up +| | And Set interfaces in path up | | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And Configure L2 tag rewrite method on interfaces diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot index 7503cb1451..059d1a6ed2 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot @@ -83,7 +83,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Set interfaces in path in 3-node circular topology up | | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And Configure L2 tag rewrite method on interfaces diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 1d656d6de3..dfc6f887ed 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -100,7 +100,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index f9125118b3..75432cdde2 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -105,7 +105,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index 5ec275a782..7edc1bd16c 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -98,7 +98,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index 7e2276b917..d835dc36fe 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -103,7 +103,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 743ca1b832..b2865f30ef 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -100,7 +100,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 0da750f981..3cc6a30cd6 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -105,7 +105,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index f6b3411fcf..66b7c5a383 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -98,7 +98,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index a6d9b83981..edef03b2a2 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbdpdk-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -103,7 +103,6 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | And Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot index c4491f29e6..bd25bfb664 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot @@ -96,7 +96,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot index 6aa5a8370f..8eaefad5a7 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot @@ -103,7 +103,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot index ff476a49aa..ed7f9bb56a 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot @@ -96,7 +96,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot index 69b6691e47..1c01c0561d 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot @@ -103,7 +103,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot index 4f055cbbf5..0532eb2069 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot @@ -96,7 +96,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot index e24218a4f1..3532e0d1a2 100644 --- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot @@ -103,7 +103,7 @@ | | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | Set interfaces in path in 3-node circular topology up +| | Set interfaces in path up | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology |