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/vm_vhost | |
| 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/vm_vhost')
4 files changed, 27 insertions, 11 deletions
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot index eb86da9107..ecdbc19e4b 100644 --- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-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 | VHOST | 1VM +| ... | NIC_Virtual | ETH | IP4FWD | BASE | VHOST | 1VM | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -40,8 +40,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci +| ${overhead}= | ${0} | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -66,10 +68,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 +| | 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 with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot index 28dcc07d91..8e4cf4e6cb 100644 --- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-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 | IP6FWD | BASE | VHOST | 1VM +| ... | NIC_Virtual | ETH | IP6FWD | BASE | VHOST | 1VM | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -40,8 +40,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci +| ${overhead}= | ${0} | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -66,10 +68,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 +| | 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 IPv6 forwarding with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot index 0070d39ef6..6b0e4853e0 100644 --- a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | VHOST | 1VM +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -42,8 +43,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci +| ${overhead}= | ${0} | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -68,8 +71,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 +| | 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/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot index b50256791c..c9b2e40d4f 100644 --- a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-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 | L2XCFWD | BASE | ICMP | VHOST | 1VM +| ... | NIC_Virtual | ETH | L2XCFWD | BASE | ICMP | VHOST | 1VM | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -41,8 +41,10 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci +| ${overhead}= | ${0} | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -67,10 +69,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 +| | 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 L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_l2xc |