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/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot') 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} -- cgit 1.2.3-korg