diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-06-21 12:15:56 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-06-25 06:02:52 +0000 |
| commit | 1577123a3c27541181097cb4186aa8855f20b1cc (patch) | |
| tree | 8db2e4a954e97f7734988fd3d10b69504f370998 /tests/vpp/perf/crypto | |
| parent | cac8f76ce1f9085e9eede19b250f4a4cb9b199e0 (diff) | |
Align suite/test teardown/setup
+ Phase II - aligning FUNC/PERF setup.
+ 2n/3n compatibility of suite setup.
+ Same structure of testcase for DEV/PERF.
+ DEVICE tests are now running VPP startup config in same
way as PERF.
+ DEVICE is using COREKEEPER!
- DEVICE tests are running topology compute twice for backward
compatibility. TODO to remove.
- Still phase III needed to align TAGS, LIBRARIES and remove OLD
setup phase.
Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/perf/crypto')
53 files changed, 404 insertions, 378 deletions
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 9dd4fd0fc1..bf7124f353 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index cbac46185b..afadb6123e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 6e5069aa00..4efd988837 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index a3a2b8c627..8977cfe104 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 74fa143cd5..be9cf141af 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 8e9a3b6774..8adbe233a3 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot index 4deb357c98..09e9c6d1d8 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -93,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot index e57b5e601e..33c40166b5 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | TNL_1000 | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -93,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot index 029428b551..3dc1b9e7b3 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | TNL_1000 | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +94,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot index f6e0510ca2..9e68f0d624 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | TNL_1000 | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +94,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot index e13a1dcf72..37720ed9fa 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | TNL_1000 | ... | AES_128_GCM | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot index 5e4201d274..86b9e8bfac 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | SCALE | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | TNL_1000 | ... | AES_256_GCM | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index e57d072235..bbd0be9015 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index ded1eaff4a..fb52436609 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index db5bde5c60..3541bf69ac 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index aad42b8fa7..139bf8fa34 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot index efaecb7e96..0d6db9f264 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot index c8ce30fa9e..f9b4b3f1cb 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot index 5b24b71993..e26b7f1c80 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index 36f7e72b31..46350d4e76 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index c99ceb9ecb..15e74ba112 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_100 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 09a27f4238..22793da0b6 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_100 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index c1b7146733..da2329e73b 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_100 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index 30b7d76b30..450011925f 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_100 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 0a75cb54d7..e8d48a0ac0 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 3ef24092f0..3dd7a0eaf6 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot index bf20f422c7..8923f735ad 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -93,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot index c901a23d35..2feddd10a7 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -93,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot index 010326bc79..2c4a7db8c7 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | BASE | | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -52,6 +50,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -91,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot index becd08e918..543c904a93 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | BASE | | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -52,6 +50,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -91,10 +93,10 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot index daab33fb3c..b1ca4d9396 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_128_GCM | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot index 124f19a32d..39a8ef5f0e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -12,18 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_256_GCM | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | ipsechw | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -53,6 +51,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -92,12 +94,12 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1} | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1} -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 67231351d3..d1f9cc2839 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 0faaec4f6c..9182026227 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 5f949177d8..850ee9197d 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index adf3d9b536..14c01407d4 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | BASE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot index 0cf9f1b798..fa06d54b7e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot index 5bc274e934..61cd94c22f 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot index f0f0fcc869..8d65c893bf 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index ef9f021a31..b1376269da 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | IP4FWD | IPSEC | IPSECSW | IPSECTUN | NIC_Intel-X710 | BASE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -97,7 +97,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 3e7101673d..4f36ee37cd 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 4cc9b480ea..8f91ea1586 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 330483a3ac..a5c29db6b0 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index 11bdaf2787..8c96b363d8 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 1df2e6fbcb..c9128a331a 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 777059474c..5a3bfc7a59 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index ad1364ecba..53eba98de1 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index e998af634f..8daedbe4a8 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot index 05a229b09b..7d28ab3467 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index a3c88cc4d8..98eb0d8be2 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_CBC | HMAC_SHA_512 | HMAC | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 539a048e75..f6cbbb5e2e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_128_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index fbe0949c22..ea34878e43 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -12,19 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000 | ... | IP4FWD | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | ... | AES_256_GCM | AES | ... -| 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 Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -54,6 +51,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${54} | ${tg_if1_ip4}= | 192.168.10.2 @@ -94,7 +94,7 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize IPSec in 3-node circular topology +| | When Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot index 9cca8dd126..f158658da1 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot @@ -12,7 +12,7 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/crypto/ipsec.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | ... @@ -21,11 +21,9 @@ | ... | LISPGPE | IPSEC | IPSECHW | IPSECTRAN | ENCAP | IP4UNRLAY | IP4OVRLAY | ... | NIC_Intel-X710 | AES_128_CBC | HMAC_SHA_256 | HMAC | AES | ... -| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name} -| ... | HW_DH895xcc +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test +| Test Setup | Setup test | Test Teardown | Tear down test | performance | ... | Test Template | Local Template @@ -57,6 +55,10 @@ | ... | RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${osi_layer}= | L3 +| ${crypto_type}= HW_DH895xcc | ${nic_name}= | Intel-X710 | ${overhead}= | ${58} | ${dut2_spi}= | ${1000} @@ -89,7 +91,7 @@ | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Add cryptodev to all DUTs | ${phy_cores} | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} |