X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fvpp%2Fperf%2Fcontainer_memif%2F10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot;h=836936cb2ec79c9bd9f74b5373bcea5bde7a692a;hb=d1589ad74e515757fb12cf8a5f976282924afe13;hp=5eec0fb03754a8642da65ba1a6a5364ba2854deb;hpb=2e5bd238d151a9002f4f6231f9c4eea43a37348b;p=csit.git

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
index 5eec0fb037..836936cb2e 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
@@ -22,16 +22,15 @@
 | ... | 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 discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,16 +64,9 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# Container settings
-| ${container_count}= | ${1}
+# Container
 | ${container_engine}= | Docker
-| ${container_image}= | ubuntu:xenial-20180412
-| ${container_install_dkms}= | ${TRUE}
 | ${container_chain_topology}= | cross_horiz
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
@@ -99,6 +91,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 for single memif
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}