diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-04-05 09:12:22 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-04-05 09:17:01 +0000 |
| commit | c754789176b1a3ca00a129d3d207aa5a6bad7c27 (patch) | |
| tree | d64d3f16f189c73baff4c03d0ff71f0956e3dc71 | |
| parent | 2075758fdb47af554e106ddab0fbd76ae11beef9 (diff) | |
FIX: Change plugin default behavior for Container tests
Looks like disabling all plugins in container leaving
only memif_plugin.so results into issue that could lead
into lost of SSH connectivity to TB or in better case
to not handling any traffic.
This fix is supose to return previous behavior for Container
instance of VPP.
Change-Id: Ie8b3ce2e35a40c8f3498e490abb6967cd4dd912a
Signed-off-by: Peter Mikus <pmikus@cisco.com>
| -rwxr-xr-x | bootstrap-verify-perf.sh | 5 | ||||
| -rw-r--r-- | resources/libraries/python/ContainerUtils.py | 3 | ||||
| -rw-r--r-- | tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 98855a7be1..d3b1f03929 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -15,9 +15,7 @@ set -x # Space separated list of available testbeds, described by topology files -TOPOLOGIES="topologies/available/lf_testbed1.yaml \ - topologies/available/lf_testbed2.yaml \ - topologies/available/lf_testbed3.yaml" +TOPOLOGIES="topologies/available/lf_testbed3.yaml" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -347,6 +345,7 @@ 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 da3d7057dc..da9e93ae10 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -327,8 +327,7 @@ 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', 'default') - vpp_config.add_plugin('enable', 'memif_plugin.so') + vpp_config.add_plugin('disable', 'dpdk_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 908180dc7f..34fa21459b 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 +| | [Tags] | 64B | 1T1C | STHREAD | THIS | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr | | framesize=${64} | wt=1 | rxq=1 |