diff options
author | Peter Mikus <pmikus@cisco.com> | 2018-05-14 13:22:42 +0200 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-06-08 07:44:26 +0000 |
commit | 28b344a6ade7624278835cff242b3e0c9d891346 (patch) | |
tree | c191837a72b62ea1a70b5b007890530c32b6f3b0 /tests | |
parent | 5b9b416f2f073a4102f3dc5ba219c81505e092ed (diff) |
CSIT-1081 Container VPP configuration refactor
Adopt code for various topology configurations.
Change-Id: Iaf9d7995ab8cd06da0c56c5e5664d57d19e74d7c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests')
17 files changed, 17 insertions, 0 deletions
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} diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot index 2895b45f50..f138ca0c9f 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot @@ -91,6 +91,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/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot index 01495b2a0b..cce65f13b0 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot @@ -96,6 +96,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/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot index 41b3c31647..2981da786e 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot @@ -91,6 +91,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/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot index f71e305ba0..98b498ed03 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot @@ -96,6 +96,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/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot index 87c240ae72..ef0c95706f 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot @@ -91,6 +91,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/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot index 050b90697f..580e595d8f 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot @@ -96,6 +96,7 @@ | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} | ${container_install_dkms}= | ${FALSE} +| ${container_chain_topology}= | chain # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} |