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-1memif-1dcr-mrr.robot;h=0c7c56acc06e83fc426f7508df28c9a0b9489077;hp=cd21d0d21ffa36d4f752bdd9e9f9b3a453ad9904;hb=852b10b6724f0ae221e45f1ccb3f8020077b1f33;hpb=11be8edf29b2740825110d629a23ea0bbe8a50a8

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
index cd21d0d21f..0c7c56acc0 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
@@ -22,16 +22,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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| 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 'CNF' 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
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | cross_horiz
 
@@ -88,6 +85,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 | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect for single memif
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}