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 --- ...-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...pplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...pplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...10-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 13 +++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 13 +++++++------ ...e2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot | 14 ++++++++------ ...4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...10-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 13 +++++++------ ...2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 13 +++++++------ ...e2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 14 ++++++++------ ...p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot | 14 ++++++++------ ...ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot | 14 ++++++++------ 28 files changed, 220 insertions(+), 168 deletions(-) (limited to 'tests/vpp/perf/vm_vhost') diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 9da3a8787d..98717be886 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_SINGLE_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_1L | VM_TESTPMD +| ... | LBOND_1L | VM_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -53,9 +53,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 @@ -88,12 +89,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 single 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} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index c308a54535..aca6ad6d98 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_SINGLE_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_1L | NF_VPPL2XC +| ... | LBOND_1L | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -53,9 +53,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 @@ -88,12 +89,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 single 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} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index a9c723b979..9ce108415f 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2XCFWD | BASE | VHOST | 1VM | ... | VHOST_1024 | LBOND | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34 -| ... | LBOND_1L | NF_TESTPMD +| ... | LBOND_1L | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -53,9 +53,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 @@ -86,12 +87,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 single 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 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 6c753cbf1c..c57d10c851 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2XCFWD | BASE | VHOST | 1VM | ... | VHOST_1024 | LBOND | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34 -| ... | LBOND_1L | NF_VPPL2XC +| ... | LBOND_1L | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -53,9 +53,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 @@ -86,12 +87,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 single 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 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index a40829235b..15915c1db9 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-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 | VM_TESTPMD +| ... | LBOND_2L | VM_TESTPMD | 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} 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} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index 7cf79c904c..c5d8e65fa0 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -17,7 +17,7 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2XCFWD | BASE | VHOST | 1VM | ... | VHOST_1024 | LBOND | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34 -| ... | LBOND_2L | NF_TESTPMD +| ... | LBOND_2L | NF_TESTPMD | 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 @@ -87,12 +88,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 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 2084d8f1da..3ec3d9c075 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-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 | L2XCFWD | 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 @@ -87,12 +88,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 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index bdb0e17a42..28c2a06c04 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM -| ... | VHOST_1024 | NF_TESTPMD +| ... | VHOST_1024 | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -52,9 +52,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -84,11 +85,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 4751d14163..8dfe92171f 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM -| ... | VHOST_1024 | NF_VPPL2XC +| ... | VHOST_1024 | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -52,9 +52,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -84,11 +85,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index 3897e2228f..1f723fe38d 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -80,11 +81,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 8511069d6b..7e9af95798 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPL2XC +| ... | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -80,11 +81,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index ee1fe539c4..ef19a8253b 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -78,11 +79,11 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | ... | count=${nf_chains} | | And Initialize L2 bridge domains for multiple chains with Vhost-User diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 0a88172c48..d6fd922dd3 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPL2XC +| ... | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -78,11 +79,11 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | ... | count=${nf_chains} | | And Initialize L2 bridge domains for multiple chains with Vhost-User diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index a167933224..226231e6c1 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 4a06f36e96..0f93baf698 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPL2XC +| ... | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot index f12fe17547..3ee2b60ffb 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | nf_nodes=${nf_nodes} | testpmd_mac=${TRUE} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot index 20f2beeb65..6d2ea070bf 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPIP4 +| ... | NF_VPPIP4 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index e5f7bf242c..55552ceca2 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY -| ... | VHOST | 1VM | VHOST_1024 | NF_TESTPMD +| ... | VHOST | 1VM | VHOST_1024 | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,9 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${50} | ${bd_id1}= | 1 | ${bd_id2}= | 2 @@ -81,11 +82,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index e70db2e210..ab8f42e43e 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY -| ... | VHOST | 1VM | VHOST_1024 | NF_VPPL2XC +| ... | VHOST | 1VM | VHOST_1024 | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,9 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${50} | ${bd_id1}= | 1 | ${bd_id2}= | 2 @@ -81,11 +82,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index c7d5410913..d44ae9c909 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM -| ... | VHOST_1024 | NF_TESTPMD +| ... | VHOST_1024 | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,9 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -83,11 +84,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 2a5c08297c..6a8d3466a8 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM -| ... | VHOST_1024 | NF_VPPL2XC +| ... | VHOST_1024 | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,9 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_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 @@ -83,11 +84,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | 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 in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot index 0b9c4422c7..9bfd07ea33 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -78,11 +79,11 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | ... | count=${nf_chains} | | And Initialize L2 bridge domains for multiple chains with Vhost-User diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 31f29c94dc..45fbfe8233 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPL2XC +| ... | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,9 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -78,11 +79,11 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | ... | count=${nf_chains} | | And Initialize L2 bridge domains for multiple chains with Vhost-User diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot index 92a05c51ca..559acc2467 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot index 1d9e309dda..4e26a4886b 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPL2XC +| ... | NF_VPPL2XC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L2 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L2 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot index 1678b17b10..ae1b86ec05 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_TESTPMD +| ... | NF_TESTPMD | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | testpmd_mac=${TRUE} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot index 8e9f63389e..6cb2f016be 100644 --- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | VHOST | 1VM | VHOST_1024 -| ... | NF_VPPIP4 +| ... | NF_VPPIP4 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +49,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${0} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -77,11 +78,12 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add PCI devices to all DUTs -| | And 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 -| | When Initialize layer driver | vfio-pci +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user -- cgit 1.2.3-korg