X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot;h=03aa4f9a660f3049b08a53beaefd0fdd90b632c1;hp=55b75997382f77bfd69b88e9724b42b2b6dd8e69;hb=086f3a5065d744e00fe10289eb2f090b7bde208e;hpb=0284cfd6ae5dbd98e94d457b444746ed828b3901

diff --git a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
index 55b7599738..03aa4f9a66 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.robot
 | Resource | resources/libraries/robot/ipsec.robot
 | Resource | resources/libraries/robot/lisp/lispgpe.robot
 | ...
@@ -21,15 +21,14 @@
 | ... | LISPGPE | IPSEC | IPSECHW | IPSECTRAN | ENCAP | IP4UNRLAY | IP4OVRLAY
 | ... | NIC_Intel-XL710
 | ...
-| Suite Setup | Run Keywords
-| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710
-| ... | AND | Verify Crypto Device On All DUTs | force_init=${True}
-| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True}
-| Suite Teardown | 3-node Performance Suite Teardown
+| Suite Setup | Set up IPSec performance test suite | L3 | Intel-XL710
 | ...
-| Test Setup | Performance test setup
-| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec transport mode performance test suite.*
 | ...
@@ -67,6 +66,8 @@
 | ${dut1_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
 | ${ipsec_overhead}= | ${54}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -77,7 +78,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -87,16 +88,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -106,7 +108,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -116,16 +118,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -136,7 +139,7 @@
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -146,15 +149,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -164,7 +168,7 @@
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -174,15 +178,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -193,7 +198,7 @@
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -204,15 +209,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -222,7 +228,7 @@
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -233,15 +239,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Cryptodev to all DUTs | ${1}
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add cryptodev to all DUTs | ${1}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -252,7 +259,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -262,16 +269,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${2}
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${2}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -281,7 +289,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -291,16 +299,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${2}
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${2}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -311,7 +320,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -321,16 +330,17 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${4}
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${4}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -340,7 +350,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -350,14 +360,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
-| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Cryptodev to all DUTs | ${4}
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add no multi seg to all DUTs
+| | And Add cryptodev to all DUTs | ${4}
 | | And Apply startup configuration on all VPP DUTs
-| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}