From 14a71b74b414df7616ccb5ada3d50ecb90d96bae Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Feb 2020 22:09:02 +0000 Subject: Improve pf layer + Merge single/double link + Introduce _pf{n}[0] variables so we can access physical function same way as virtual function + Cleanup code by moving complex logic to python + Prepare code for multiple vf functions Signed-off-by: Peter Mikus Change-Id: Ic2e74a38bfa146441357de8f0916aeb638941c49 --- .../ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot | 7 +++++-- .../device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot | 7 +++++-- .../device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot | 10 ++++++---- .../ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot | 10 ++++++---- .../ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot | 10 ++++++---- 5 files changed, 28 insertions(+), 16 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 2bf28ee9f9..a507325dc8 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2bdbasemaclrn | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | @@ -47,6 +47,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${50} *** Keywords *** @@ -73,7 +75,8 @@ | | And Initialize layer ip4vxlan | | And Initialize L2 bridge domain | | Then Send VXLAN encapsulated packet and verify received packet -| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac} +| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] +| | ... | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0] | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0} *** Test Cases *** 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 a8b293863b..97a1ca13dc 100644 --- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot +++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2xcbase | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | @@ -46,6 +46,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${50} *** Keywords *** @@ -72,7 +74,8 @@ | | And Initialize layer ip4vxlan | | And Initialize L2 cross connect | | Then Send VXLAN encapsulated packet and verify received packet -| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac} +| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] +| | ... | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0] | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0} *** Test Cases *** 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 0881e3eff8..49969d0d52 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 @@ -21,7 +21,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4lisp-ip4base | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | @@ -50,6 +50,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${54} *** Keywords *** @@ -74,13 +76,13 @@ | | And Initialize layer interface | | And Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology -| | ... | ${dut1} | ${dut1_if2} | ${NONE} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | | ... | ${dut1_to_tg_ip4_static_adjacency} | | Then Send packet and verify LISP encap | | ... | ${tg} | ${tg_if1_ip4} | ${dst_ip4} -| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} -| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0] +| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0] | | ... | ${src_rloc4} | ${dst_rloc4} *** Test Cases *** 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 38c8f67942..bad95ee210 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 @@ -21,7 +21,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4lispgpe-ip4base | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | @@ -50,6 +50,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${54} | ${is_gpe}= | ${1} @@ -75,13 +77,13 @@ | | And Initialize layer interface | | And Configure topology for IPv4 LISP testing | | And Configure LISP in 2-node circular topology -| | ... | ${dut1} | ${dut1_if2} | ${NONE} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | | ... | ${dut1_to_tg_ip4_static_adjacency} | ${is_gpe} | | Then Send packet and verify LISP GPE encap | | ... | ${tg} | ${tg_if1_ip4} | ${dst_ip4} -| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} -| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0] +| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0] | | ... | ${src_rloc4} | ${dst_rloc4} *** Test Cases *** 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 d6daa65419..191d5c8bb3 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 @@ -21,7 +21,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4lispgpe-ip6base | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | @@ -50,6 +50,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${54} | ${ot_mode}= | 6to4 | ${is_gpe}= | ${1} @@ -77,13 +79,13 @@ | | 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} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | ${is_gpe} | | Then Send packet and verify LISPoTunnel encap | | ... | ${tg} | ${tg_if1_ip6} | ${dst_ip6} -| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} -| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0] +| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0] | | ... | ${src_rloc4} | ${dst_rloc4} | ${ot_mode} *** Test Cases *** -- cgit 1.2.3-korg