CSIT-1389 Refactor current keywords for multichaining - CNF (II)

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

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index a63a7df..4078196 100644 (file)
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -468,29 +468,6 @@
 | | Run Keyword If | '${crypto_type}' == 'HW_cryptodev'
 | | ... | Configure kernel module on all DUTs | vfio_pci | force_load=${True}
 
-| Set up performance topology with containers
-| | [Documentation]
-| | ... | Suite preparation phase that starts containers
-| | ...
-| | ... | *Arguments:*
-| | ... | - chains: Total number of chains. Type: integer
-| | ... | - nodeness: Total number of nodes per chain. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Set up performance topology with containers \| 1 \| 1 \|
-| | ...
-| | [Arguments] | ${chains}=${1} | ${nodeness}=${1}
-| | ...
-| | Set Suite Variable | @{container_groups} | @{EMPTY}
-| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
-| | Acquire all 'CNF' containers
-| | Create all 'CNF' containers
-| | Configure VPP in all 'CNF' containers
-| | Stop VPP service on all DUTs | ${nodes}
-| | Install VPP in all 'CNF' containers
-| | Start VPP service on all DUTs | ${nodes}
-
 | Set up performance test suite with MEMIF
 | | [Documentation]
 | | ... | Append memif_plugin.so to the list of enabled plugins.
@@ -601,30 +578,12 @@
 | | ...
 | | Teardown traffic generator | ${tg}
 
-| Tear down 2-node performance topology with container
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown and container
-| | ... | destroy.
-| | ...
-| | Teardown traffic generator | ${tg}
-| | :FOR | ${group} | IN | @{container_groups}
-| | | Destroy all '${group}' containers
-
 | Tear down 3-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ...
 | | Teardown traffic generator | ${tg}
 
-| Tear down 3-node performance topology with container
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown and container
-| | ... | destroy.
-| | ...
-| | Teardown traffic generator | ${tg}
-| | :FOR | ${group} | IN | @{container_groups}
-| | | Destroy all '${group}' containers
-
 # Tests setups
 
 | Set up performance test
@@ -655,6 +614,33 @@
 | | Apply Kubernetes resource on all duts | ${nodes}
 | | ... | pods/contiv-vswitch.yaml
 
+| Set up performance test with containers
+| | [Documentation]
+| | ... | Common test setup for performance tests with containers
+| | ...
+| | ... | *Arguments:*
+| | ... | - chains: Total number of chains. Type: integer
+| | ... | - nodeness: Total number of nodes per chain. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Set up performance test with containers \| 1 \| 1 \|
+| | ...
+| | [Arguments] | ${chains}=${1} | ${nodeness}=${1}
+| | ...
+| | Set Test Variable | @{container_groups} | @{EMPTY}
+| | Set Test Variable | ${container_group} | CNF
+| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
+| | ... | engine=${container_engine} | WITH NAME | ${container_group}
+| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
+| | Acquire all '${container_group}' containers
+| | Create all '${container_group}' containers
+| | Configure VPP in all '${container_group}' containers
+| | Stop VPP service on all DUTs | ${nodes}
+| | Install VPP in all '${container_group}' containers
+| | Start VPP service on all DUTs | ${nodes}
+| | Append To List | ${container_groups} | ${container_group}
+
 # Tests teardowns
 
 | Tear down performance discovery test
@@ -700,6 +686,13 @@
 | | Show VAT History On All DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
 
+| Tear down performance test with container
+| | [Documentation]
+| | ... | Common test teardown for performance tests which uses containers.
+| | ...
+| | :FOR | ${container_group} | IN | @{container_groups}
+| | | Destroy all '${container_group}' containers
+
 | Tear down performance test with vhost and VM with dpdk-testpmd
 | | [Documentation] | Common test teardown for performance tests which use
 | | ... | vhost(s) and VM(s) with dpdk-testpmd.

diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index e4748db..c39e24c 100644 (file)
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -33,9 +33,6 @@
 | | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${chain_id}=${1}
 | | ... | ${node_id}=${1}
 | | ...
-| | ${group}= | Set Variable | CNF
-| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
-| | ... | engine=${container_engine} | WITH NAME | ${group}
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive
@@ -43,10 +40,10 @@
 | | | ${nf_cpus}= | Create network function CPU list | ${dut}
 | | | ... | chains=${chains} | nodeness=${nodeness} | chain_id=${chain_id}
 | | | ... | node_id=${node_id} | auto_scale=${True}
-| | | Run Keyword | ${group}.Construct container
-| | | ... | name=${dut}_${group}${chain_id}${node_id} | node=${nodes['${dut}']}
-| | | ... | mnt=${mnt} | env=${env} | cpuset_cpus=${nf_cpus}
-| | Append To List | ${container_groups} | ${group}
+| | | Run Keyword | ${container_group}.Construct container
+| | | ... | name=${dut}_${container_group}${chain_id}${node_id}
+| | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env}
+| | | ... | cpuset_cpus=${nf_cpus}
 
 | Construct chain of containers on all DUTs
 | | [Documentation] | Construct 1 chain of 1..N CNFs on all DUT nodes.

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 ec92a06..e6635d5 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -66,7 +64,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -91,6 +88,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Traffic should pass with maximum rate

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 f6d3287..52a8663 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -71,7 +69,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -98,6 +95,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search

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 9da1519..31c5e77 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 9fd78dc..637cc69 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 cd21d0d..0c7c56a 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | cross_horiz
 
@@ -88,6 +85,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect for single memif
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 b800886..3ac2363 100644 (file)
--- 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,17 +22,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -67,7 +65,6 @@
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | cross_horiz
 
@@ -94,6 +91,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect for single memif
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 58ed892..55720dc 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 9803453..bb40754 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 43c4c56..21cce56 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords |
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -58,7 +56,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -83,6 +80,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 4c72089..6a30d83 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -57,7 +55,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 28c475e..43fe73b 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 561bbb2..70c035a 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 9d73c40..f477a79 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -66,7 +64,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -91,6 +88,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Traffic should pass with maximum rate

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 7f98685..2ebcf59 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -71,7 +69,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -98,6 +95,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search

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 b8bd553..e5a5319 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 b1d789f..2a90798 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 4196dab..abd9bf6 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -62,7 +60,6 @@
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | cross_horiz
 
@@ -87,6 +84,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect for single memif
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 5dd18dd..4c4fd10 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -66,7 +64,6 @@
 # Traffic profile
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | cross_horiz
 
@@ -93,6 +90,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect for single memif
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 59d2233..b70b7ee 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 b7d2401..c19a4f4 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 e017c4a..163edf8 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -58,7 +56,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -83,6 +80,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 1fcdca0..101df3c 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -62,7 +60,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -89,6 +86,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 1859b9b..5f4a8d4 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 1b94489..a0f92ff 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 d54be00..8308d55 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -66,7 +64,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -91,6 +88,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Traffic should pass with maximum rate

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 dd8d149..9a677ac 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -71,7 +69,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -98,6 +95,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search

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 bf4027b..077c8bf 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 a4f6d51..aae9ffa 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 ddebc3d..a359b8f 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 5c47bf4..7fc86b0 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 4114e62..c7ca9e2 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -59,7 +57,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -84,6 +81,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 9512b8e..c9e0205 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -63,7 +61,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -90,6 +87,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_limit} | ${framesize}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 f0b1eb6..c139715 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -68,7 +66,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -94,6 +91,7 @@
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | ... | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Traffic should pass with maximum rate

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 4238e17..dfdffb7 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -73,7 +71,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -101,6 +98,7 @@
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | ... | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | When Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search

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 d2fe4ef..a3794e8 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -61,7 +59,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -86,6 +83,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 8159d1c..0a6bd1e 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,7 +63,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -92,6 +89,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 e6f7b79..73a27a4 100644 (file)
--- a/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -21,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -61,7 +59,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -86,6 +83,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 9985073..a559142 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,7 +63,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -92,6 +89,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 bfb5d35..97cd183 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -61,7 +59,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -86,6 +83,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 62022fc..fe0b6de 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 2-node performance topology with container
+| Suite Teardown | Tear down 2-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,7 +63,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -92,6 +89,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 1aa9a7d..8bcb556 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -61,7 +59,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -86,6 +83,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 539e9c0..e1274f7 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,7 +63,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -92,6 +89,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 514443c..4ce2c68 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -60,7 +58,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -85,6 +82,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 464c88f..aaf4046 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -64,7 +62,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | LXC
 | ${container_chain_topology}= | chain
 
@@ -91,6 +88,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}

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 f972df9..5646565 100644 (file)
--- 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,16 +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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance mrr test
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -61,7 +59,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -86,6 +83,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

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 4a2d939..2cc1f00 100644 (file)
--- 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,17 +21,15 @@
 | ... | 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 | chains=${1}
-| ... | nodeness=${1}
 | ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'CNF' containers
+| Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
 | ...
@@ -65,7 +63,6 @@
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 # Container
-| ${cpu_count_int}= | ${4}
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain
 
@@ -92,6 +89,7 @@
 | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
 | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
 | | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}