X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot;h=203193e32e2a9e05e96620c570adee96025d43d8;hb=fcc77752111a4fbe8caa341cf5249efbad305a2a;hp=4c42e50f9408f7f481c5daf528860742d8ba7915;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1;p=csit.git

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 4c42e50f94..203193e32e 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,24 +12,20 @@
 # 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 Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | acl
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput IPv4 test cases with ACL*
+| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
@@ -50,13 +46,17 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
+| ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
 | ${acl_apply_type}= | input
 | ${no_hit_aces_number}= | 50
 | ${flows_per_dir}= | 10k
+| ${ip_nr}= | ${10}
 # starting points for non-hitting ACLs
 | ${src_ip_start}= | 30.30.30.1
 | ${dst_ip_start}= | 40.40.40.1
@@ -66,6 +66,7 @@
 | ${port_step}= | ${1}
 | ${trex_stream1_subnet}= | 10.10.10.0/24
 | ${trex_stream2_subnet}= | 20.20.20.0/24
+# Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4udp-10u1000p-conc
 
 *** Keywords ***
@@ -88,10 +89,11 @@
 | | ...
 | | 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
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***