CSIT-1389 Refactor current keywords for multichaining - CNF

[csit.git] / tests / vpp / perf / container_memif / 2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot

diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 7edfa14..e6f7b79 100644 (file)
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-XXV710
 | ... | AND | Set up performance test suite with MEMIF
-| ... | AND | Set up performance topology with containers
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 2-node performance topology with container
 | ...
 | Test Setup | Run Keywords
 | ... | Set up performance test
-| ... | AND | Restart VPP in all 'VNF' containers
+| ... | AND | Restart VPP in all 'CNF' containers
 | ...
 | Test Teardown | Tear down performance mrr test
 | ...
@@ -59,16 +60,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${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