Fix order of TC blocks in l2bd alc perf test

Change-Id: I7862ef59813b6fd2f9b35897e04b4b9785e189e8
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
index dd70a9f..892dd0c 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
index f67a031..d9ffbc8 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
index 4f70e60..08ff217 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
index d66c89a..211ba98 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
index 627bda9..082d463 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
index dcb2903..2e2494a 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl10-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl10-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
index a9b2430..9eb4a01 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
index e7b693d..c4c097e 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
index e5b3f51..7c86c30 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
index b771879..5dd525b 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
index 79e9c21..707a6f0 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
index 9f4e0f2..d8eef3b 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
index 72f0df1..cf86045 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
index 10302c8..926855d 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
index d8bdfe9..692851a 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
index d3bc689..82ae221 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
index ed624bc..3094730 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
index bab65d1..750a423 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl50-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl50-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
index c967356..04d732e 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
index 74010d5..cad8fdf 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
index aba0b9f..ab7737f 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
index d37111a..76f615a 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
index 1c6ccba..cce003a 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
index 541d0c8..83d3f83 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl10-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl10-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
index 6f4a190..761d0b6 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
index 66fffb2..ea54c02 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
index b075149..17f5366 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
index 898c724..729f83b 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
index eff1052..83cbcee 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
index 53b697c..6ed61e2 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl1-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl1-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
index 6015a79..3120e64 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
index df8f7a4..84e02f2 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
index 4debca2..5c4b4a5 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateful-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
index c3f18a8..eb9ef19 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
index 634cceb..59f72db 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows100k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows100k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR

diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
index 071e003..83ca36a 100644 (file)
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
@@ -24,12 +23,8 @@
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Run Keywords | Tear down performance discovery test
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | AND | Vpp Log Plugin Acl Settings | ${dut1}
-| ... | AND | Cli Show Acl | ${dut1}
-| ... | AND | Run Keyword And Ignore Error
-|     | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
 | ...
@@ -103,45 +98,49 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-oacl50-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC  | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR
 
 | tc03-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows10k-ndrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=NDR
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-oacl50-stateless-flows10k-pdrdisc
-| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
-| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with ACL with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | SKIP_PATCH
+| | ...
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${10000} | search_type=PDR