From 28b344a6ade7624278835cff242b3e0c9d891346 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Mon, 14 May 2018 13:22:42 +0200
Subject: CSIT-1081 Container VPP configuration refactor

Adopt code for various topology configurations.

Change-Id: Iaf9d7995ab8cd06da0c56c5e5664d57d19e74d7c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot             | 1 +
 .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot      | 1 +
 .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot   | 1 +
 .../10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot            | 1 +
 .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot   | 1 +
 .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot            | 1 +
 .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot             | 1 +
 .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot   | 1 +
 .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot   | 1 +
 .../40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot            | 1 +
 .../container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot  | 1 +
 11 files changed, 11 insertions(+)

(limited to 'tests/vpp/perf/container_memif')

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 6a07820a9b..1f1fbac0c3 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
@@ -60,6 +60,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
index b180107346..5b556d1217 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -68,6 +68,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 faf400450e..60aaa2b68f 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
@@ -60,6 +60,7 @@
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
index b3824d6b0d..461e7b5405 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
@@ -68,6 +68,7 @@
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 e7cd18e2d2..4a9cd3cc46 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
@@ -59,6 +59,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
index 91108f8c17..2551e069c9 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -67,6 +67,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 83f85da875..46b34d1adf 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
@@ -60,6 +60,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 580563a628..00eae8f9ec 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
@@ -60,6 +60,7 @@
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 df8dddb148..2799c3b40d 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
@@ -59,6 +59,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 de4e7a9eb1..cd32014d3d 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
@@ -62,6 +62,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
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 82b981c30d..04d542f78e 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
@@ -61,6 +61,7 @@
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
 | ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
-- 
cgit 1.2.3-korg