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 --- tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot | 4 +++- .../10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot | 12 +++++++----- .../ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 8 +++++--- tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot | 4 +++- .../perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot | 4 +++- .../vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot | 4 +++- .../vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot | 4 +++- .../vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot | 4 +++- ...1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot | 8 +++++--- .../2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 8 +++++--- .../perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot | 4 +++- .../ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot | 4 +++- .../ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot | 4 +++- .../perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot | 4 +++- 14 files changed, 52 insertions(+), 24 deletions(-) (limited to 'tests/vpp/perf/ip6') diff --git a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot index 50d8db0252..f29e162eea 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q-ip6base | -| 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}= | L3 | ${overhead}= | ${4} | ${subid}= | 10 diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot index 0127fd09e4..60a83c74da 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base-copwhtlistbase | -| 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}= | L3 | ${overhead}= | ${0} # Traffic profile: @@ -89,10 +91,10 @@ | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} | | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} -| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 -| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 -| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable -| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable +| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip6 | 1 +| | And COP Add whitelist Entry | ${dut2} | ${DUT2_${int}2}[0] | ip6 | 1 +| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable +| | And COP interface enable or disable | ${dut2} | ${DUT2_${int}2}[0] | enable | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot index 661a1c0caf..5bd3f5e61f 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base-iacldstbase | -| 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 | classify @@ -54,6 +54,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} # Traffic profile: @@ -89,14 +91,14 @@ | | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst | | ... | 2001:2::0 | | And Vpp Enable Input Acl Interface -| | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ip6 | ${table_idx} | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut2} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0 | | And Vpp Configures Classify Session L3 | | ... | ${dut2} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst | | ... | 2001:1::0 | | And Vpp Enable Input Acl Interface -| | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx} +| | ... | ${dut2} | ${DUT2_${int}2}[0] | ip6 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot index 242fc5a555..64c6daf5e0 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base | -| 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 @@ -53,6 +53,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} # Traffic profile: diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot index 202f0ddd6d..99d404503a 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale200k | -| 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 @@ -54,6 +54,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${100000} diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot index 915307788b..10cd19b8e2 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale20k | -| 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 @@ -54,6 +54,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${10000} diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot index 67790a165c..099d899ede 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale2m | -| 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 @@ -54,6 +54,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${1000000} diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot index 0f7809bb50..ace094fd92 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | dot1q-ip6base | -| 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}= | L3 | ${overhead}= | ${4} | ${subid}= | 10 diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot index 48a32cb69b..7f4afcd17c 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot @@ -20,7 +20,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base-copwhtlistbase | -| 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}= | L3 | ${overhead}= | ${0} # Traffic profile: @@ -87,8 +89,8 @@ | | And Initialize IPv6 forwarding in circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 -| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable +| | And COP Add whitelist Entry | ${dut1} | ${DUT1_${int}1}[0] | ip6 | 1 +| | And COP interface enable or disable | ${dut1} | ${DUT1_${int}1}[0] | enable | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot index f02f0db90a..38d6a02567 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base-iacldstbase | -| 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 | classify @@ -54,6 +54,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} # Traffic profile: @@ -89,12 +91,12 @@ | | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst | | ... | 2001:2::0 | | And Vpp Enable Input Acl Interface -| | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ip6 | ${table_idx} | | And Vpp Configures Classify Session L3 | | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst | | ... | 2001:1::0 | | And Vpp Enable Input Acl Interface -| | ... | ${dut1} | ${dut1_if2} | ip6 | ${table_idx} +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ip6 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot index aed580f510..c3ca6074e0 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6base | -| 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 @@ -52,6 +52,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} # Traffic profile: diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot index b31bcf4922..d918bc4a84 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale200k | -| 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 @@ -53,6 +53,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${100000} diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot index 92d2c4d542..46b4d128b9 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale20k | -| 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 @@ -53,6 +53,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${10000} diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot index 432d53f3dc..9df8d9b6e1 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot @@ -19,7 +19,7 @@ | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | ... | ethip6-ip6scale2m | -| 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 @@ -53,6 +53,8 @@ | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${1000000} -- cgit 1.2.3-korg