From fcc77752111a4fbe8caa341cf5249efbad305a2a Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 18 Oct 2019 14:15:32 +0000 Subject: Tests: Introduce driver layer + Small bugfixes in various suites Signed-off-by: Peter Mikus Change-Id: I051af0a6da7340fe3f617400370c3846ca5241ab --- .../vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot | 4 +++- tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot | 4 +++- tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot | 4 +++- .../vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot | 4 +++- .../vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) (limited to 'tests/vpp/device/ip4_tunnels') 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 2f3fa31eb9..19a6c40a7f 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot @@ -40,6 +40,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${50} *** Keywords *** @@ -61,7 +62,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 Initialize layer ip4vxlan | | And Initialize L2 bridge domain | | Then Send VXLAN encapsulated packet and verify received packet 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 250867b827..c905386e3c 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${50} *** Keywords *** @@ -60,7 +61,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 Initialize layer ip4vxlan | | And Initialize L2 cross connect | | Then Send VXLAN encapsulated packet and verify received packet 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 db5b3227d4..813b77a112 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 @@ -45,6 +45,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${54} *** Keywords *** @@ -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 Configure topology for IPv4 LISP testing +| | When Initialize layer driver | ${nic_driver} +| | And Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} 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 f4b2cb50c1..8d7126c680 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 @@ -45,6 +45,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${54} | ${is_gpe}= | ${1} @@ -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 Configure topology for IPv4 LISP testing +| | When Initialize layer driver | ${nic_driver} +| | And Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} 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 402bfbfee2..5beaa33e11 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 @@ -45,6 +45,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${54} | ${ot_mode}= | 6to4 | ${is_gpe}= | ${1} @@ -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 Configure topology for IPv6 LISPoIP4 testing +| | When Initialize layer driver | ${nic_driver} +| | And Configure topology for IPv6 LISPoIP4 testing | | And Vpp All RA Suppress Link Layer | ${nodes} | | And Configure LISP in 2-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} -- cgit 1.2.3-korg