X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fvts%2F10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot;h=5e9e72938620c1b79007deb668737c0b99fcc4fb;hb=c502f71306e0334eeb9726836105b3580c5a426e;hp=40724effd8e465e0fb507d598838f105f1d06108;hpb=6871d4e7f6ed43ce0bb003cb08e88b2581a474eb;p=csit.git

diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index 40724effd8..5e9e729386 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-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 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
 | ... | VHOST | VM | VHOST_1024 | VTS | ACL_PERMIT_REFLECT
 | ...
-| 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 | vhost
 | ...
 | Test Template | Local Template
@@ -55,6 +51,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
+| ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
 | ${overhead}= | ${50}
 | ${nf_dtcr}= | ${1}
@@ -65,7 +63,8 @@
 | ${dut1_bd_id2}= | 2
 | ${dut2_bd_id1}= | 1
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253
+| ${traffic_profile}=
+| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd
 | ${acl_type}= | permit+reflect
 
 *** Keywords ***
@@ -86,11 +85,11 @@
 | | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2
-| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2
+| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2
+| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
 | | Set interfaces in path up
@@ -98,6 +97,9 @@
 | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16
 | | @{permit_list} = | Create List | 10.0.0.1/32 | 10.0.0.2/32
+| | Run Keyword If | '${acl_type}' != '${EMPTY}'
+| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input
+| | ... | ${acl_type} | @{permit_list}
 | | And Configure chains of NFs connected via vhost-user on single node
 | | ... | node=DUT1 | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | ... | jumbo=${jumbo} | use_tuned_cfs=${False} | auto_scale=${True}