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/container_memif | |
| 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/container_memif')
4 files changed, 23 insertions, 16 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 |