X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fl2%2F2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot;h=87f80dca5013546583bae025c793409e7327366f;hb=ac89ba8a39355a4a761508870ea0e08212ef7aee;hp=82c10d1cb089a7872804dffa7cee996a6484c448;hpb=8bac3376ddbefc0c4e668f57f4d7083c276dbc7b;p=csit.git

diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index 82c10d1cb0..87f80dca50 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-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 | L2XCFWD | BASE | L2XCBASE | DRV_AVF
 | ...
-| Suite Setup | Run Keywords
-| ... | Set up SRIOV 2-node performance topology with DUT's NIC model
-| ... | L2 | ${nic_name} | AVF
-| ... | AND | Set up performance test suite with AVF driver
-| 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_avf
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
 | ...
 | Test Template | Local template
 | ...
@@ -48,7 +44,11 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
+| @{plugins_to_enable}= | avf_plugin.so
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
+| ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -70,11 +70,12 @@
 | | ...
 | | Set Test Variable | \${frame_size}
 | | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add DPDK no PCI to all DUTs
-| | Set Max Rate And Jumbo
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | 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
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 Xconnect In 2-node Circular Topology
 | | Then Find NDR and PDR intervals using optimized search
 
@@ -103,6 +104,18 @@
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
+| tc07-9000B-1c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
 | tc10-IMIX-1c-avf-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}