X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_setup.robot;h=407819637233288b44db4b6a38d3374a9f87c4ab;hb=852b10b6724f0ae221e45f1ccb3f8020077b1f33;hp=0f11deab394f433afa531e2e05e9cd7232f649fd;hpb=f4984a65cb0ed91220b45cd8d9c0ae698005089d;p=csit.git

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 0f11deab39..4078196372 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -468,19 +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
-| | ...
-| | Set Suite Variable | @{container_groups} | @{EMPTY}
-| | Construct VNF containers on all DUTs
-| | Acquire all 'VNF' containers
-| | Create all 'VNF' containers
-| | Configure VPP in all 'VNF' containers
-| | Stop VPP service on all DUTs | ${nodes}
-| | Install VPP in all 'VNF' 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.
@@ -591,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
@@ -645,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
@@ -670,7 +666,6 @@
 | | Run Keyword If Test Failed
 | | ... | Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
 | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
-| | Show IP FIB On All DUTs
 
 | Tear down performance mrr test
 | | [Documentation] | Common test teardown for max-received-rate performance
@@ -678,7 +673,6 @@
 | | ...
 | | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
-| | Show IP FIB On All DUTs
 
 | Tear down performance test with wrk
 | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
@@ -692,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.
@@ -776,7 +777,7 @@
 | | ... | ${rate} | ${framesize} | ${topology_type}
 | | ... | ${dut1_node} | ${dut1_vm_refs}
 | | ... | ${dut2_node} | ${dut2_vm_refs}
-| | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
 | | Run Keyword If Test Failed | Run Keyword And Ignore Error
 | | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
@@ -796,7 +797,7 @@
 | | Tear down mrr test with vhost and VM with dpdk-testpmd
 | | ... | ${dut1_node} | ${dut1_vm_refs}
 | | ... | ${dut2_node} | ${dut2_vm_refs}
-| | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
 | | Run Keyword If Test Failed | Run Keyword And Ignore Error
 | | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
@@ -925,7 +926,7 @@
 | | ...
 | | Tear down performance discovery test | ${rate} | ${framesize}
 | | ... | ${traffic_profile}
-| | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
 | | Run Keyword If Test Failed | Run Keyword And Ignore Error
 | | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
@@ -938,7 +939,7 @@
 | | ... | \| Tear down mrr test with ACL \|
 | | ...
 | | Tear down performance mrr test
-| | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
 | | Run Keyword If Test Failed | Run Keyword And Ignore Error
 | | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}