diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-10-21 08:49:59 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-10-25 07:09:03 +0000 |
| commit | ac89ba8a39355a4a761508870ea0e08212ef7aee (patch) | |
| tree | 67383d5d7827390a448ba4afc48a36302437bd53 /tests/vpp/perf/vts | |
| parent | 23b5bfe679371df276db4713f6089655b0e9bc56 (diff) | |
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 <pmikus@cisco.com>
Change-Id: I1e84ba361dc1e829f0612c58a61096e2633ce0c5
Diffstat (limited to 'tests/vpp/perf/vts')
3 files changed, 24 insertions, 21 deletions
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot index 6f3eb7e27f..3b02285b0b 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-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 | VM | VHOST_1024 | VTS | ACL_PERMIT +| ... | VHOST | VM | VHOST_1024 | VTS | ACL_PERMIT | 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 | acl_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -85,16 +86,16 @@ | | ... | | 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 | ${nic_driver} +| | And Initialize layer interface | | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | When Initialize layer driver | ${nic_driver} -| | And Set interfaces in path up | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16 diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot index 36528cb713..833c3869f5 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-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 | VM | VHOST_1024 | VTS | ACL_PERMIT_REFLECT +| ... | VHOST | VM | VHOST_1024 | VTS | ACL_PERMIT_REFLECT | 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 | acl_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -85,16 +86,16 @@ | | ... | | 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 | ${nic_driver} +| | And Initialize layer interface | | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | When Initialize layer driver | ${nic_driver} -| | And Set interfaces in path up | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16 diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot index ad4c5ca8b8..1c77f93a4c 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-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 | VM | VHOST_1024 | VTS +| ... | VHOST | VM | VHOST_1024 | VTS | 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}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci +| ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} | ${nf_dtc}= | ${1} @@ -85,16 +86,16 @@ | | ... | | 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 | ${nic_driver} +| | And Initialize layer interface | | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} -| | When Initialize layer driver | ${nic_driver} -| | And Set interfaces in path up | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16 |