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/ip4_tunnels | |
| 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/ip4_tunnels')
8 files changed, 56 insertions, 38 deletions
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot index 4ec4b440af..65da751111 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | SCALE | L2BD_100 | DOT1Q | VLAN_100 -| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_100 +| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_100 | 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}= | ${50} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254 @@ -76,11 +77,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot index 38d7a0cb8d..7aa4fffa62 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | SCALE | L2BD_10 | DOT1Q | VLAN_10 -| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_10 +| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_10 | 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}= | ${50} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254 @@ -76,11 +77,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot index 25822c3663..8fcca4adb3 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | SCALE | L2BD_1K | DOT1Q | VLAN_1K -| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1K +| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1K | 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}= | ${50} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254 @@ -60,7 +61,6 @@ *** Keywords *** | Local Template -| | ... | | [Documentation] | | ... | [Cfg] Each DUT runs L2BD forwarding config with VLAN and VXLAN and\ | | ... | uses ${phy_cores} physical core(s) for worker threads. @@ -76,11 +76,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot index 65c62dc238..5a5d8b8aef 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | SCALE | L2BD_1 | DOT1Q | VLAN_1 -| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1 +| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1 | 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}= | ${50} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254 @@ -60,7 +61,6 @@ *** Keywords *** | Local Template -| | ... | | [Documentation] | | ... | [Cfg] Each DUT runs L2BD forwarding config with VLAN and VXLAN and\ | | ... | uses ${phy_cores} physical core(s) for worker threads. @@ -76,11 +76,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology | | ... | vxlan_count=${vxlan_count} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot index 5b730d3943..4cc274513c 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot @@ -18,6 +18,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +50,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}= | ${8} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253 @@ -74,11 +76,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot index 725ea9df71..b93774ab04 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot @@ -18,6 +18,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -49,9 +50,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}= | ${48} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253 @@ -74,11 +76,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot index 0e27771ded..59956e4893 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -47,9 +48,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} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 @@ -71,11 +73,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot index 3510e99127..cd9ff7ef51 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -47,9 +48,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} # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 @@ -71,11 +73,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 | ${nic_driver} +| | And Initialize layer interface | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search |