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/ip4_tunnels | |
| 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/ip4_tunnels')
8 files changed, 28 insertions, 12 deletions
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot index 68835d6b6d..24ca8f269e 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan | -| 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 | performance | Test Teardown | Tear down test | performance @@ -56,6 +56,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot index e44e538e2b..94314b03ab 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan | -| 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 | performance | Test Teardown | Tear down test | performance @@ -56,6 +56,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot index 793f81f227..9b128eefa0 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan | -| 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 | performance | Test Teardown | Tear down test | performance @@ -56,6 +56,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot index 0ea744756c..dbbf29b228 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan | -| 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 | performance | Test Teardown | Tear down test | performance @@ -56,6 +56,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot index 94401fb9d4..ac73e45fa6 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot @@ -22,7 +22,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4lispip4-ip4base | -| 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 | performance | Test Teardown | Tear down test | performance @@ -57,6 +57,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${8} # Traffic profile: @@ -90,8 +92,8 @@ | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} | | And Configure LISP topology in 3-node circular topology -| | ... | ${dut1} | ${dut1_if2} | ${NONE} -| | ... | ${dut2} | ${dut2_if1} | ${NONE} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE} +| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot index 82726d6821..f41a5a05bb 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot @@ -22,7 +22,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4lispip6-ip4base | -| 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 | performance | Test Teardown | Tear down test | performance @@ -57,6 +57,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${48} # Traffic profile: @@ -90,8 +92,8 @@ | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} | | And Configure LISP topology in 3-node circular topology -| | ... | ${dut1} | ${dut1_if2} | ${NONE} -| | ... | ${dut2} | ${dut2_if1} | ${NONE} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE} +| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot index 8f5c7d33d2..a799da2488 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2bdbasemaclrn | -| 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 | performance | Test Teardown | Tear down test | performance @@ -55,6 +55,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot index cb5b7fd017..7633f4c027 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip4vxlan-l2xcbase | -| 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 | performance | Test Teardown | Tear down test | performance @@ -55,6 +55,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L2 | ${overhead}= | ${50} # Traffic profile: |