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/device/l2bd | |
| 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/device/l2bd')
3 files changed, 17 insertions, 15 deletions
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot index 52830e6d1b..6fb6da40a7 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot @@ -18,7 +18,7 @@ | ... | NIC_Virtual | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP | ... | Suite Setup | Setup suite single link | avf | scapy -| Suite Teardown | Tear down suite | vifs +| Suite Teardown | Tear down suite | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -46,8 +46,8 @@ | ... | *[Ref] Applicable standard specifications:* IEEE 802.1q. *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so | gbp_plugin.so -| ... | acl_plugin.so +| @{plugins_to_enable}= | avf_plugin.so | gbp_plugin.so | acl_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | avf | ${overhead}= | ${4} @@ -69,9 +69,9 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add DPDK no PCI to all DUTs -| | And Set Max Rate And Jumbo +| | 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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot index 807933d4cc..55e56ba932 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot @@ -18,7 +18,7 @@ | ... | NIC_Virtual | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | avf | scapy -| Suite Teardown | Tear down suite | vifs +| Suite Teardown | Tear down suite | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -38,7 +38,8 @@ | ... | *[Ref] Applicable standard specifications:* IEEE 802.1q. *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| @{plugins_to_enable}= | avf_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | avf | ${overhead}= | ${4} @@ -59,9 +60,9 @@ | | ... | | Set Test Variable | \${frame_size} | | ... -| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add DPDK no PCI to all DUTs -| | And Set Max Rate And Jumbo +| | 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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot index 033f5c4192..69430d2f85 100644 --- a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP +| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -59,9 +60,9 @@ | | ... | | 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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface |