diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-10-18 14:15:32 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-10-19 04:41:03 +0000 |
| commit | fcc77752111a4fbe8caa341cf5249efbad305a2a (patch) | |
| tree | dafa71db46e5ede25d50a45fd48ad3ec25bb617c /tests/vpp/device/vm_vhost | |
| parent | 510f6d5140db4512ff00a43bf5b8d2ddd1f4a064 (diff) | |
Tests: Introduce driver layer
+ Small bugfixes in various suites
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I051af0a6da7340fe3f617400370c3846ca5241ab
Diffstat (limited to 'tests/vpp/device/vm_vhost')
4 files changed, 12 insertions, 4 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 0e403e78af..eb86da9107 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 @@ -41,6 +41,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -68,7 +69,8 @@ | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize IPv4 forwarding with vhost in 2-node circular topology +| | When Initialize layer driver | ${nic_driver} +| | And Initialize IPv4 forwarding with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} 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 c0a4b30e8b..28dcc07d91 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 @@ -41,6 +41,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -68,7 +69,8 @@ | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize IPv6 forwarding with vhost in 2-node circular topology +| | When Initialize layer driver | ${nic_driver} +| | And Initialize IPv6 forwarding with vhost in 2-node circular topology | | ... | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_ip6 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 2c95459905..0070d39ef6 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 @@ -43,6 +43,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -70,7 +71,8 @@ | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize layer interface +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface | | ... | count=${nf_chains} | | And Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes} | | And Configure chains of NFs connected via vhost-user 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 d88d9a58f2..b50256791c 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 @@ -42,6 +42,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${nf_chains}= | ${1} | ${nf_nodes}= | ${1} | ${nf_dtc} | ${1} @@ -69,7 +70,8 @@ | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes} +| | When Initialize layer driver | ${nic_driver} +| | 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 | | ... | pinning=${False} |