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/perf/vts | |
| 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/perf/vts')
3 files changed, 12 insertions, 6 deletions
diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot index 8a27296df1..a9e4c98123 100644 --- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm | -| Suite Setup | Setup suite single link | performance +| Suite Setup | Setup suite topology interfaces | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test | performance | Test Teardown | Tear down test | performance | vhost @@ -59,6 +59,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} @@ -99,7 +101,7 @@ | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | | @{permit_list} = | Create List | 172.17.0.2/32 | 172.27.0.2/32 | | Run Keyword If | '${acl_type}' != '${EMPTY}' -| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input +| | ... | Configure ACLs on a single interface | ${dut1} | ${DUT1_${int}2}[0] | input | | ... | ${acl_type} | @{permit_list} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot index 945147ce72..668e0513b3 100644 --- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm | -| Suite Setup | Setup suite single link | performance +| Suite Setup | Setup suite topology interfaces | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test | performance | Test Teardown | Tear down test | performance | vhost @@ -59,6 +59,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} @@ -98,7 +100,7 @@ | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | | @{permit_list} = | Create List | 172.17.0.2/32 | 172.27.0.2/32 | | Run Keyword If | '${acl_type}' != '${EMPTY}' -| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input +| | ... | Configure ACLs on a single interface | ${dut1} | ${DUT1_${int}2}[0] | input | | ... | ${acl_type} | @{permit_list} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot index eec33dfd4f..995842e2eb 100644 --- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm | -| Suite Setup | Setup suite single link | performance +| Suite Setup | Setup suite topology interfaces | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test | performance | Test Teardown | Tear down test | performance | vhost @@ -59,6 +59,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${50} | ${nf_dtcr}= | ${1} @@ -99,7 +101,7 @@ | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | | @{permit_list} = | Create List | 172.17.0.2/32 | 172.27.0.2/32 | | Run Keyword If | '${acl_type}' != '${EMPTY}' -| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input +| | ... | Configure ACLs on a single interface | ${dut1} | ${DUT1_${int}2}[0] | input | | ... | ${acl_type} | @{permit_list} | | And Configure chains of NFs connected via vhost-user | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} |