From 6871d4e7f6ed43ce0bb003cb08e88b2581a474eb Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 18 Jun 2019 20:31:48 +0000 Subject: Align suite/test teardown/setup + Phase I - aligning FUNC/PERF Change-Id: I46b1e43687ddb29f5ed3c6335fe1baf21ec02822 Signed-off-by: Peter Mikus --- .../10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot | 6 ++---- .../10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot | 6 ++---- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- .../10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot | 6 ++---- .../10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- ...1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- ...2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- .../2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- .../2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot | 6 ++---- 10 files changed, 20 insertions(+), 40 deletions(-) (limited to 'tests/vpp/perf/container_memif') 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 be7d3a8a09..8125605bc1 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 d7b7d6a1b9..bb6e551a70 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 363450820c..6ff0a962d4 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 b44bf23e67..86e7d9aebe 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 e245660aaa..49c5313cde 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 bd19bdac93..1c4a2a2b50 100644 --- 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,12 +21,10 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L3 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 c5dd6a71bb..a2948f6673 100644 --- 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,12 +21,10 @@ | ... | Set up 2-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 2-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 641080d924..cfcabc7ebd 100644 --- 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,12 +21,10 @@ | ... | Set up 2-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 2-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 81b7acd313..b3c16b0022 100644 --- 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,12 +21,10 @@ | ... | Set up 2-node performance topology with DUT's NIC model | L2 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 2-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... 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 0440f067e9..a0f2ac6bb4 100644 --- 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,12 +21,10 @@ | ... | Set up 2-node performance topology with DUT's NIC model | L3 | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF -| Suite Teardown | Tear down 2-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Run Keywords -| ... | Tear down performance test -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | container | ... | Test Template | Local Template | ... -- cgit 1.2.3-korg