diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2020-02-21 22:09:02 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2020-04-06 08:27:39 +0000 |
| commit | 14a71b74b414df7616ccb5ada3d50ecb90d96bae (patch) | |
| tree | bfee617c9a4b20ce4c6467ffbbe6c0a15199ba52 /tests/vpp/device/l2bd | |
| parent | 8e601d0f37f715ca4ce55dded8bc27cadfe175c2 (diff) | |
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 <pmikus@cisco.com>
Change-Id: Ic2e74a38bfa146441357de8f0916aeb638941c49
Diffstat (limited to 'tests/vpp/device/l2bd')
3 files changed, 13 insertions, 7 deletions
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot index 2e7f209888..bee7330174 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | avf-dot1q-l2bdbasemaclrn-gbp | -| Suite Setup | Setup suite single link | avf | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Suite Teardown | Tear down suite | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace @@ -54,6 +54,8 @@ | ${nic_driver}= | avf | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 1 | ${overhead}= | ${4} *** Keywords *** @@ -83,8 +85,8 @@ | | And Initialize GBP routing domains | | Then Send packet and verify headers | | ... | ${tg} | 10.10.10.2 | 20.20.20.2 -| | ... | ${tg_if1} | ${tg_if1_mac} | ba:dc:00:ff:ee:01 -| | ... | ${tg_if2} | ba:dc:00:ff:ee:01 | ${tg_if2_mac} +| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ba:dc:00:ff:ee:01 +| | ... | ${TG_pf2}[0] | ba:dc:00:ff:ee:01 | ${TG_pf2_mac}[0] | | ... | traffic_script=send_ip_check_headers *** Test Cases *** diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot index 9226c4bebc..6c258af93d 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | avf-dot1qip4-l2bdbasemaclrn | -| Suite Setup | Setup suite single link | avf | scapy +| Suite Setup | Setup suite topology interfaces | scapy | Suite Teardown | Tear down suite | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace @@ -46,6 +46,8 @@ | ${nic_driver}= | avf | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 1 | ${overhead}= | ${4} *** Keywords *** @@ -73,7 +75,7 @@ | | And Initialize layer dot1q | | And Initialize L2 bridge domain | | Then Send IPv4 bidirectionally and verify received packets -| | ... | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] *** Test Cases *** | tc01-68B-avf-dot1qip4-l2bdbasemaclrn-dev diff --git a/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot index cd6490d36d..4d24ddcda8 100644 --- a/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethipv4-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 | @@ -46,6 +46,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${overhead}= | ${0} *** Keywords *** @@ -72,7 +74,7 @@ | | And Initialize layer interface | | And Initialize L2 bridge domain | | Then Send IPv4 bidirectionally and verify received packets -| | ... | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0] *** Test Cases *** | tc01-64B-ethipv4-l2bdbasemaclrn-dev |