diff options
Diffstat (limited to 'tests/vpp/device/interfaces')
3 files changed, 20 insertions, 14 deletions
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot index b696be7f43..a3075e57d5 100644 --- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethicmpv4-ip4base-eth-1tap | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | @@ -46,6 +46,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${0} | ${tap1_VPP_ip}= | 16.0.10.1 | ${tap1_NM_ip}= | 16.0.10.2 @@ -82,18 +84,18 @@ | | And VPP Interface Set IP Address | | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix} | | And VPP Interface Set IP Address -| | ... | ${dut1} | ${dut1_if1} | ${dut_ip_address} | ${prefix} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut_ip_address} | ${prefix} | | And Set Interface State | ${dut1} | ${int1} | up | | And Set Linux Interface MAC | ${dut1} | tap0 | ${tap1_NM_mac} | | And Set Linux Interface IP | ${dut1} | tap0 | ${tap1_NM_ip} | ${prefix} | | And Add Linux Route | | ... | ${dut1} | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | | And VPP Add IP Neighbor -| | ... | ${dut1} | ${dut1_if1} | ${tg_ip_address} | ${tg_if1_mac} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_ip_address} | ${TG_pf1_mac}[0] | | And VPP Add IP Neighbor | | ... | ${dut1} | ${int1} | ${tap1_NM_ip} | ${tap1_NM_mac} | | Then Send ICMP echo request and verify answer -| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | ${tg_if1_mac} +| | ... | ${tg} | ${TG_pf1}[0] | ${DUT1_vf1_mac}[0] | ${TG_pf1_mac}[0] | | ... | ${tap1_NM_ip} | ${tg_ip_address} *** Test Cases *** diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot index c316e44e28..852d687edb 100644 --- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethicmpv4-ip4base-eth-1tap-namespace | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | @@ -47,6 +47,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${0} | ${tap1_VPP_ip}= | 16.0.10.1 | ${tap1_NM_ip}= | 16.0.10.2 @@ -84,7 +86,7 @@ | | And VPP Interface Set IP Address | | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix} | | And VPP Interface Set IP Address -| | ... | ${dut1} | ${dut1_if1} | ${dut_ip_address} | ${prefix} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut_ip_address} | ${prefix} | | And Set Interface State | ${dut1} | ${int1} | up | | And Create Namespace | ${dut1} | nmspace1 | | And Attach Interface To Namespace | ${dut1} | nmspace1 | tap0 @@ -93,13 +95,13 @@ | | And Set Linux Interface IP | | ... | ${dut1} | tap0 | ${tap1_NM_ip} | ${prefix} | nmspace1 | | And VPP Add IP Neighbor -| | ... | ${dut1} | ${dut1_if1} | ${tg_ip_address} | ${tg_if1_mac} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_ip_address} | ${TG_pf1_mac}[0] | | And VPP Add IP Neighbor | | ... | ${dut1} | ${int1} | ${tap1_NM_ip} | ${tap1_NM_mac} | | And Add Linux Route | | ... | ${dut1} | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | nmspace1 | | Then Send ICMP echo request and verify answer -| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | ${tg_if1_mac} +| | ... | ${tg} | ${TG_pf1}[0] | ${DUT1_vf1_mac}[0] | ${TG_pf1_mac}[0] | | ... | ${tap1_NM_ip} | ${tg_ip_address} *** Test Cases *** diff --git a/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot index 3cefd07a9e..5a1b6a68b8 100644 --- a/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethipv4-l2bdbasemaclrn-eth-2tap | -| Suite Setup | Setup suite single link | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | linux_bridge | @@ -47,6 +47,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${0} | ${bid_TAP}= | tapBr @@ -75,15 +77,15 @@ | | ${int2}= | And Add Tap Interface | ${dut1} | tap1 | | And Set Interface State | ${dut1} | ${int1} | up | | And Set Interface State | ${dut1} | ${int2} | up -| | And Create bridge domain | ${dut1} | 19 | learn=${TRUE} -| | And Create bridge domain | ${dut1} | 20 | learn=${TRUE} +| | And Create L2 BD | ${dut1} | 19 | learn=${TRUE} +| | And Create L2 BD | ${dut1} | 20 | learn=${TRUE} | | And Linux Add Bridge | ${dut1} | ${bid_TAP} | tap0 | tap1 | | And Add interface to bridge domain | ${dut1} | ${int1} | 20 | 0 -| | And Add interface to bridge domain | ${dut1} | ${dut1_if1} | 20 | 0 +| | And Add interface to bridge domain | ${dut1} | ${DUT1_${int}1}[0] | 20 | 0 | | And Add interface to bridge domain | ${dut1} | ${int2} | 19 | 0 -| | And Add interface to bridge domain | ${dut1} | ${dut1_if2} | 19 | 0 +| | And Add interface to bridge domain | ${dut1} | ${DUT1_${int}2}[0] | 19 | 0 | | Then Send IP packet and verify received packet -| | ... | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] *** Test Cases *** | tc01-64B-ethipv4-l2bdbasemaclrn-eth-2tap-dev |