From ac89ba8a39355a4a761508870ea0e08212ef7aee Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Mon, 21 Oct 2019 08:49:59 +0000
Subject: Introduce pre-initialize driver layer

+ This will help unify driver base differences between TCs.
+ Decrease amount of logic needed for suite generator.

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I1e84ba361dc1e829f0612c58a61096e2633ce0c5
---
 ...ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot')

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 c1c081e0ff..c3bcb033e6 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
@@ -13,12 +13,10 @@
 
 *** Settings ***
 | 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 | SRC_USER_10
-| ... | SCALE
+| ... | SCALE | DRV_VFIO_PCI
 | ...
 | Suite Setup | Setup suite single link | performance
 | Suite Teardown | Tear down suite | performance
@@ -50,16 +48,17 @@
 
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
-| ${osi_layer}= | L3
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
+| ${osi_layer}= | L3
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-10u15p
 
 *** Keywords ***
 | Local Template
-| | [Documentation] | FIXME.
+| | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
@@ -74,12 +73,13 @@
 | | ...
 | | Set Test Variable | \${frame_size}
 | | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | Given Set Max Rate And Jumbo
+| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
+| | And Pre-initialize layer driver | ${nic_driver}
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
-- 
cgit 1.2.3-korg