X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fcontainer_memif%2F10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot;h=30f8cdc3fe2f88e4a9747ca441982d9b1d84184b;hp=f2f92548fae3af6d29bc8a8797502658c9374141;hb=75e2e7bbbfc1da40f8c742870ec12204846c9bf9;hpb=2e5bd238d151a9002f4f6231f9c4eea43a37348b

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 f2f92548fa..30f8cdc3fe 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
@@ -21,15 +21,14 @@
 | ... | 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
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'VNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -57,16 +56,9 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
 | ${container_engine}= | Docker
-| ${container_image}= | ubuntu:xenial-20180412
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
@@ -89,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}