From ac89ba8a39355a4a761508870ea0e08212ef7aee Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 21 Oct 2019 08:49:59 +0000 Subject: Introduce pre-initialize driver layer + This will help unify driver base differences between TCs. + Decrease amount of logic needed for suite generator. Signed-off-by: Peter Mikus Change-Id: I1e84ba361dc1e829f0612c58a61096e2633ce0c5 --- ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot') diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 5eca71c9df..8d3b48ea0c 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM | ... | VHOST_1024 | LBOND | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34 -| ... | LBOND_2L | NF_VPPL2XC +| ... | LBOND_2L | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite double link | performance | Suite Teardown | Tear down suite | performance @@ -54,9 +54,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${4} | ${subid}= | 10 | ${tag_rewrite}= | pop-1 @@ -89,12 +90,13 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs +| | Given Set Max Rate And Jumbo +| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} +| | And Pre-initialize layer driver | ${nic_driver} | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology -| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} -- cgit 1.2.3-korg