From b6ebc20a98cf7266b54c9a717a708858ffa17594 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 9 Feb 2018 13:09:09 +0100 Subject: Disable all plugins except DPDK by default - enable corresponding plugin for ACL, NAT, MEMIF tests Change-Id: Ie8bfdcbf1734283b6412ef3015215a00ce3ebdf6 Signed-off-by: Jan Gelety (cherry picked from commit e6bbba641dfe38cf14155aa96576059ade64773c) --- .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot | 6 ++++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot | 6 ++++-- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'tests/vpp/perf/container_memif') 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 f5e8b5ff4e..8814e1e602 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 @@ -17,8 +17,10 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | MEMIF | LXC | ... -| Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | Intel-X520-DA2 +| Suite Setup | Run Keywords +| ... | Set up 3-node performance topology with DUT's NIC model | L2 +| ... | Intel-X520-DA2 +| ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance topology with containers | ... | Suite Teardown | Tear down 3-node performance topology with container 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 07d391bfbb..6f5f4fd90f 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 @@ -17,8 +17,10 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | MEMIF | DOCKER | ... -| Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | Intel-X520-DA2 +| Suite Setup | Run Keywords +| ... | Set up 3-node performance topology with DUT's NIC model | L2 +| ... | Intel-X520-DA2 +| ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance topology with containers | ... | Suite Teardown | Tear down 3-node performance topology with container 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 2924d93790..b56228e943 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 @@ -17,8 +17,10 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | MEMIF | LXC | ... -| Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | Intel-X520-DA2 +| Suite Setup | Run Keywords +| ... | Set up 3-node performance topology with DUT's NIC model | L2 +| ... | Intel-X520-DA2 +| ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance topology with containers | ... | Suite Teardown | Tear down 3-node performance topology with container -- cgit 1.2.3-korg