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/srv6 | |
| 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/srv6')
6 files changed, 48 insertions, 40 deletions
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot index 1bedcffd86..d91b9819f4 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID +| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,10 +50,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header: 40B +| ${osi_layer}= | L3 | ${overhead}= | ${40} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -94,11 +94,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 IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot index 50e723e60a..ab6be185bf 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_DECAP +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,10 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header + SRH with 2 SIDs: 40+40B +| ${osi_layer}= | L3 | ${overhead}= | ${80} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -97,11 +98,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 IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot index dd46569cb6..655a418caa 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_NODECAP +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -50,10 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header + SRH with 2 SIDs: 40+40B +| ${osi_layer}= | L3 | ${overhead}= | ${80} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -97,11 +98,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 IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot index 72d6fe91d2..43fd06bc2f 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY -| ... | SRv6_PROXY_DYN | MEMIF | LXC +| ... | SRv6_PROXY_DYN | MEMIF | LXC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,10 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6ad_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B +| ${osi_layer}= | L3 | ${overhead}= | ${96} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -110,11 +110,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 Start containers for test | nf_chains=${1} | nf_nodes=${1} | | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot index 76338a552d..b0f27432b4 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY -| ... | SRv6_PROXY_MASQ | MEMIF | LXC +| ... | SRv6_PROXY_MASQ | MEMIF | LXC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,10 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6am_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B +| ${osi_layer}= | L3 | ${overhead}= | ${96} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -110,11 +110,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 Start containers for test | nf_chains=${1} | nf_nodes=${1} | | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot index 2227b4c9b9..6216f4ec93 100644 --- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot +++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY -| ... | SRv6_PROXY_STAT | MEMIF | LXC +| ... | SRv6_PROXY_STAT | MEMIF | LXC | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance @@ -51,10 +51,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6as_plugin.so -| ${osi_layer}= | L3 +| ${crypto_type}= | ${None} | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci -# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B +| ${osi_layer}= | L3 | ${overhead}= | ${96} # SIDs | ${dut1_sid1}= | 2002:1:: @@ -110,11 +110,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 Start containers for test | nf_chains=${1} | nf_nodes=${1} | | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology | | Then Find NDR and PDR intervals using optimized search |