From 1577123a3c27541181097cb4186aa8855f20b1cc Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Jun 2019 12:15:56 +0000 Subject: 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 --- .../perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot | 14 ++++++-------- .../vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot | 12 ++++++------ ...0ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot | 12 ++++++------ .../10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot | 12 ++++++------ ...ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 12 ++++++------ .../vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot | 12 ++++++------ .../ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot | 12 ++++++------ .../perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot | 12 ++++++------ .../perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot | 12 ++++++------ ...x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot | 16 +++++++--------- ...1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot | 16 +++++++--------- ...x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot | 16 +++++++--------- ...x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot | 16 +++++++--------- .../ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot | 16 +++++++--------- ...x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot | 14 ++++++-------- ...710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot | 14 ++++++-------- ...x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot | 14 ++++++-------- ...10-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot | 16 ++++++---------- ...ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot | 14 ++++++-------- ...thip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot | 14 ++++++-------- ...hip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot | 16 +++++++--------- ...hip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot | 14 ++++++-------- ...hip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot | 14 ++++++-------- .../perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot | 13 ++++++------- ...ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 12 ++++++------ .../ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot | 12 ++++++------ .../2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot | 12 ++++++------ .../ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot | 12 ++++++------ .../ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot | 12 ++++++------ ...1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot | 16 +++++++--------- ...1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot | 16 +++++++--------- ...x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot | 16 +++++++--------- ...x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot | 16 +++++++--------- ...2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot | 14 ++++++-------- 63 files changed, 388 insertions(+), 489 deletions(-) (limited to 'tests/vpp/perf/ip4') diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot index 770bc1199b..ba7f7e19b2 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot @@ -12,18 +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 | IP4FWD | BASE | IP4BASE | DRV_AVF | ... -| Suite Setup | Run Keywords -| ... | Set up SRIOV 3-node performance topology with DUT's NIC model -| ... | L3 | ${nic_name} | AVF -| ... | AND | Set up performance test suite with AVF driver +| Suite Setup | Setup suite single link | performance_avf | 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 @@ -49,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -73,7 +71,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add DPDK no PCI to all DUTs -| | Set Max Rate And Jumbo +| | And Set Max Rate And Jumbo | | And Apply startup configuration on all VPP DUTs | | When Initialize AVF interfaces | | When Initialize IPv4 forwarding in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot index 047265511f..8373afbca0 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-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 | IP4FWD | BASE | DOT1Q | IP4BASE | ... -| 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:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${4} | ${subid}= | 10 @@ -79,7 +79,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 IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot index 3df2710882..d3c4ebe23b 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-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 | Library | resources.libraries.python.Cop | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | COPWHLIST | ... -| 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 @@ -49,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -74,7 +74,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 IPv4 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot index 9c0be701d7..a4a3fcaa4b 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-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 | IP4FWD | FEATURE | IACLDST | ... -| 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 @@ -48,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -73,7 +73,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 IPv4 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 0d7e90b6e1..06d53762ea 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-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 | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... -| 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 @@ -49,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${cir}= | ${100} @@ -78,7 +78,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 IPv4 forwarding in circular topology | | And Initialize IPv4 policer 2r3c-'ca' in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot index fb4a7b4c6d..2d535372c1 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-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 | IP4FWD | BASE | IP4BASE | ... -| 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 @@ -47,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # 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 IPv4 forwarding in circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot index e9c38b92eb..983148decf 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-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 | IP4FWD | SCALE | FIB_200K | ... -| 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 @@ -47,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${100000} @@ -73,7 +73,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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot index 5d5e43aa52..72f9a88b3f 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-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 | IP4FWD | SCALE | FIB_20K | ... -| 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 @@ -47,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${10000} @@ -73,7 +73,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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot index 100f6aecf5..93763885e1 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-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 | IP4FWD | SCALE | FIB_2M | ... -| 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 @@ -47,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${1000000} @@ -73,7 +73,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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot index e6e05e8183..71419b5df9 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL10 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot index a1a8ea182d..3fa03d1c30 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL10 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot index e273aecfb2..61673c6dcf 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL10 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot index 4b5f14b065..261d1718c6 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL10 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot index 0e9f24ea43..0869a58cc8 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL10 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot index e5f28d21ff..d52f9d8c00 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL10 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot index 3531592fe7..642c802661 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL1 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot index f1f4095464..fc201e761c 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL1 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot index 76163dac5e..cecf7338ac 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # 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 | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL1 | 10K_FLOWS | ... -| 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 ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -89,7 +87,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot index 402290d6f6..049b649d03 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL1 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot index 4a813259b1..ae2cb58b77 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL1 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot index 510d06d0e9..c8fdba2eb8 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # 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 | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL1 | 10K_FLOWS | ... -| 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 ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -89,7 +87,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot index dea93d15f0..78d7679aaa 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL50 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot index 7245b54dd5..43cf6b4a29 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL50 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot index 3264aff08a..cf8a757ec7 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # 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 | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL50 | 10K_FLOWS | ... -| 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 ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -89,7 +87,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot index ca8d17739c..b1be819909 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL50 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot index 29cd2330ba..3fed11a167 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL50 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot index 06d8455ceb..2b457766d6 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # 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 | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL50 | 10K_FLOWS | ... -| 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 ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -89,7 +87,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot index 3c7a7f259b..6385bcd08d 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot @@ -12,21 +12,17 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | BASE | ... -| 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 NAT +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | nat | ... | Test Template | Local Template | ... @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -76,7 +74,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot index c31d0f34dc..6e43a21612 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL10 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot index 05cccd0a3c..7a902bc9d2 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL10 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot index 8a169dcfd6..56bad45cd2 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL10 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot index a39e028dd8..1b11aeb52a 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL10 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot index 423183c686..c971f7f362 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL10 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot index 10fc55d3cf..e4418146d8 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL10 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot index bcb2307146..5f23e46b96 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL1 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot index c42b93bb1f..1f41774a60 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL1 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot index 7f7221054f..3c1287e9b5 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL1 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot index 6f3be8a12e..24087530ca 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL1 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot index 54dd79a38f..b9d5ed18eb 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL1 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot index e2ecdf4998..a3aa66e59e 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL1 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot index 7da80ee6da..c1a61b7488 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL50 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot index 5c0c57d993..fa2e15f8aa 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL50 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot index 9ed6e3d45f..809fb624eb 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | OACL | ACL50 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot index 4415146918..18f4b1e5e7 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL50 | 100_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot index d8a3e1afd3..72f61ffac7 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL50 | 100K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 100 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot index ac9aa80d80..5eecf988a8 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot @@ -12,19 +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 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | OACL | ACL50 | 10K_FLOWS | ... -| 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 ACL +| 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 | acl | ... | Test Template | Local Template @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot index 5fd4446939..286fe22a21 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot @@ -12,22 +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/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... -| # TODO: Even with single user this is a scale test, as it uses 15 ports. -| # Update tags to better distinguish from base tests. | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | BASE | SRC_USER_1 | ... -| 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 NAT +| 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 | nat | ... | Test Template | Local Template @@ -54,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -78,7 +74,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot index f4b8b0fa5a..191cb78057 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... @@ -20,13 +20,9 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_10 | ... | SCALE | ... -| 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 NAT +| 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 | nat | ... | Test Template | Local Template @@ -53,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -77,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot index 8884d987ef..ee1a9d94e4 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... @@ -20,13 +20,9 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_100 | ... | SCALE | ... -| 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 NAT +| 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 | nat | ... | Test Template | Local Template @@ -53,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -77,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot index a32faceab5..16165ff33a 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... @@ -20,14 +20,10 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_1000 | ... | SCALE | ... -| 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 NAT +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | nat | ... | Test Template | Local Template | ... @@ -52,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -77,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot index 7f9b5947d7..2b99cf1dd3 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... @@ -20,13 +20,9 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_2000 | ... | SCALE | ... -| 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 NAT +| 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 | nat | ... | Test Template | Local Template @@ -53,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -77,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot index deec73bc10..72302bf082 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... @@ -20,13 +20,9 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_4000 | ... | SCALE | ... -| 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 NAT +| 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 | nat | ... | Test Template | Local Template @@ -53,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -77,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot index af7e7e904e..954e36dcdc 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot @@ -12,17 +12,14 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | ... -| Suite Setup | Set up 2-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 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${4} | ${subid}= | 10 @@ -79,7 +78,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 IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite} diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 7ab9466c67..7cc2eb6315 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-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 | Library | resources.libraries.python.Policer | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... -| Suite Setup | Set up 2-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 @@ -48,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${cir}= | ${100} @@ -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 IPv4 forwarding in circular topology | | And Initialize IPv4 policer 2r3c-'ca' in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot index b293dd5479..24d857d49d 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-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 | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | IP4BASE | ... -| Suite Setup | Set up 2-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 @@ -47,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -71,7 +71,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 IPv4 forwarding in circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot index 2c731a1f74..742cff1b65 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-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 | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_200k | ... -| Suite Setup | Set up 2-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 @@ -46,6 +44,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${100000} @@ -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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot index 4b7bc0b2b8..854764f6f6 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-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 | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_20k | ... -| Suite Setup | Set up 2-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 @@ -46,6 +44,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${10000} @@ -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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot index c2aa5ad559..c30789bb4a 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-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 | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_2M | ... -| Suite Setup | Set up 2-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 @@ -46,6 +44,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} | ${rts_per_flow}= | ${1000000} @@ -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 IPv4 forwarding with scaling in circular topology | | ... | ${rts_per_flow} diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot index f41fc5fc52..37d3e5f5f2 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL1 | 10K_FLOWS | ... -| Suite Setup | Run Keywords -| ... | Set up 2-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -50,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot index f5bf746d08..56dd8f985f 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL1 | 10K_FLOWS | ... -| Suite Setup | Run Keywords -| ... | Set up 2-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -50,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot index c2ef6423e7..d7f28986ed 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL | ... | IACL | ACL50 | 10K_FLOWS | ... -| Suite Setup | Run Keywords -| ... | Set up 2-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -50,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot index 9eadef6b6f..ef1cac7fd0 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot @@ -12,20 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS | ... | IACL | ACL50 | 10K_FLOWS | ... -| Suite Setup | Run Keywords -| ... | Set up 2-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with ACL +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test -| Test Teardown | Tear down test | performance +| Test Setup | Setup test +| Test Teardown | Tear down test | performance | acl | ... | Test Template | Local Template | ... @@ -50,6 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # ACL test setup @@ -88,7 +86,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 | | ${ip_nr}= | Set Variable | 10 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot index 88d0848018..59de2237a0 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot @@ -12,20 +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/ip/nat.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | BASE | ... -| Suite Setup | Run Keywords -| ... | Set up 2-node performance topology with DUT's NIC model | L3 -| ... | ${nic_name} -| ... | AND | Set up performance test suite with NAT +| 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 @@ -51,6 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # Traffic profile: @@ -76,7 +74,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 Add NAT to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize NAT44 in circular topology -- cgit 1.2.3-korg