From f3d66d9ca20e7fb2b153d83d809f005a93b76a8f Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 20 Apr 2018 13:57:02 +0200 Subject: [PATCH] FIX: Restart VPP in container before each test Change-Id: Iec7045aadc0675e04b8c74cbe28f8b3f193bcf1f Signed-off-by: Peter Mikus --- resources/libraries/python/ContainerUtils.py | 6 ++++++ .../libraries/robot/performance/performance_configuration.robot | 2 ++ resources/libraries/robot/shared/container.robot | 6 ++++++ .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 +++- .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot | 4 +++- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 4 +++- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot | 4 +++- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 +++- .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot | 4 +++- .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 +++- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot | 4 +++- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 +++- .../40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot | 4 +++- .../40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot | 4 +++- 14 files changed, 47 insertions(+), 11 deletions(-) diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 3bf3516e6d..4b891048fd 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -156,6 +156,12 @@ class ContainerManager(object): self.engine.install_vpp() self.engine.restart_vpp() + def restart_vpp_in_all_containers(self): + """Restart VPP on all containers.""" + for container in self.containers: + self.engine.container = self.containers[container] + self.engine.restart_vpp() + def configure_vpp_in_all_containers(self, vat_template_file): """Configure VPP in all containers. diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index b4f2fb7bae..46e0e5bb6c 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -2169,6 +2169,7 @@ | | | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2} | | | Run Keyword If | ${number}==${nr} | Configure L2XC | | | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2} +| | All Vpp Interfaces Ready Wait | ${nodes} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Show Memif | ${nodes['${dut}']} @@ -2216,6 +2217,7 @@ | | | ... | ${dut2-memif-${number}-if1} | ${number} | | | Add interface to bridge domain | ${dut2} | | | ... | ${dut2-memif-${number}-if2} | ${bd_id2} +| | All Vpp Interfaces Ready Wait | ${nodes} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Show Memif | ${nodes['${dut}']} diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 4b23236a96..f3f55e2907 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -101,6 +101,12 @@ | | ... | | Run Keyword | ${group}.Install VPP In All Containers +| Restart VPP in all '${group}' containers +| | [Documentation] | Restart VPP on all container(s) in specific container +| | ... | group on all DUT nodes. +| | ... +| | Run Keyword | ${group}.Restart VPP In All Containers + | Configure VPP in all '${group}' containers | | [Documentation] | Configure VPP on all container(s) in specific container | | ... | group on all DUT nodes. 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 3913aa5cbd..2b23565b77 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot index cf78e88979..b2811f2c10 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} 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 ded74eef9d..07b4b5772b 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot index 62e8fd3e12..17c92788e0 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} 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 75b7c38503..3eb51a1c54 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot index c9c3cc9a9f..e81198ede5 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} 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 27b87dbad5..680be42e85 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... 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 7bc617a151..ca5a069553 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... 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 f5bc14acd9..bcc15b4ee5 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... 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 a4674a1e18..5f1d49080d 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... 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 0160bf2b46..a34dca595d 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -25,7 +25,9 @@ | ... | Suite Teardown | Tear down 3-node performance topology with container | ... -| Test Setup | Set up performance test +| Test Setup | Run Keywords +| ... | Set up performance test +| ... | AND | Restart VPP in all 'VNF' containers | ... | Test Teardown | Tear down performance mrr test | ... -- 2.16.6