diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-06-21 12:15:56 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-06-25 06:02:52 +0000 |
| commit | 1577123a3c27541181097cb4186aa8855f20b1cc (patch) | |
| tree | 8db2e4a954e97f7734988fd3d10b69504f370998 /tests/vpp/perf/srv6 | |
| parent | cac8f76ce1f9085e9eede19b250f4a4cb9b199e0 (diff) | |
Align suite/test teardown/setup
+ Phase II - aligning FUNC/PERF setup.
+ 2n/3n compatibility of suite setup.
+ Same structure of testcase for DEV/PERF.
+ DEVICE tests are now running VPP startup config in same
way as PERF.
+ DEVICE is using COREKEEPER!
- DEVICE tests are running topology compute twice for backward
compatibility. TODO to remove.
- Still phase III needed to align TAGS, LIBRARIES and remove OLD
setup phase.
Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/perf/srv6')
6 files changed, 30 insertions, 39 deletions
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 8e36a25b88..ecb52a657c 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot @@ -12,16 +12,14 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L3 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | draft 3. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header: 40B | ${overhead}= | ${40} 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 0cf678fa65..6ebcd7f66c 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot @@ -12,16 +12,14 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_DECAP | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L3 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | draft 3. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header + SRH with 2 SIDs: 40+40B | ${overhead}= | ${80} 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 5843dcb203..29d234fc83 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 @@ -12,16 +12,14 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_NODECAP | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L3 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | draft 3. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header + SRH with 2 SIDs: 40+40B | ${overhead}= | ${80} 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 52d7b3e0fb..292a4ae225 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 @@ -12,20 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY | ... | SRv6_PROXY_DYN | MEMIF | LXC | ... -| Suite Setup | Run Keywords -| ... | Set up 3-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with MEMIF -| ... | AND | Set up performance test suite with Dynamic SRv6 proxy +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template @@ -55,6 +50,8 @@ | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6ad_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B | ${overhead}= | ${96} 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 237162c21f..1f9660ed86 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 @@ -12,20 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY | ... | SRv6_PROXY_MASQ | MEMIF | LXC | ... -| Suite Setup | Run Keywords -| ... | Set up 3-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with MEMIF -| ... | AND | Set up performance test suite with Masquerading SRv6 proxy +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template @@ -55,6 +50,8 @@ | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6am_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B | ${overhead}= | ${96} 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 637eccee1b..1b4dfd4d60 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 @@ -12,20 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY | ... | SRv6_PROXY_STAT | MEMIF | LXC | ... -| Suite Setup | Run Keywords -| ... | Set up 3-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with MEMIF -| ... | AND | Set up performance test suite with Static SRv6 proxy +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | srv6 | container | ... | Test Template | Local Template @@ -55,6 +50,8 @@ | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6as_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B | ${overhead}= | ${96} |