CSIT-1389 Refactor current keywords for multichaining - CNF

- Add ability to create matrix of containers (chains x nodeness)
- Change default Docker image to csit-dut
- Use new resource mapping function

Change-Id: Iaac0f2efc99146fbaef0b33dc71b38770610023d
Signed-off-by: Peter Mikus <pmikus@cisco.com>

46 files changed, 230 insertions, 460 deletions

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index ea4f9f8758..ec92a0644e 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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
 | ...
@@ -64,16 +65,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 370500f264..f6d328775b 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -69,16 +70,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index a5ab1f0d18..9da1519b76 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index 1a7f13d77e..9fd78dc2c3 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
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 cefac386b3..cd21d0d21f 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,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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
 | ...
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# Container settings
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${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
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..b800886a74 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,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -65,16 +66,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# Container settings
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${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
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..58ed892c95 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,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
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 3729539d29..9803453fe1 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,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index ed208c381a..43c4c5607d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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
 | ...
@@ -56,16 +57,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index 24f558e377..4c72089099 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +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
+| ... | AND | Set up performance topology with containers | chains=${1}
+| ... | nodeness=${1}
 | ...
 | Suite Teardown | Tear down 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -55,16 +56,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
index 37bc41dc22..28c475eaeb 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-X520-DA2
 | ... | 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 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index ed371d8a31..561bbb2cad 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-X520-DA2
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index 60e0542781..9d73c402bf 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -64,16 +65,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 5e9db6c62f..7f98685713 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -69,16 +70,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 00e363421e..b8bd55306d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index df051fe269..b1d789fdb8 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
index a23220968e..4196dab9ca 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -60,16 +61,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# Container settings
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
index d8790f07dd..5dd18ddf5a 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -64,16 +65,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# Container settings
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index d27934033b..59d223365a 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 9c13c3495e..b7d2401745 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index dacb7d9349..e017c4a959 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -56,16 +57,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index 14a7502821..1fcdca0b3c 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -60,16 +61,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
index 866202530b..1859b9bf82 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-X710
 | ... | 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 3-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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 9827aa9dbd..1b9448934d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-X710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index f250e801b0..d54be00079 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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
 | ...
@@ -64,16 +65,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 2ec53e4c56..dd8d149524 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -69,16 +70,10 @@
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index 982142d9f8..bf4027b2f2 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index a232b060e7..a4f6d516be 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 0d160d8da0..ddebc3d514 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index b56fc9bbf6..5c47bf439a 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L2
 | ... | Intel-X710
 | ... | 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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
index 0b8c23d9aa..4114e6222a 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L3
 | ... | Intel-X710
 | ... | 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
 | ...
@@ -57,16 +58,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 027d6b9698..9512b8e976 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L3
 | ... | Intel-X710
 | ... | 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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -61,16 +62,10 @@
 | ${s_limit}= | ${10000000000}
 # 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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index e8d6c0a46d..f0b1eb68a2 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-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
 | ...
@@ -66,16 +67,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index a2b72cf6cb..4238e17871 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -71,16 +72,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
index 5c1e43a48e..d2fe4ef77f 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 610e0608b3..8159d1cbc7 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -63,16 +64,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
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 7edfa148c5..e6f7b7923a 100644
--- 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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 3019c509a5..9985073a76 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -63,16 +64,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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
index a9f3442806..bfb5d35a42 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L3
 | ... | 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
diff --git a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 045bed6cd7..62022fc378 100644
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 2-node performance topology with DUT's NIC model | L3
 | ... | 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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -63,16 +64,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
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 4d64e07fcb..1aa9a7dfc1 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-XL710
 | ... | 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 3-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-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index 8d1d8cad34..539e9c05cf 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-XL710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -63,16 +64,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index efe1fc620d..514443cd3f 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-XL710
 | ... | 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 3-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
 | ...
@@ -58,16 +59,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index 548fac214d..464c88fd65 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L2
 | ... | Intel-XL710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -62,16 +63,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+# Container
+| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
 | ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
index 88a7e9b70c..f972df9ff5 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-mrr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-XL710
 | ... | 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 3-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-3n-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
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 0e0ba5192e..4a2d9391b1 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,13 +21,14 @@
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
 | ... | Intel-XL710
 | ... | 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 3-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 discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
@@ -63,16 +64,10 @@
 | ${s_18.75Mpps}= | ${18750000}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-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