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 --- tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot | 4 +++- .../vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot | 4 +++- .../vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot | 4 +++- tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot | 9 +++------ .../device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot | 9 +++------ 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tests/vpp/device/ip4') diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot index 0ce0430ce3..1ff7cd731b 100644 --- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${0} *** 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 IPv4 forwarding in circular topology +| | When Initialize layer driver | ${nic_driver} +| | 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 | | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2} 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 dce802d9aa..35eb142aab 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${0} *** 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 IPv4 forwarding in circular topology +| | When Initialize layer driver | ${nic_driver} +| | 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} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 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 0a1e5af08a..e99e91dccc 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${0} *** 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 IPv4 forwarding in circular topology +| | When Initialize layer driver | ${nic_driver} +| | 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} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 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 ccdc74f06a..a44da15189 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot @@ -39,6 +39,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${0} *** 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 IPv4 forwarding in circular topology +| | When Initialize layer driver | ${nic_driver} +| | 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 | | And Vpp Configures Classify Session L3 @@ -73,11 +75,6 @@ | | ... | ${tg} | 10.10.10.2 | 20.20.20.2 | | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} -# TODO: Add check of number of hits of the classify session after traffic -# Until there is implemented check of number of hits of the classify session -# after passing the traffic log the show classify tables verbose to allow visual -# check of hit number when needed. -| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-64B-ethip4-ip4base-iacldstbase-dev 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 de479f8cfa..5ed80aafde 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot @@ -38,6 +38,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci | ${overhead}= | ${0} | ${cir}= | ${100} | ${eir}= | ${150} @@ -64,16 +65,12 @@ | | 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 IPv4 forwarding in circular topology +| | When Initialize layer driver | ${nic_driver} +| | And Initialize IPv4 forwarding in circular topology | | And Initialize IPv4 policer 2r3c-'ca' in circular topology | | Then Send packet and verify marking | | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | 10.10.10.2 | 20.20.20.2 -# TODO: Add check of number of hits of the classify session after traffic -# Until there is implemented check of number of hits of the classify session -# after passing the traffic log the show classify tables verbose to allow visual -# check of hit number when needed. -| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-64B-ethip4-ip4base-ipolicemarkbase-dev -- cgit 1.2.3-korg