X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot;h=0c8aaa0988aa9c6ef717e1c4b6120376f0e9f8e8;hp=81fc3822db13e4d38a80f92fcd2a8e35e2d4675c;hb=1108807740e6c7d0b154ad8bb391bf0f35c550b9;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1

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 81fc3822db..0c8aaa0988 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,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 | 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 Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| 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
 | ...
@@ -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
@@ -58,6 +56,7 @@
 | ${acl_apply_type}= | input
 | ${no_hit_aces_number}= | 10
 | ${flows_per_dir}= | 100k
+| ${ip_nr}= | ${100}
 # starting points for non-hitting ACLs
 | ${src_ip_start}= | 30.30.30.1
 | ${dst_ip_start}= | 40.40.40.1
@@ -88,10 +87,10 @@
 | | ...
 | | 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
+| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***