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 --- .../srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot | 4 ++-- .../srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot | 4 ++-- ...e2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot | 4 ++-- .../10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot | 6 ++---- .../10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot | 6 ++---- .../10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot | 6 ++---- 6 files changed, 12 insertions(+), 18 deletions(-) (limited to 'tests/vpp/perf/srv6') diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot index cc6fd3aa7e..8e36a25b88 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot @@ -19,10 +19,10 @@ | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | ${nic_name} -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with SRv6 with encapsulation +| Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template | ... diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot index bbcd155960..0cf678fa65 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot @@ -19,10 +19,10 @@ | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | ${nic_name} -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with SRv6 with encapsulation +| Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template | ... diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot index 8a96b69bef..5843dcb203 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot @@ -19,10 +19,10 @@ | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | ${nic_name} -| Suite Teardown | Tear down 3-node performance topology +| Suite Teardown | Tear down suite | performance | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with SRv6 with encapsulation +| Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template | ... diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot index d05e271d64..52d7b3e0fb 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot @@ -23,12 +23,10 @@ | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance test suite with Dynamic SRv6 proxy -| 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 with SRv6 with encapsulation -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template | ... diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot index 43d5785a21..237162c21f 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot @@ -23,12 +23,10 @@ | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance test suite with Masquerading SRv6 proxy -| 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 with SRv6 with encapsulation -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template | ... diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot index 3997f7e267..637eccee1b 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot @@ -23,12 +23,10 @@ | ... | ${nic_name} | ... | AND | Set up performance test suite with MEMIF | ... | AND | Set up performance test suite with Static SRv6 proxy -| 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 with SRv6 with encapsulation -| ... | AND | Tear down performance test with container +| Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template | ... -- cgit 1.2.3-korg