aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/perf/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vpp/perf/crypto')
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)28
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)28
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)32
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)32
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot151
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot151
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)28
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)28
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot (renamed from tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot)24
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot151
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot151
54 files changed, 918 insertions, 918 deletions
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index f309a5e1e5..3afae064ae 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -15,7 +15,7 @@
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/crypto/ipsec.robot
| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4
+| 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
| ...
@@ -65,7 +65,7 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${4}
+| ${n_tunnels}= | ${10000}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index ea61557d44..c80ebad683 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -15,7 +15,7 @@
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/crypto/ipsec.robot
| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4
+| 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
| ...
@@ -65,7 +65,7 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${4}
+| ${n_tunnels}= | ${10000}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 4047681a91..43ad65f4e2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index c05454046b..1fa6637610 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index ec407fddcd..e0d85de856 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 61a973de11..108a5ccfb0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index d1bf0c484b..cd754c8376 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -106,50 +106,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index dc93163b6f..368a99618c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -106,50 +106,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index cf95d836e8..c11e6d9792 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index c0ef2463d8..3fa0298fe8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 3a8b77a509..739514ffff 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -105,50 +105,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 61b3006c64..b7d10ba19f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -105,50 +105,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 546d3eff39..b316ca4664 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -15,8 +15,8 @@
| Resource | resources/libraries/robot/performance/performance_setup.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
+| 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
@@ -65,14 +65,14 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${1}
+| ${n_tunnels}= | ${1000}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
*** Keywords ***
| Local Template
| | [Documentation]
-| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_256 config.\
+| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_256 config.
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
| | ...
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index a6f9ec5ae0..c9c9f1e50b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -15,8 +15,8 @@
| Resource | resources/libraries/robot/performance/performance_setup.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
+| 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
@@ -65,14 +65,14 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${1}
+| ${n_tunnels}= | ${1000}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
*** Keywords ***
| Local Template
| | [Documentation]
-| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_512 config.\
+| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_512 config.
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
| | ...
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 8934144a25..5ec98f7b65 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 7ea120ee1f..618aa091aa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index c90d8c9f0d..f9ad335d3a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 1952ecb575..330cc71446 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 9cc03ab833..2bb35ba826 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index ff0bafe4c8..af97d2b2b9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 4030c86674..fda54a9aed 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 55c97585f4..88bab1ce2d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 590b2336a8..98c1364905 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 63ece57db5..8c19c10663 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale100tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 7990275524..bc1e42030c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 95ca0c202c..bef8f19cec 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -103,50 +103,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 4fe12ae3a8..d595123908 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -106,50 +106,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index e373be7fc5..8239c81358 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -106,50 +106,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 8d2a14e0d8..6d52cfd697 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index c21d75ce27..d5dc38563f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index aaaec0b624..964bdb4888 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -105,50 +105,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-tnl-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 586c99c492..f725109b53 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -105,50 +105,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnl-ip4base-tnl-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
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
new file mode 100644
index 0000000000..ed24811e6f
--- /dev/null
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -0,0 +1,151 @@
+# Copyright (c) 2019 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:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.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 Teardown | Tear down 3-node performance topology
+| ...
+| Test Setup | Set up performance test
+| Test Teardown | Tear down performance test
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv4 IPsec tunnel mode.*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 on TG-DUTn,
+| ... | Eth-IPv4-IPSec on DUT1-DUT2
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with multiple\
+| ... | IPsec tunnels between them. DUTs get IPv4 traffic from TG, encrypt it\
+| ... | and send to another DUT, where packets are decrypted and sent back to TG
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, number of flows per flow-group equals to
+| ... | number of IPSec tunnels) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and
+| ... | static payload. MAC addresses are matching MAC addresses of the TG
+| ... | node interfaces. Incrementing of IP.dst (IPv4 destination address) field
+| ... | is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544.
+
+*** Variables ***
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${58}
+| ${tg_if1_ip4}= | 192.168.10.2
+| ${dut1_if1_ip4}= | 192.168.10.1
+| ${dut1_if2_ip4}= | 100.0.0.1
+| ${dut2_if1_ip4}= | 100.0.0.2
+| ${dut2_if2_ip4}= | 192.168.20.1
+| ${tg_if2_ip4}= | 192.168.20.2
+| ${raddr_ip4}= | 20.0.0.0
+| ${laddr_ip4}= | 10.0.0.0
+| ${addr_range}= | ${24}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_256 config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | 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 256 128
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | 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
+| | And VPP IPsec Create Tunnel Interfaces
+| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
+| | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
+| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 64B | 1C
+| | frame_size=${64} | phy_cores=${1}
+
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 64B | 2C
+| | frame_size=${64} | phy_cores=${2}
+
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 64B | 4C
+| | frame_size=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
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
new file mode 100644
index 0000000000..7329b3c97f
--- /dev/null
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -0,0 +1,151 @@
+# Copyright (c) 2019 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:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.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 Teardown | Tear down 3-node performance topology
+| ...
+| Test Setup | Set up performance test
+| Test Teardown | Tear down performance test
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv4 IPsec tunnel mode.*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 on TG-DUTn,
+| ... | Eth-IPv4-IPSec on DUT1-DUT2
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with multiple\
+| ... | IPsec tunnels between them. DUTs get IPv4 traffic from TG, encrypt it\
+| ... | and send to another DUT, where packets are decrypted and sent back to TG
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, number of flows per flow-group equals to
+| ... | number of IPSec tunnels) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and
+| ... | static payload. MAC addresses are matching MAC addresses of the TG
+| ... | node interfaces. Incrementing of IP.dst (IPv4 destination address) field
+| ... | is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544.
+
+*** Variables ***
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${58}
+| ${tg_if1_ip4}= | 192.168.10.2
+| ${dut1_if1_ip4}= | 192.168.10.1
+| ${dut1_if2_ip4}= | 100.0.0.1
+| ${dut2_if1_ip4}= | 100.0.0.2
+| ${dut2_if2_ip4}= | 192.168.20.1
+| ${tg_if2_ip4}= | 192.168.20.2
+| ${raddr_ip4}= | 20.0.0.0
+| ${laddr_ip4}= | 10.0.0.0
+| ${addr_range}= | ${24}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_512 config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | 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
+| | And VPP IPsec Create Tunnel Interfaces
+| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
+| | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
+| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 64B | 1C
+| | frame_size=${64} | phy_cores=${1}
+
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 64B | 2C
+| | frame_size=${64} | phy_cores=${2}
+
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 64B | 4C
+| | frame_size=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 7a2f0e92e3..768dbabd63 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index ed4637ead7..5c052c5707 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 87e2148778..b5dc4c8d4c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 2996130be2..d77c0a9262 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index c50632f94a..3362771dd2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 399db3e606..1795418b13 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -104,50 +104,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecbasetnlsw-ip4base-tnl-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 64b463f839..51f09bfeaf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 274c9a28e2..132a2633af 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 642132d6d0..89e026312b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 9ee1e3200d..3f6a59aadf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 7b17770965..bb7524574c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -15,7 +15,7 @@
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/crypto/ipsec.robot
| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
+| 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
| ...
@@ -65,7 +65,7 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${1000}
+| ${n_tunnels}= | ${4}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 94c29325af..66422d055d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -15,7 +15,7 @@
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/crypto/ipsec.robot
| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
+| 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
| ...
@@ -65,7 +65,7 @@
| ${raddr_ip4}= | 20.0.0.0
| ${laddr_ip4}= | 10.0.0.0
| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${1000}
+| ${n_tunnels}= | ${4}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index cd7e2b8a28..f13ac51389 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 21d105d2c5..61f66a48d7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 0fd1a16859..480a72be46 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index f9cffb716d..3cce1391f6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc07-9000B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc08-9000B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc09-9000B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 59bad65a47..99557cdf65 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 7403bc86cf..595970b53b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -102,50 +102,50 @@
| | Then Find NDR and PDR intervals using optimized search
*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 1C
| | frame_size=${64} | phy_cores=${1}
-| tc02-64B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 2C
| | frame_size=${64} | phy_cores=${2}
-| tc03-64B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 64B | 4C
| | frame_size=${64} | phy_cores=${4}
-| tc04-1518B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 1C
| | frame_size=${1518} | phy_cores=${1}
-| tc05-1518B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 2C
| | frame_size=${1518} | phy_cores=${2}
-| tc06-1518B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 1518B | 4C
| | frame_size=${1518} | phy_cores=${4}
-| tc07-9000B-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc07-9000B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 1C
| | frame_size=${9000} | phy_cores=${1}
-| tc08-9000B-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc08-9000B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 2C
| | frame_size=${9000} | phy_cores=${2}
-| tc09-9000B-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc09-9000B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | 9000B | 4C
| | frame_size=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 1C
| | frame_size=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 2C
| | frame_size=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-ethip4ipsecscale5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
| | [Tags] | IMIX | 4C
| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
deleted file mode 100644
index e591bf0d4c..0000000000
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright (c) 2019 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.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 Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 IPsec tunnel mode.*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 on TG-DUTn,
-| ... | Eth-IPv4-IPSec on DUT1-DUT2
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with multiple\
-| ... | IPsec tunnels between them. DUTs get IPv4 traffic from TG, encrypt it\
-| ... | and send to another DUT, where packets are decrypted and sent back to TG
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, number of flows per flow-group equals to
-| ... | number of IPSec tunnels) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and
-| ... | static payload. MAC addresses are matching MAC addresses of the TG
-| ... | node interfaces. Incrementing of IP.dst (IPv4 destination address) field
-| ... | is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${58}
-| ${tg_if1_ip4}= | 192.168.10.2
-| ${dut1_if1_ip4}= | 192.168.10.1
-| ${dut1_if2_ip4}= | 100.0.0.1
-| ${dut2_if1_ip4}= | 100.0.0.2
-| ${dut2_if2_ip4}= | 192.168.20.1
-| ${tg_if2_ip4}= | 192.168.20.2
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${10000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_256 config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | 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 256 128
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | 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
-| | And VPP IPsec Create Tunnel Interfaces
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
-| | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
-| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
deleted file mode 100644
index bae9b2ae7c..0000000000
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright (c) 2019 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.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 Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 IPsec tunnel mode.*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 on TG-DUTn,
-| ... | Eth-IPv4-IPSec on DUT1-DUT2
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with multiple\
-| ... | IPsec tunnels between them. DUTs get IPv4 traffic from TG, encrypt it\
-| ... | and send to another DUT, where packets are decrypted and sent back to TG
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, number of flows per flow-group equals to
-| ... | number of IPSec tunnels) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and
-| ... | static payload. MAC addresses are matching MAC addresses of the TG
-| ... | node interfaces. Incrementing of IP.dst (IPv4 destination address) field
-| ... | is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC4303 and RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${58}
-| ${tg_if1_ip4}= | 192.168.10.2
-| ${dut1_if1_ip4}= | 192.168.10.1
-| ${dut1_if2_ip4}= | 100.0.0.1
-| ${dut2_if1_ip4}= | 100.0.0.2
-| ${dut2_if2_ip4}= | 192.168.20.1
-| ${tg_if2_ip4}= | 192.168.20.2
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_tunnels}= | ${10000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPSec tunneling AES_128_CBC / HMAC_SHA_512 config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | 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
-| | And VPP IPsec Create Tunnel Interfaces
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
-| | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
-| | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4ipsecscale10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}