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/ip4 | |
| 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/ip4')
5 files changed, 30 insertions, 20 deletions
diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot index 1ff7cd731b..858f4f388e 100644 --- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-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 | IP4FWD | BASE | IP4BASE +| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -38,6 +38,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -57,11 +58,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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding in circular topology | | ... | remote_host1_ip=192.168.0.1 | remote_host2_ip=192.168.0.2 | | Then Send IPv4 ping packet and verify headers diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot index 35eb142aab..463afe8528 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-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 | IP4FWD | FEATURE | COPBLKLIST +| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | COPBLKLIST | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -38,6 +38,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -57,11 +58,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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE} diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot index e99e91dccc..7095bdec62 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-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 | IP4FWD | FEATURE | COPWHLIST +| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | COPWHLIST | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -38,6 +38,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -57,11 +58,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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE} diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot index a44da15189..cad9436277 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-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 | IP4FWD | FEATURE | IACLDST +| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | IACLDST | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -38,6 +38,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -58,11 +59,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 | with_trace=${True} | | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | And Initialize IPv4 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | 255.255.255.255 diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot index 5ed80aafde..04e3321957 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-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 | IP4FWD | FEATURE | POLICE_MARK +| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | POLICE_MARK | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -37,6 +37,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -61,11 +62,12 @@ | | Set Test Variable | \${cb} | ${frame_size} | | Set Test Variable | \${eb} | ${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 | | And Initialize IPv4 forwarding in circular topology | | And Initialize IPv4 policer 2r3c-'ca' in circular topology | | Then Send packet and verify marking |