From c8b2f57cd09355e0e89e6b9d28930281573bec23 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 18 Apr 2018 17:09:33 +0200 Subject: FIX: Configure number of memif queus properly Change-Id: I2dcb0300829bc961c80cc30d972d0563aeba9364 Signed-off-by: Peter Mikus --- .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 ++-- .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot | 4 ++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 4 ++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot | 4 ++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 ++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot | 4 ++-- .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 ++-- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 4 ++-- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 ++-- .../40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 ++-- .../40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tests/vpp/perf/container_memif') diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index 6ea7c80c78..3913aa5cbd 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -60,7 +60,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2bdbasemaclrn-eth-2memif-1lxc @@ -82,7 +82,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular topology +| | And Initialize L2 Bridge Domain for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot index 8814e1e602..cf78e88979 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot @@ -68,7 +68,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Discover NDR or PDR for L2 Bridge Domain with Memif @@ -85,7 +85,7 @@ | | Add PCI Devices To DUTs In 3-node Single Link Topology | | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular topology +| | Initialize L2 Bridge Domain for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Run Keyword If | '${search_type}' == 'NDR' | | ... | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot index 908180dc7f..ded74eef9d 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -60,7 +60,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2xcbase-eth-2memif-1dcr @@ -82,7 +82,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot index 6f5f4fd90f..62e8fd3e12 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot @@ -68,7 +68,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | L2 Cross Connect over Memif Binary Search @@ -85,7 +85,7 @@ | | Add PCI Devices To DUTs In 3-node Single Link Topology | | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | Initialize L2 xconnect for '${container_count}' memif pairs in 3-node circular topology +| | Initialize L2 xconnect for '${container_count}' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Run Keyword If | '${search_type}' == 'NDR' | | ... | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index 2ec26b79fb..75b7c38503 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -59,7 +59,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2xcbase-eth-2memif-1lxc @@ -81,7 +81,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot index b56228e943..c9c3cc9a9f 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot @@ -67,7 +67,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | L2 Cross Connect over Memif Binary Search @@ -84,7 +84,7 @@ | | Add PCI Devices To DUTs In 3-node Single Link Topology | | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Run Keyword If | '${search_type}' == 'NDR' | | ... | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index 6ab953db85..27b87dbad5 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -60,7 +60,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2bdbasemaclrn-eth-2memif-1lxc @@ -82,7 +82,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular topology +| | And Initialize L2 Bridge Domain for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot index 23a12d0e1c..7bc617a151 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -60,7 +60,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2xcbase-eth-2memif-1dcr @@ -82,7 +82,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index 2e39c87406..f5bc14acd9 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -59,7 +59,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2xcbase-eth-2memif-1lxc @@ -81,7 +81,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index dd7e7e8e2d..a4674a1e18 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -62,7 +62,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2bdbasemaclrn-eth-2memif-1lxc @@ -86,7 +86,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular topology +| | And Initialize L2 Bridge Domain for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index 92988b366e..0160bf2b46 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -61,7 +61,7 @@ # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} -| ${container_cpus}= | ${3} +| ${container_cpus}= | ${5} *** Keywords *** | Check RR for l2xcbase-eth-2memif-1lxc @@ -85,7 +85,7 @@ | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology +| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology | | Then Traffic should pass with maximum rate | ${perf_trial_duration} | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} -- cgit 1.2.3-korg