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 | |
| 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')
36 files changed, 212 insertions, 144 deletions
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot index 2cbea18243..2c43924150 100644 --- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-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 | MEMIF | DOCKER +| ... | NIC_Virtual | ETH | IP4FWD | BASE | MEMIF | DOCKER | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -41,6 +41,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -64,11 +65,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 Start containers for test | auto_scale=${False} | pinning=${False} | | And Initialize IPv4 routing with memif pairs | | Then Send packet and verify headers diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot index ec49c7ab88..643879a086 100644 --- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-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 | MEMIF | DOCKER +| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -40,6 +40,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -63,9 +64,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 diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot index 0c88aaef8e..83e9f8a81e 100644 --- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-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 | MEMIF | DOCKER +| ... | NIC_Virtual | ETH | L2XCFWD | BASE | MEMIF | DOCKER | 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 | memif_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -62,11 +63,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 Start containers for test | auto_scale=${False} | pinning=${False} | | And Initialize L2 xconnect with memif pairs | | Then Send ICMPv4 bidirectionally and verify received packets diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot index 67812dd4f8..3d6836f3b2 100644 --- a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-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 | MEMIF | DOCKER +| ... | NIC_Virtual | ETH | IP6FWD | BASE | MEMIF | DOCKER | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -41,6 +41,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -64,11 +65,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 Start containers for test | auto_scale=${False} | pinning=${False} | | And Set interfaces in path up | | And Set up memif interfaces on DUT node diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot index 648bb17fc7..72ba5935ff 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | IP4FWD | IPSEC | IPSECSW | IPSECTUN | IP4BASE -| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES +| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | 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_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -70,11 +71,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 | | ... -| | 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 Configure topology for IPv4 IPsec testing | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot index 2e43f71284..84b38364e6 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | IP4FWD | IPSEC | IPSECSW | IPSECTPT | IP4BASE -| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES +| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | 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_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -70,11 +71,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 | | ... -| | 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 Configure topology for IPv4 IPsec testing | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot index e4107084c7..f3a8ba1e86 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | IP6FWD | IPSEC | IPSECSW | IPSECTUN | IP6BASE -| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES +| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | 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_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -71,11 +72,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 | | ... -| | 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 Configure topology for IPv6 IPsec testing | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot index 5e323edfcc..473cd001a9 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | IP6FWD | IPSEC | IPSECSW | IPSECTPT | IP6BASE -| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES +| ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | 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_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${58} @@ -71,11 +72,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 | | ... -| | 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 Configure topology for IPv6 IPsec testing | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot index 12d8304ae6..30af46ed3b 100644 --- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-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 | 1TAP +| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE | 1TAP | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | namespace @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -67,9 +68,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 diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot index 4d7a4f41e6..36fb0e92e5 100644 --- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE | 1TAP | NAMESPACE +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | namespace @@ -39,6 +40,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -68,9 +70,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 diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot index 3bfe6e1709..1c3d543390 100644 --- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-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 | L2BD | BASE | 2TAP +| ... | NIC_Virtual | ETH | L2BD | BASE | 2TAP | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | namespace @@ -40,6 +40,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${0} @@ -60,9 +61,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 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 diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot index 19a6c40a7f..5a3b097fb0 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -39,6 +40,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${50} @@ -58,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 diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot index c905386e3c..e3fb0c9c07 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot @@ -16,6 +16,7 @@ | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY | ... | NIC_Virtual | L2XCBASE | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY +| ... | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -38,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${50} @@ -57,9 +59,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 diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot index 813b77a112..2c95bfa9cb 100644 --- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot +++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot @@ -14,11 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -# Import configuration and test data: | Variables | resources/test_data/lisp/lisp.py | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | IP4FWD | LISP_IP4o4 +| ... | NIC_Virtual | IP4FWD | LISP_IP4o4 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -44,6 +43,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -62,11 +62,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 Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot index 8d7126c680..866e31c17c 100644 --- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot +++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot @@ -14,11 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -# Import configuration and test data: | Variables | resources/test_data/lisp/lisp.py | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | IP4FWD | LISPGPE_IP4o4 +| ... | NIC_Virtual | IP4FWD | LISPGPE_IP4o4 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -44,6 +43,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -63,11 +63,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 Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot index 5beaa33e11..8a556b12bd 100644 --- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot +++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot @@ -14,11 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -# import additional Lisp settings from resource file | Variables | resources/test_data/lisp/lisp.py | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | IP4FWD | LISPGPE_IP6o4 +| ... | NIC_Virtual | IP4FWD | LISPGPE_IP6o4 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -44,6 +43,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -64,11 +64,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 Configure topology for IPv6 LISPoIP4 testing | | And Vpp All RA Suppress Link Layer | ${nodes} | | And Configure LISP in 2-node circular topology diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot index 051f206e5a..9a045f80cf 100644 --- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-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 | IP6BASE +| ... | NIC_Virtual | ETH | IP6FWD | BASE | IP6BASE | 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 IPv6 forwarding in circular topology | | ... | remote_host1_ip=3ffe:5f::1 | remote_host2_ip=3ffe:5f::2 | | Then Send IPv6 echo request packet and verify headers diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot index c9a3309eaa..ec7a4b3dd7 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-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 | IP6FWD | FEATURE | COPBLKLIST +| ... | NIC_Virtual | ETH | IP6FWD | 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 IPv6 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${True} | | And Vpp Route Add | ${dut1} | 2002:1::0 | 64 | vrf=1 | local=${True} diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot index fa017059ef..991494de69 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-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 | IP6FWD | FEATURE | COPWHLIST +| ... | NIC_Virtual | ETH | IP6FWD | 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 IPv6 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot index a214bc50b1..649731c172 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-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 | IP6FWD | FEATURE | IACLDST +| ... | NIC_Virtual | ETH | IP6FWD | 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 IPv6 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot index f87030f724..dc2e7dbfc2 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-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 | IP6FWD | FEATURE | POLICE_MARK +| ... | NIC_Virtual | ETH | IP6FWD | 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 IPv6 forwarding in circular topology | | And Initialize IPv6 policer 2r3c-'ca' in circular topology | | Then Send packet and verify marking diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot index 1147a663d9..f80338e779 100644 --- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot +++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot @@ -14,11 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -# Import configuration and test data: | Variables | resources/test_data/lisp/lisp.py | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | IP6FWD | LISPGPE_IP4o6 +| ... | NIC_Virtual | IP6FWD | LISPGPE_IP4o6 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -43,6 +42,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -63,11 +63,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 Configure topology for IPv4 LISPoIP6 testing | | And Vpp All RA Suppress Link Layer | ${nodes} | | And Configure LISP in 2-node circular topology diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot index 0ea8d6ed4a..b1430d9d6a 100644 --- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot +++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot @@ -14,11 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -# Import configuration and test data: | Variables | resources/test_data/lisp/lisp.py | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | IP6FWD | LISPGPE_IP6o6 +| ... | NIC_Virtual | IP6FWD | LISPGPE_IP6o6 | DRV_VFIO_PCI | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test @@ -44,6 +43,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} | ${nic_name}= | virtual | ${nic_driver}= | vfio-pci | ${overhead}= | ${54} @@ -63,11 +63,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 Configure topology for IPv6 LISP testing | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} 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 diff --git a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot index e12eb29dd0..3a6a1ecd26 100644 --- a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot +++ b/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-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 +| ... | NIC_Virtual | ETH | L2XCFWD | 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,11 +60,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 L2 xconnect in 2-node circular topology | | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg} | ${tg_if1} | ${tg_if2} 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 |