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-ndrpdr.robot;h=9563415eb654f8cdb33f3849a2406084ec7050c3;hp=9803453fe11d36c5d5457899b8f49988588a7077;hb=5221220aa5a893e93d78ba31f84b0ad4d6245ec3;hpb=5075d208e29ece6bfd8cf4aa5289dd0b2ade583c

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 9803453fe1..9563415eb6 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -21,17 +21,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 | 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 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
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,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 Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}