diff options
author | Jan Gelety <jgelety@cisco.com> | 2018-05-22 16:19:58 +0200 |
---|---|---|
committer | Jan Gelety <jgelety@cisco.com> | 2018-05-22 16:19:58 +0200 |
commit | d8d1bab425b32ebdcad370988229f7b92e32ed93 (patch) | |
tree | 99725991c164eae7374dff61c466a10a127f6817 | |
parent | 5759be80f5bad270be741a482e30229bc80b8751 (diff) |
FIX: failing vhost perf tests
Change-Id: Id47ef0cd61edad5c157b06a2587e2cbe0873ad5d
Signed-off-by: Jan Gelety <jgelety@cisco.com>
8 files changed, 2 insertions, 52 deletions
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index f69745b030..93773edcaf 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -159,8 +159,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -171,11 +169,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -\| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -198,8 +194,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -210,11 +204,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -380,8 +372,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -392,11 +382,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -419,8 +407,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -431,11 +417,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -601,8 +585,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -613,11 +595,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -640,8 +620,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -652,11 +630,9 @@ | | ... | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index f846c4d0cc..06b6953343 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -86,8 +86,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -97,11 +95,9 @@ | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index f54ca7eb5b..9fa195aead 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -82,8 +82,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -93,11 +91,9 @@ | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index d19f616420..4d1d629a67 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -78,8 +78,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -89,11 +87,9 @@ | | ... | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index 649865da4e..9727655428 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -81,8 +81,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -92,11 +90,11 @@ | | ... | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} -| | ... | ${dut1_vif2_mac} | jumbo_frames=${jumbo_frames} +| | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} -| | ... | ${dut2_vif2_mac} | jumbo_frames=${jumbo_frames} +| | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index 189626a64b..c21e3b075d 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -89,8 +89,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -100,11 +98,9 @@ | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index bd1ab2e541..21f2fe07d6 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -84,8 +84,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -95,11 +93,9 @@ | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/vm_vhost/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index fe9520d48e..f211bf411c 100644 --- a/tests/vpp/perf/vm_vhost/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -86,8 +86,6 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522} -| | ... | ${False} | ${True} | | ... | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add PCI devices to DUTs in 3-node single link topology @@ -97,11 +95,9 @@ | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 -| | ... | jumbo_frames=${jumbo_frames} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} |