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/ip4_tunnels | |
| 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/ip4_tunnels')
8 files changed, 48 insertions, 48 deletions
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot index c975bfe279..ac91f41193 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot @@ -12,17 +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 | L2BDMACLRN | SCALE | L2BD_100 | DOT1Q | VLAN_100 | ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_100 | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -77,7 +77,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot index 30305a3fba..d70428b488 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot @@ -12,17 +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 | L2BDMACLRN | SCALE | L2BD_10 | DOT1Q | VLAN_10 | ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_10 | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -77,7 +77,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot index bb63138137..d195ccd566 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot @@ -12,17 +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 | L2BDMACLRN | SCALE | L2BD_1K | DOT1Q | VLAN_1K | ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1K | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -77,7 +77,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot index d265e6b677..a52533df6f 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot @@ -12,17 +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 | L2BDMACLRN | SCALE | L2BD_1 | DOT1Q | VLAN_1 | ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1 | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -77,7 +77,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot index d5067061de..4fd4e9aea0 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot | Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY | ... -| 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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC6830. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${8} # Traffic profile: @@ -75,7 +75,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot index 427018a5c5..ba56397992 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot | Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY | ... -| 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 | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC6830. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${48} # Traffic profile: @@ -75,7 +75,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot index 03301cf601..0b3d0a7544 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-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 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -48,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -72,7 +72,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot index bc24674711..4e90a376ff 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-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 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${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 | ... | Test Template | Local Template @@ -48,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} # Traffic profile: @@ -72,7 +72,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search |