CSIT-768: Refactor Python container libraries

[csit.git] / tests / vpp / perf / l2 / 10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
index 0c6d4bd..60c6c25 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -19,11 +19,9 @@
 | ...
 | Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model
 | ... | L2 | Intel-X520-DA2
 | ...
 | Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model
 | ... | L2 | Intel-X520-DA2

-| ... | AND | Create '${lxc_count}' LXC containers on all DUT nodes with '${lxc_cpu}' cpus
-| ... | AND | Install VPP on '${lxc_count}' LXC containers on all DUT nodes
-| ... | AND | Create memif VPP configuration on '${lxc_count}' LXC containers on all DUT nodes
-| ... | AND | Create startup configuration of VPP on '${lxc_count}' LXC containers on all DUT nodes
-| Suite Teardown | Tear down 3-node performance topology with LXC
+| ... | AND | Set up performance topology with containers
+| ...
+| Suite Teardown | Tear down 3-node performance topology with container

 | ...
 | Test Setup | Set up performance test
 | ...
 | ...
 | Test Setup | Set up performance test
 | ...


@@ -62,12 +60,13 @@
 # Traffic profile:
 | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 # LXC container
 # Traffic profile:
 | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 # LXC container

-| ${lxc_base_name} | slave
-| ${lxc_count} | ${1}
-| ${lxc_cpu} | ${4}
+| ${container_count}= | ${1}
+| ${container_engine}= | LXC
+| ${container_image}= | ${EMPTY}

 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}

+| ${container_cpus}= | ${3}

 
 *** Keywords ***
 | Discover NDR or PDR for L2 Bridge Domain with Memif
 
 *** Keywords ***
 | Discover NDR or PDR for L2 Bridge Domain with Memif


@@ -230,4 +229,4 @@
 | | ...
 | | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | ...
 | | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif

-| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
\ No newline at end of file
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR