X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fnfv_density%2Fdcr_memif%2Fpipeline%2F2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot;h=4ae39afabffb232b4d8ac063a133b0f54a96c430;hb=ac89ba8a39355a4a761508870ea0e08212ef7aee;hp=e52e84467689a998734005a054f57a97a69a7423;hpb=6871d4e7f6ed43ce0bb003cb08e88b2581a474eb;p=csit.git

diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
index e52e844676..4ae39afabf 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-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 | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R4C
 | ... | NF_DENSITY | PIPELINE | NF_VPPIP4 | 24DCR1T
 | ...
-| 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 MEMIF
+| 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 | container
 | ...
 | Test Template | Local Template
@@ -53,10 +49,16 @@
 | ... | addresses of the TG node interfaces.
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
+| ${osi_layer}= | L3
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c4n
 # Container
@@ -80,14 +82,17 @@
 | | ...
 | | Set Test Variable | \${frame_size}
 | | ...
-| | 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
+| | Given Set Max Rate And Jumbo
+| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
+| | And Pre-initialize layer driver | ${nic_driver}
 | | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${4} | auto_scale=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Start containers for test
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
 | | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${4} | auto_scale=${False}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***