From fcc77752111a4fbe8caa341cf5249efbad305a2a Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 18 Oct 2019 14:15:32 +0000
Subject: Tests: Introduce driver layer

+ Small bugfixes in various suites

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I051af0a6da7340fe3f617400370c3846ca5241ab
---
 .../container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot | 4 +++-
 .../eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot          | 4 +++-
 .../eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot                | 4 +++-
 .../container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'tests/vpp/device/container_memif')

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 5e0ccff596..2cbea18243 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
@@ -42,6 +42,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -67,7 +68,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Send packet and verify headers
 | | ... | ${tg} | 10.10.10.1 | 20.20.20.1
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 4a3da26b79..ec49c7ab88 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
@@ -41,6 +41,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -66,7 +67,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | 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
 | | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize L2 Bridge Domain with memif pairs | auto_scale=${False}
 | | Then Send ICMPv4 bidirectionally and verify received packets
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 a8c0d78745..0c88aaef8e 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
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -65,7 +66,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | 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
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
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 cece7f0f6a..67812dd4f8 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
@@ -42,6 +42,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -67,7 +68,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Set interfaces in path up
 | | And Set up memif interfaces on DUT node
 | | ... | ${dut1} | memif-DUT1_CNF | memif-DUT1_CNF
-- 
cgit 1.2.3-korg