aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-04-05 09:31:30 +0000
committerPeter Mikus <pmikus@cisco.com>2018-04-05 09:31:30 +0000
commit20ebb7aa4f5ab46206b472fc52b24e354bbc8dc4 (patch)
tree68bdcd62167c54d4b8849e020c14ee2a80bfea8a
parentc754789176b1a3ca00a129d3d207aa5a6bad7c27 (diff)
Revert "FIX: Change plugin default behavior for Container tests"
This reverts commit c754789176b1a3ca00a129d3d207aa5a6bad7c27. Change-Id: Ic1bbe8fac0d98f41aa8b1b57da0c7a147111340b Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rwxr-xr-xbootstrap-verify-perf.sh5
-rw-r--r--resources/libraries/python/ContainerUtils.py3
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot2
3 files changed, 6 insertions, 4 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index d3b1f03929..98855a7be1 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -15,7 +15,9 @@
set -x
# Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed3.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1.yaml \
+ topologies/available/lf_testbed2.yaml \
+ topologies/available/lf_testbed3.yaml"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -345,7 +347,6 @@ case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- -i THIS \
tests/
RETURN_STATUS=$(echo $?)
esac
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py
index da9e93ae10..da3d7057dc 100644
--- a/resources/libraries/python/ContainerUtils.py
+++ b/resources/libraries/python/ContainerUtils.py
@@ -327,7 +327,8 @@ class ContainerEngine(object):
if cpuset_cpus:
corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus)
vpp_config.add_cpu_corelist_workers(corelist_workers)
- vpp_config.add_plugin('disable', 'dpdk_plugin.so')
+ vpp_config.add_plugin('disable', 'default')
+ vpp_config.add_plugin('enable', 'memif_plugin.so')
self.execute('mkdir -p /etc/vpp/')
self.execute('echo "{c}" | tee {f}'
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 34fa21459b..908180dc7f 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
@@ -94,7 +94,7 @@
| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
| | ... | throughput test.
| | ...
-| | [Tags] | 64B | 1T1C | STHREAD | THIS
+| | [Tags] | 64B | 1T1C | STHREAD
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
| | framesize=${64} | wt=1 | rxq=1