X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fvpp%2Fperf%2Fl2%2F2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot;h=698d0a22840b685313ddc82f11df130e925ea6bb;hb=d68951ac245150eeefa6e0f4156e4c1b5c9e9325;hp=b582bcaf9e762536367f61fbe5a9d414ac659690;hpb=e6dd772435e4736170aaa43a779840196e714254;p=csit.git

diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
index b582bcaf9e..698d0a2284 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
@@ -13,26 +13,26 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| ...
+|
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP
-| ...
+|
 | Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance | vifs
+| Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test
 | Test Teardown | Tear down test | performance
-| ...
+|
 | Test Template | Local template
-| ...
+|
 | Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q and GBP test
 | ... | cases*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \
 | ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 .
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with:\
-| ... | 2 VLAN subinterfaces (VID 200 and 300),\
+| ... | 2 VLAN subinterfaces (VID 100 and 200),\
 | ... | 1 L2 BD with the 2 VLAN subinterfaces and a BVI,\
 | ... | 1 GBP L3 RD,\
 | ... | 1 GBP L2 BD with the L2 BD,\
@@ -55,13 +55,14 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so | gbp_plugin.so
-| ... | acl_plugin.so
-| ${osi_layer}= | L2
+| @{plugins_to_enable}= | avf_plugin.so | gbp_plugin.so | acl_plugin.so
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
+| ${osi_layer}= | L2
 | ${overhead}= | ${4}
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254
+| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi
 
 *** Keywords ***
 | Local template
@@ -69,22 +70,22 @@
 | | ... | [Cfg] DUT runs L2BD with VLAN and GBP config with ${phy_cores}\
 | | ... | physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
 | | ... | Type: integer, string
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
+| |
 | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
+| |
 | | 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
-| | And 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 layer dot1q
 | | And Initialize GBP routing domains