| ... | 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
| ...
| ... | *[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,\
| ... | *[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
| | ...
| | 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