From cc85afad85339d2cc8f035ce63ff21220d8e6b96 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 6 Jul 2018 06:39:51 +0000 Subject: CSIT-1142 2-node topology - keywords - Clean up of 2-node setup KWs Change-Id: I59fc901fb57544eceb6a041b56b515cda8babf85 Signed-off-by: Peter Mikus --- .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 2 +- .../container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot | 2 +- .../10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot | 2 +- .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 2 +- .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 2 +- .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 2 +- .../container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot | 2 +- .../10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot | 2 +- .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 2 +- .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 2 +- .../40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 2 +- .../container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 2 +- 12 files changed, 12 insertions(+), 12 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 1f1fbac0c3..56bf177edc 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 @@ -82,7 +82,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot index 708a4f1927..9377cbff5d 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot @@ -86,7 +86,7 @@ | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize} | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add single PCI device to DUTs in 3-node single link topology +| | And Add single PCI device to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot index c3454f8167..c2ac8e4839 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot @@ -97,7 +97,7 @@ | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add single PCI device to DUTs in 3-node single link topology +| | And Add single PCI device to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 60aaa2b68f..57faef7098 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 @@ -82,7 +82,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 4a9cd3cc46..4a2567107a 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 @@ -81,7 +81,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 46b34d1adf..328bdbd10d 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 @@ -82,7 +82,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot index c164f04db0..23b1136aa7 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot @@ -85,7 +85,7 @@ | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize} | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add single PCI device to DUTs in 3-node single link topology +| | And Add single PCI device to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot index bf52330ec5..5753844ef5 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot @@ -96,7 +96,7 @@ | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add single PCI device to DUTs in 3-node single link topology +| | And Add single PCI device to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 00eae8f9ec..d049eb43e8 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 @@ -82,7 +82,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 2799c3b40d..aad22a7660 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 @@ -81,7 +81,7 @@ | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 cd32014d3d..5254753965 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 @@ -86,7 +86,7 @@ | | ... | ${max_rate} > ${s_18.75Mpps} | ${s_18.75Mpps} | ${max_rate} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs 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 04d542f78e..2e02556435 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 @@ -85,7 +85,7 @@ | | ... | ${max_rate} > ${s_18.75Mpps} | ${s_18.75Mpps} | ${max_rate} | | ... | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology -| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add PCI devices to all DUTs | | And Run Keyword If | ${get_framesize} < ${1522} | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -- cgit 1.2.3-korg