diff options
7 files changed, 27 insertions, 12 deletions
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot index 4f3b0bd01a..6e7cc70844 100644 --- a/resources/libraries/robot/performance/performance_setup.robot +++ b/resources/libraries/robot/performance/performance_setup.robot @@ -526,6 +526,15 @@ | | Set Suite Variable | @{plugins_to_enable} | | Append To List | ${plugins_to_enable} | lacp_plugin.so +| Set up performance test suite with crypto ipsecmb +| | [Documentation] +| | ... | Append crypto_ipsecmb_plugin.so to the list of enabled plugins. +| | ... +| | Set Suite Variable | @{plugins_to_enable} +| | Append To List | ${plugins_to_enable} | crypto_ia32_plugin.so +| | Append To List | ${plugins_to_enable} | crypto_ipsecmb_plugin.so +| | Append To List | ${plugins_to_enable} | crypto_openssl_plugin.so + | Set up 3-node performance topology with wrk and DUT's NIC model | | [Documentation] | | ... | Suite preparation phase that sets the default startup configuration of diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot index c586652b1d..37f8769d75 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdr.robot @@ -18,8 +18,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | AES_GCM | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot index 8b781ce175..9685820edc 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdr.robot @@ -18,8 +18,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | CBC_SHA1 | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot index 6f0d2dbc32..2b47d754aa 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdr.robot @@ -18,8 +18,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | AES_GCM | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | SW_cryptodev +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot index 5a78fedbee..00acd8379b 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdr.robot @@ -18,8 +18,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | CBC_SHA1 | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | SW_cryptodev +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot index 99f6c1030c..67064011b3 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdr.robot @@ -19,8 +19,9 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | AES_GCM | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot index c12a1b17bc..6ff13444fd 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdr.robot @@ -19,8 +19,9 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | CBC_SHA1 | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Run Keywords +| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc +| ... | AND | Set up performance test suite with crypto ipsecmb | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test |