diff options
46 files changed, 87 insertions, 200 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 0affc77007..b69980bf1a 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -1197,17 +1197,15 @@ | | ... | Setup VLAN between DUTs. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 xconnect with Vhost-User and VLAN initialized in a 3-node\ -| | ... | circular topology \| /tmp/sock1 \| /tmp/sock2 \| 10 \| pop-1 \| +| | ... | circular topology \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | [Arguments] | ${subid} | ${tag_rewrite} | | ... | | Set interfaces in path up | | Initialize VLAN dot1q sub-interfaces in circular topology @@ -1216,11 +1214,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} @@ -1232,18 +1230,15 @@ | | ... | with VLAN sub-interface. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with DPDK link\ -| | ... | bonding in 3-node circular topology \| /tmp/sock1 \| /tmp/sock2 \ -| | ... | \| 10 \| pop-1 \| +| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | [Arguments] | ${subid} | ${tag_rewrite} | | ... | | Set interfaces in path up | | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology @@ -1258,11 +1253,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} @@ -1276,8 +1271,6 @@ | | ... | with VLAN sub-interface. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string @@ -1286,11 +1279,9 @@ | | ... | *Example:* | | ... | | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with VPP link\ -| | ... | bonding in 3-node circular topology \| /tmp/sock1 \| /tmp/sock2 \ -| | ... | \| 10 \| pop-1 \| \| xor \| l34 \| +| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| xor \| l34 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | [Arguments] | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | ... | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} @@ -1331,11 +1322,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} @@ -1852,15 +1843,13 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a\ -| | ... | 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| +| | ... | 3-node circular topology \| 1 \| 2 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | [Arguments] | ${bd_id1} | ${bd_id2} | | ... | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 @@ -1872,13 +1861,13 @@ | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24 | | ... | 172.16.0.2 | 172.16.0.1 | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} @@ -2016,18 +2005,15 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 bridge domains with Vhost-User and VLAN initialized in circular\ -| | ... | topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| 10 \| pop-1 \| +| | ... | topology \| 1 \| 2 \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} @@ -2046,14 +2032,14 @@ | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} | | ... | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add interface to bridge domain | ${dut2} | ${subif_index_2} | | ... | ${bd_id1} @@ -2076,8 +2062,6 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... @@ -2087,8 +2071,7 @@ | | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ | | ... | \| /tmp/sock2 \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | ... | | Set interfaces in path up | | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology @@ -2103,13 +2086,13 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} @@ -2129,8 +2112,6 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string @@ -2139,11 +2120,11 @@ | | ... | *Example:* | | ... | | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with VPP\ -| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ -| | ... | \| /tmp/sock2 \| 10 \| pop-1 \| xor \| l34 \| +| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \ +| | ... | \| 10 \| pop-1 \| xor \| l34 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | ... | ${bond_mode} | ${lb_mode} | | ... | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} @@ -2184,13 +2165,13 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${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} diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml index 03b4714d3e..33e061e724 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml @@ -1,6 +1,14 @@ --- # file: roles/tg_sut/tasks/skylake.yaml +- name: Install msr-tools + apt: + name: + - 'msr-tools' + state: 'present' + install_recommends: False + tags: install-msr + - name: Disable Skylake Turbo-Boost by service copy: src: 'files/disable-turbo-boost.service' diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml index fd08215aa5..5c205b5a70 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml @@ -98,6 +98,7 @@ - name: Install Kubernetes apt: name: + - 'kubernetes-cni=0.6.0-00' - 'kubeadm={{ kubernetes_apt_package_name }}' - 'kubectl={{ kubernetes_apt_package_name }}' - 'kubelet={{ kubernetes_apt_package_name }}' 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 bf92ce2514..211fa1f0aa 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 @@ -63,8 +63,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -99,8 +97,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | 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} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 b56a0268f2..b1bfdc23fb 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 @@ -67,8 +67,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -104,8 +102,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | 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} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 1a0f3e96f2..52041b0cba 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 @@ -60,9 +60,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -97,7 +94,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 50d1edf617..03130fba24 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 @@ -64,9 +64,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -102,7 +99,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index f1a62dacb8..815b77123b 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -66,8 +66,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -101,7 +99,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index bafcd63c5d..97931b6b94 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -69,8 +69,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -105,7 +103,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index 6b634c345e..ace7542169 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -62,9 +62,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -98,8 +95,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index d2c32faae9..2d1fe23be2 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -66,9 +66,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -103,8 +100,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index c3c5480f48..163200cfe8 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -56,8 +56,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -90,8 +88,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 7a88d8cc3c..878384c510 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -61,8 +61,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -96,8 +94,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index dadcdf0bda..78c441e968 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -54,9 +54,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -89,7 +86,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index 758cb487af..f689573144 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -58,9 +58,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -94,7 +91,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdscale1mmaclrn-eth-2vhostvr1024-1vm-cfsrr1-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdscale1mmaclrn-eth-2vhostvr1024-1vm-cfsrr1-ndrpdr.robot index b7fe16918b..14cf76e009 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdscale1mmaclrn-eth-2vhostvr1024-1vm-cfsrr1-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdscale1mmaclrn-eth-2vhostvr1024-1vm-cfsrr1-ndrpdr.robot @@ -94,7 +94,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with Vhost-User | vm_count=${1} +| | When Initialize L2 bridge domains with Vhost-User | nf_nodes=${1} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${True} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index a7f2bd5980..b3411cf48e 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -57,8 +57,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} | ${overhead}= | ${50} @@ -92,7 +90,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | ... | ${bd_id1} | ${bd_id2} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 21dcab1f07..5ddda29013 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -61,8 +61,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X520-DA2 bandwidth limit | ${s_limit}= | ${10000000000} | ${overhead}= | ${50} @@ -97,7 +95,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | ... | ${bd_id1} | ${bd_id2} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 207d7e9cac..56473e6248 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 @@ -64,8 +64,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -100,8 +98,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | 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} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 f770bf28ae..bab90dc440 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 @@ -68,8 +68,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -105,8 +103,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | 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} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 cbcc4f0a62..3d851a264e 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 @@ -61,9 +61,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -98,7 +95,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} 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 a25020d702..77cbe81ea2 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 @@ -65,9 +65,6 @@ | ${subid}= | 10 | ${tag_rewrite}= | pop-1 | ${overhead}= | ${4} -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -103,7 +100,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index cb372c72fb..cae82d2bc6 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -67,8 +67,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -102,7 +100,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 34b43fbd7e..f7b9b0a4f1 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -70,8 +70,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -106,7 +104,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index af856e9c36..93ffb3eec0 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -63,9 +63,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -99,8 +96,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index ad157c863c..ab04834673 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -67,9 +67,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -104,8 +101,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index eaa2972735..47aefecfcf 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -68,8 +68,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -103,7 +101,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 7ddb565544..c13f849496 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -71,8 +71,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -107,7 +105,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index 0905421274..e9eb1fcfc4 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -64,9 +64,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -100,7 +97,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | | ... | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index a3245fe1d8..8497942d29 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -68,9 +68,6 @@ # Link bonding config | ${bond_mode}= | lacp | ${lb_mode}= | l34 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -105,8 +102,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 0239ad47be..be8abc71f9 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -56,8 +56,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -90,8 +88,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 81a7689177..7d3127dc31 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -61,8 +61,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -96,8 +94,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot index 0b14e3b199..209b7a068d 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot @@ -53,9 +53,6 @@ *** Variables *** | ${subid}= | 10 | ${tag_rewrite}= | pop-1 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -88,7 +85,7 @@ | | ... | ${s_limit} | ${framesize} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index f4f5dc4f44..f31a708b1a 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -57,9 +57,6 @@ *** Variables *** | ${subid}= | 10 | ${tag_rewrite}= | pop-1 -# Socket names -| ${sock1}= | /var/run/vpp/sock-1-1 -| ${sock2}= | /var/run/vpp/sock-1-2 # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -93,7 +90,7 @@ | | ... | ${s_limit} | ${framesize} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology -| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 5af704dd78..0a17ba0936 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -57,8 +57,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} | ${overhead}= | ${50} @@ -92,7 +90,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | ... | ${bd_id1} | ${bd_id2} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index dc17657317..5d058b6b0c 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -61,8 +61,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} | ${overhead}= | ${50} @@ -97,7 +95,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | ... | ${bd_id1} | ${bd_id2} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024} | | ... | use_tuned_cfs=${False} diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 37400520ee..0503fb243b 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -55,8 +55,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -87,8 +85,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index adc27b84f5..ba72092112 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -60,8 +60,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # X710 bandwidth limit | ${s_limit}= | ${10000000000} # Traffic profile: @@ -93,8 +91,7 @@ | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot index 346a24be89..7bbb614c0a 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr.robot @@ -55,8 +55,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps | ${s_24.5G}= | ${24500000000} # XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps @@ -90,8 +88,7 @@ | | ... | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index da222e3b03..f7228f5b51 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -60,8 +60,6 @@ # Socket names | ${bd_id1}= | 1 | ${bd_id2}= | 2 -| ${sock1}= | /var/run/vpp/sock-1-${bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${bd_id2} # XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps | ${s_24.5G}= | ${24500000000} # XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps @@ -96,8 +94,7 @@ | | ... | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure guest VMs with dpdk-testpmd connected via vhost-user | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} | | Then Find NDR and PDR intervals using optimized search 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 64380f842c..d9de20d082 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 @@ -62,8 +62,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | permit 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 a4274cdfe4..e3ec36c708 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 @@ -67,8 +67,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${min_rate}= | ${10000} 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 730a9562e6..67ac44b9f7 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 @@ -62,8 +62,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | permit+reflect 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 bbcef62c46..74ac7fb8f6 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 @@ -67,8 +67,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${min_rate}= | ${10000} 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 121ba238ca..d92188153b 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 @@ -62,8 +62,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | ${EMPTY} 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 e61afb0617..28631e004c 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 @@ -67,8 +67,8 @@ | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /tmp/sock-1-${dut1_bd_id1} -| ${sock2}= | /tmp/sock-1-${dut1_bd_id2} +| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} +| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${min_rate}= | ${10000} |