diff options
author | Vratko Polak <vrpolak@cisco.com> | 2024-04-26 13:58:43 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2024-04-30 14:51:50 +0000 |
commit | e3d82022e7230656a29af6b5273664f7dbacf5b8 (patch) | |
tree | 3c9d88ea47efde0f475f5541a98afa8e8979b9c6 /tests/vpp/device | |
parent | 30374dc28433a518ec478cb1690946de03da4ea4 (diff) |
feat(ipsec): Use strings instead of enums in Robot
Only related to enums appearing in ipsec suites.
+ Add conversion utility as enum_utils.py file.
+ Rename PolicyAction closer to ipsec_types.api: IpsecSpdAction.
+ Device and perf suites updated to use str in Variables table.
- Perf suites are being tested.
Change-Id: I3b1678c4d6cc303c590e5e3665ab1b05d104a121
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'tests/vpp/device')
6 files changed, 18 insertions, 34 deletions
diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot index c91ae637ee..0d50fde74a 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -79,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES CBC 128 -| | ${auth_alg} = | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot index d424ee4727..621dcec74c 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -79,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES CBC 128 -| | ${auth_alg} = | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot index 88e769a2e1..bac48c58c8 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip4}= | 192.168.100.2 | ${tg_if2_ip4}= | 192.168.4.4 | ${dut_if1_ip4}= | 192.168.100.3 @@ -80,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot index ca456cef1c..285154c87f 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip4}= | 192.168.100.2 | ${tg_if2_ip4}= | 192.168.4.4 | ${dut_if1_ip4}= | 192.168.100.3 @@ -80,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot index 3b417ab15e..0b20f05a00 100644 --- a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip6}= | 3ffe:5f::1 | ${tg_if2_ip6}= | 3ffe:60::4 | ${dut_if1_ip6}= | 3ffe:5f::2 @@ -81,10 +82,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot index 71e92f80f0..93c8142a1b 100644 --- a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip6}= | 3ffe:5f::1 | ${tg_if2_ip6}= | 3ffe:60::4 | ${dut_if1_ip6}= | 3ffe:5f::2 @@ -81,10 +82,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} |