diff options
148 files changed, 844 insertions, 1286 deletions
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000.py deleted file mode 100644 index b9a8eb22f8..0000000000 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000.py +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. -# -# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later -# -# Licensed under the Apache License 2.0 or -# GNU General Public License v2.0 or later; you may not use this file -# except in compliance with one of these Licenses. You -# may obtain a copy of the Licenses at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html -# -# Note: If this file is linked with Scapy, which is GPLv2+, your use of it -# must be under GPLv2+. If at any point in the future it is no longer linked -# with Scapy (or other GPLv2+ licensed software), you are free to choose -# Apache 2. -# -# 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. - -"""Stream profile for T-rex traffic generator. - -Stream profile: - - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time. - - Packet: ETH / IP / - - Direction 0 --> 1: - - Source IP address range: 10.0.0.1 - - Destination IP address range: 20.0.0.0 - 20.0.39.15 - - Direction 1 --> 0: - - Source IP address range: 20.0.0.1 - - Destination IP address range: 10.0.0.0 - 10.0.39.15 -""" - -from trex.stl.api import * -from profile_trex_stateless_base_class import TrafficStreamsBaseClass - - -class TrafficStreams(TrafficStreamsBaseClass): - """Stream profile.""" - - def __init__(self): - """Initialization and setting of streams' parameters.""" - - super(TrafficStreamsBaseClass, self).__init__() - - # IPs used in packet headers. - self.p1_src_start_ip = u"10.0.0.1" - self.p1_dst_start_ip = u"20.0.0.0" - self.p1_dst_end_ip = u"20.0.39.15" - - self.p2_src_start_ip = u"20.0.0.1" - self.p2_dst_start_ip = u"10.0.0.0" - self.p2_dst_end_ip = u"10.0.39.15" - - def define_packets(self): - """Defines the packets to be sent from the traffic generator. - - Packet definition: | ETH | IP | - - :returns: Packets to be sent from the traffic generator. - :rtype: tuple - """ - - # Direction 0 --> 1 - base_pkt_a = ( - Ether() / - IP( - src=self.p1_src_start_ip, - dst=self.p1_dst_start_ip, - proto=61 - ) - ) - # Direction 1 --> 0 - base_pkt_b = ( - Ether() / - IP( - src=self.p2_src_start_ip, - dst=self.p2_dst_start_ip, - proto=61 - ) - ) - - # Direction 0 --> 1 - vm1 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p1_dst_start_ip, - max_value=self.p1_dst_end_ip, - size=4, - seed=1, - # Cycle length. TRex does not allow any higher value. - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - - # Direction 1 --> 0 - vm2 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p2_dst_start_ip, - max_value=self.p2_dst_end_ip, - size=4, - # Using a different seed to be extra sure - # nothing useful gets cached. - seed=2, - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - - return base_pkt_a, base_pkt_b, vm1, vm2 - - -def register(): - """Register this traffic profile to T-rex. - - Do not change this function. - - :return: Traffic streams. - :rtype: Object - """ - return TrafficStreams() diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000.py deleted file mode 100644 index 927f4cd07c..0000000000 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000.py +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. -# -# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later -# -# Licensed under the Apache License 2.0 or -# GNU General Public License v2.0 or later; you may not use this file -# except in compliance with one of these Licenses. You -# may obtain a copy of the Licenses at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html -# -# Note: If this file is linked with Scapy, which is GPLv2+, your use of it -# must be under GPLv2+. If at any point in the future it is no longer linked -# with Scapy (or other GPLv2+ licensed software), you are free to choose -# Apache 2. -# -# 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. - -"""Stream profile for T-rex traffic generator. - -Stream profile: - - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time. - - Packet: ETH / IP / - - Direction 0 --> 1: - - Source IP address range: 10.0.0.1 - - Destination IP address range: 20.0.0.0 - 20.1.134.159 - - Direction 1 --> 0: - - Source IP address range: 20.0.0.1 - - Destination IP address range: 10.0.0.0 - 10.1.134.159 -""" - -from trex.stl.api import * -from profile_trex_stateless_base_class import TrafficStreamsBaseClass - - -class TrafficStreams(TrafficStreamsBaseClass): - """Stream profile.""" - - def __init__(self): - """Initialization and setting of streams' parameters.""" - - super(TrafficStreamsBaseClass, self).__init__() - - # IPs used in packet headers. - self.p1_src_start_ip = u"10.0.0.1" - self.p1_dst_start_ip = u"20.0.0.0" - self.p1_dst_end_ip = u"20.1.134.159" - - self.p2_src_start_ip = u"20.0.0.1" - self.p2_dst_start_ip = u"10.0.0.0" - self.p2_dst_end_ip = u"10.1.134.159" - - def define_packets(self): - """Defines the packets to be sent from the traffic generator. - - Packet definition: | ETH | IP | - - :returns: Packets to be sent from the traffic generator. - :rtype: tuple - """ - - # Direction 0 --> 1 - base_pkt_a = ( - Ether() / - IP( - src=self.p1_src_start_ip, - dst=self.p1_dst_start_ip, - proto=61 - ) - ) - # Direction 1 --> 0 - base_pkt_b = ( - Ether() / - IP( - src=self.p2_src_start_ip, - dst=self.p2_dst_start_ip, - proto=61 - ) - ) - - # Direction 0 --> 1 - vm1 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p1_dst_start_ip, - max_value=self.p1_dst_end_ip, - size=4, - seed=1, - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - # Direction 1 --> 0 - vm2 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p2_dst_start_ip, - max_value=self.p2_dst_end_ip, - size=4, - seed=2, - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - - return base_pkt_a, base_pkt_b, vm1, vm2 - - -def register(): - """Register this traffic profile to T-rex. - - Do not change this function. - - :return: Traffic streams. - :rtype: Object - """ - return TrafficStreams() diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000.py deleted file mode 100644 index a60ec87d8d..0000000000 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000.py +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. -# -# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later -# -# Licensed under the Apache License 2.0 or -# GNU General Public License v2.0 or later; you may not use this file -# except in compliance with one of these Licenses. You -# may obtain a copy of the Licenses at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html -# -# Note: If this file is linked with Scapy, which is GPLv2+, your use of it -# must be under GPLv2+. If at any point in the future it is no longer linked -# with Scapy (or other GPLv2+ licensed software), you are free to choose -# Apache 2. -# -# 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. - -"""Stream profile for T-rex traffic generator. - -Stream profile: - - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time. - - Packet: ETH / IP / - - Direction 0 --> 1: - - Source IP address range: 10.0.0.1 - - Destination IP address range: 20.0.0.0 - 20.15.66.63 - - Direction 1 --> 0: - - Source IP address range: 20.0.0.1 - - Destination IP address range: 10.0.0.0 - 10.15.66.63 -""" - -from trex.stl.api import * -from profile_trex_stateless_base_class import TrafficStreamsBaseClass - - -class TrafficStreams(TrafficStreamsBaseClass): - """Stream profile.""" - - def __init__(self): - """Initialization and setting of streams' parameters.""" - - super(TrafficStreamsBaseClass, self).__init__() - - # IPs used in packet headers. - self.p1_src_start_ip = u"10.0.0.1" - self.p1_dst_start_ip = u"20.0.0.0" - self.p1_dst_end_ip = u"20.15.66.63" - - self.p2_src_start_ip = u"20.0.0.1" - self.p2_dst_start_ip = u"10.0.0.0" - self.p2_dst_end_ip = u"10.15.66.63" - - def define_packets(self): - """Defines the packets to be sent from the traffic generator. - - Packet definition: | ETH | IP | - - :returns: Packets to be sent from the traffic generator. - :rtype: tuple - """ - - # Direction 0 --> 1 - base_pkt_a = ( - Ether() / - IP( - src=self.p1_src_start_ip, - dst=self.p1_dst_start_ip, - proto=61 - ) - ) - # Direction 1 --> 0 - base_pkt_b = ( - Ether() / - IP( - src=self.p2_src_start_ip, - dst=self.p2_dst_start_ip, - proto=61 - ) - ) - - # Direction 0 --> 1 - vm1 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p1_dst_start_ip, - max_value=self.p1_dst_end_ip, - size=4, - seed=1, - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - # Direction 1 --> 0 - vm2 = STLScVmRaw( - [ - STLVmFlowVarRepeatableRandom( - name=u"dst", - min_value=self.p2_dst_start_ip, - max_value=self.p2_dst_end_ip, - size=4, - seed=2, - limit=(2**24 - 1) - ), - STLVmWrFlowVar( - fv_name=u"dst", - pkt_offset=u"IP.dst" - ), - STLVmFixIpv4( - offset=u"IP" - ) - ] - ) - - return base_pkt_a, base_pkt_b, vm1, vm2 - - -def register(): - """Register this traffic profile to T-rex. - - Do not change this function. - - :return: Traffic streams. - :rtype: Object - """ - return TrafficStreams() diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py index 5cc32159e5..c0e3ee4ab5 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py @@ -46,37 +46,43 @@ class TrafficStreams(TrafficStreamsScaleClass): { "src_start_ip": "2100::1", "dst_start_ip": "2200::0", - "dst_end_ip": "2200::F:423F" + "dst_end_ip": "2200::F:423F", + "seed": 1 }, # Direction W --> E: { "src_start_ip": "2300::1", "dst_start_ip": "2400::0", - "dst_end_ip": "2400::F:423F" + "dst_end_ip": "2400::F:423F", + "seed": 2 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", - "dst_end_ip": "2600::F:423F" + "dst_end_ip": "2600::F:423F", + "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", - "dst_end_ip": "2100::F:423F" + "dst_end_ip": "2100::F:423F", + "seed": 2 }, # Direction E --> W: { "src_start_ip": "2400::1", "dst_start_ip": "2300::0", - "dst_end_ip": "2300::F:423F" + "dst_end_ip": "2300::F:423F", + "seed": 1 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", - "dst_end_ip": "2500::F:423F" + "dst_end_ip": "2500::F:423F", + "seed": 2 } ] self.pkt_base = [] @@ -111,7 +117,8 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - op="inc" + seed=self.pkt_data[i]["seed"], + limit=(2**24 - 1) ), STLVmWrFlowVar( fv_name="ipv6_dst", diff --git a/VPP_STABLE_VER_UBUNTU_JAMMY b/VPP_STABLE_VER_UBUNTU_JAMMY index a50ded07fe..204f9c30f2 100644 --- a/VPP_STABLE_VER_UBUNTU_JAMMY +++ b/VPP_STABLE_VER_UBUNTU_JAMMY @@ -1 +1 @@ -24.06-rc0~197-g67226438c
\ No newline at end of file +24.06-rc0~263-g078a3607c
\ No newline at end of file diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py index 840766488a..3db0d50f4f 100644 --- a/csit.infra.dash/app/cdash/utils/constants.py +++ b/csit.infra.dash/app/cdash/utils/constants.py @@ -48,7 +48,7 @@ class Constants: URL_JENKINS = "https://jenkins.fd.io/job/" # URL to logs - URL_LOGS = "https://s3-logs.fd.io/vex-yul-rot-jenkins-1/" + URL_LOGS = "https://logs.fd.io/vex-yul-rot-jenkins-1/" # URL to the documentation URL_DOC_TRENDING = "https://csit.fd.io/cdocs/methodology/trending/analysis/" diff --git a/resources/job_specs/mrr_weekly/vpp-3n-icx.md b/resources/job_specs/mrr_weekly/vpp-3n-icx.md new file mode 120000 index 0000000000..8bdb6a47bd --- /dev/null +++ b/resources/job_specs/mrr_weekly/vpp-3n-icx.md @@ -0,0 +1 @@ +../report_iterative/3n-icx/vpp-mrr-01.md
\ No newline at end of file diff --git a/resources/job_specs/report_iterative/2n-icx/vpp-hoststack-00.md b/resources/job_specs/report_iterative/2n-icx/vpp-hoststack-00.md index 69b9857597..5c1eac9689 100644 --- a/resources/job_specs/report_iterative/2n-icx/vpp-hoststack-00.md +++ b/resources/job_specs/report_iterative/2n-icx/vpp-hoststack-00.md @@ -5,22 +5,34 @@ ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ### intel-e810xxv #### dpdk-vfio-pci ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND cps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND cps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND rps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND rps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND e810xxv AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ### intel-e810cq #### dpdk-vfio-pci ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 -2c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
\ No newline at end of file +2c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
\ No newline at end of file diff --git a/resources/job_specs/report_iterative/2n-spr/vpp-hoststack-00.md b/resources/job_specs/report_iterative/2n-spr/vpp-hoststack-00.md index 6da82618e5..18c6004eef 100644 --- a/resources/job_specs/report_iterative/2n-spr/vpp-hoststack-00.md +++ b/resources/job_specs/report_iterative/2n-spr/vpp-hoststack-00.md @@ -5,14 +5,42 @@ ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +##### eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 0b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +##### eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 0b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND 2p1cx7veat AND drv_mlx5_core AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 ### intel-e810cq #### dpdk-vfio-pci ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 2c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 ##### eth-ip4tcphttp-ldpreload-nginx-1_21_5 1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 -2c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
\ No newline at end of file +2c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5 +##### eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +##### eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 +2c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5
\ No newline at end of file diff --git a/resources/job_specs/report_iterative/3n-icx/vpp-mrr-01.md b/resources/job_specs/report_iterative/3n-icx/vpp-mrr-01.md new file mode 100644 index 0000000000..d041bf9735 --- /dev/null +++ b/resources/job_specs/report_iterative/3n-icx/vpp-mrr-01.md @@ -0,0 +1,143 @@ +# 3n-icx +### intel-e810cq +#### dpdk-vfio-pci +##### ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +##### ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +##### ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +##### ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +##### ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND e810cq AND drv_vfio_pci AND ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
\ No newline at end of file diff --git a/resources/libraries/bash/entry/bootstrap_aws_eb_version_create_release.sh b/resources/libraries/bash/entry/bootstrap_aws_eb_version_create_release.sh new file mode 100755 index 0000000000..0bbf3b83ff --- /dev/null +++ b/resources/libraries/bash/entry/bootstrap_aws_eb_version_create_release.sh @@ -0,0 +1,32 @@ +# Copyright (c) 2024 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# 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. + +set -exuo pipefail + +# Assumptions: +# + There is a directory holding CSIT code to use (this script is there). +# Consequences (and specific assumptions) are multiple, +# examine tree of functions for current description. + +# "set -eu" handles failures from the following two lines. +BASH_ENTRY_DIR="$(dirname $(readlink -e "${BASH_SOURCE[0]}"))" +BASH_FUNCTION_DIR="$(readlink -e "${BASH_ENTRY_DIR}/../function")" +source "${BASH_FUNCTION_DIR}/common.sh" || { + echo "Source failed." >&2 + exit 1 +} +source "${BASH_FUNCTION_DIR}/eb_version.sh" || die "Source failed." +source "${BASH_FUNCTION_DIR}/hugo.sh" || die "Source failed." +source "${BASH_FUNCTION_DIR}/terraform.sh" || die "Source failed." +common_dirs || die +eb_version_create_release || die diff --git a/resources/libraries/bash/function/eb_version.sh b/resources/libraries/bash/function/eb_version.sh index 0393030065..869e4b989c 100644 --- a/resources/libraries/bash/function/eb_version.sh +++ b/resources/libraries/bash/function/eb_version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -67,33 +67,16 @@ function eb_version_build_verify () { # Build and verify Elastic Beanstalk CDash integrity. # - # Variable read: - # - ${CSIT_DIR} - CSIT main directory. # Variables set: # - ${TERRAFORM_MODULE_DIR} - Terraform module sub-directory. # Functions called: - # - hugo_init_modules - Initialize Hugo modules. - # - hugo_build_site - Build static site with Hugo. # - terraform_init - Initialize Terraform modules. # - terraform_validate - Validate Terraform code. # - die - Print to stderr and exit. set -exuo pipefail - if ! installed zip; then - die "Please install zip!" - fi - - hugo_init_modules || die "Failed to call Hugo initialize!" - hugo_build_site || die "Failed to call Hugo build!" - - pushd "${CSIT_DIR}"/csit.infra.dash || die "Pushd failed!" - pushd app || die "Pushd failed!" - find . -type d -name "__pycache__" -exec rm -rf "{}" \; - find . -type d -name ".webassets-cache" -exec rm -rf "{}" \; - zip -r ../app.zip . || die "Compress failed!" - popd || die "Popd failed!" - popd || die "Popd failed!" + eb_version_create_release || die "Failed to create release!" TERRAFORM_MODULE_DIR="terraform-aws-fdio-csit-dash-app-base" @@ -103,46 +86,36 @@ function eb_version_build_verify () { } -function generate_report () { +function eb_version_create_release () { - # Generate report content. + # Create release of Elastic Beanstalk CDash. # # Variable read: - # - ${TOOLS_DIR} - Path to existing resources subdirectory "tools". - # - ${GERRIT_BRANCH} - Gerrit branch used for release tagging. - # Variables set: - # - ${CODE_EXIT_STATUS} - Exit status of report generation. + # - ${CSIT_DIR} - CSIT main directory. # Functions called: + # - hugo_init_modules - Initialize Hugo modules. + # - hugo_build_site - Build static site with Hugo. # - die - Print to stderr and exit. set -exuo pipefail - pushd "${TOOLS_DIR}"/presentation || die "Pushd failed!" - - # Set default values in config array. - typeset -A CFG - typeset -A DIR - - DIR[WORKING]="_tmp" - - # Create working directories. - mkdir "${DIR[WORKING]}" || die "Mkdir failed!" - - export PYTHONPATH=`pwd`:`pwd`/../../../ || die "Export failed!" + if ! installed zip; then + die "Please install zip!" + fi - all_options=("pal.py") - all_options+=("--specification" "specifications/report") - all_options+=("--release" "${GERRIT_BRANCH:-master}") - all_options+=("--week" $(date "+%V")) - all_options+=("--logging" "INFO") - all_options+=("--force") + hugo_init_modules || die "Failed to call Hugo initialize!" + hugo_build_site || die "Failed to call Hugo build!" - set +e - python "${all_options[@]}" - CODE_EXIT_STATUS="$?" - set -e + pushd "${CSIT_DIR}"/csit.infra.dash || die "Pushd failed!" + pushd app || die "Pushd failed!" + find . -type d -name "__pycache__" -exec rm -rf "{}" \; + find . -type d -name ".webassets-cache" -exec rm -rf "{}" \; + zip -r ../app.zip . || die "Compress failed!" + popd || die "Popd failed!" + popd || die "Popd failed!" } + function installed () { # Check if the given utility is installed. Fail if not installed. diff --git a/resources/libraries/python/CpuUtils.py b/resources/libraries/python/CpuUtils.py index c77d0f83b1..518469bd31 100644 --- a/resources/libraries/python/CpuUtils.py +++ b/resources/libraries/python/CpuUtils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -247,6 +247,9 @@ class CpuUtils: """Return list of DUT node related list of CPU numbers. The main computing unit is physical core count. + On SMT enabled DUTs, both sibling logical cores are used, + unless Robot variable \${smt_used} is set to False. + :param node: DUT node. :param cpu_node: Numa node number. :param nf_chains: Number of NF chains. @@ -278,6 +281,7 @@ class CpuUtils: raise RuntimeError(u"NodeID is out of range!") smt_used = CpuUtils.is_smt_enabled(node[u"cpuinfo"]) + smt_used = BuiltIn().get_variable_value("\${smt_used}", smt_used) cpu_list = CpuUtils.cpu_list_per_node(node, cpu_node, smt_used) # CPU thread sibling offset. sib = len(cpu_list) // CpuUtils.NR_OF_THREADS diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index bb46b49b14..59374ab73f 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -24,6 +24,7 @@ from typing import Iterable, List, Optional, Sequence, Tuple, Union from robot.libraries.BuiltIn import BuiltIn from resources.libraries.python.Constants import Constants +from resources.libraries.python.enum_util import get_enum_instance from resources.libraries.python.IncrementUtil import ObjIncrement from resources.libraries.python.InterfaceUtil import ( InterfaceUtil, @@ -60,27 +61,33 @@ def gen_key(length: int) -> bytes: ) -class PolicyAction(Enum): - """Policy actions.""" +# TODO: Introduce a metaclass that adds .find and .InputType automatically? +class IpsecSpdAction(Enum): + """IPsec SPD actions. - BYPASS = ("bypass", 0) + Mirroring VPP: src/vnet/ipsec/ipsec_types.api enum ipsec_spd_action. + """ + + BYPASS = NONE = ("bypass", 0) DISCARD = ("discard", 1) + RESOLVE = ("resolve", 2) PROTECT = ("protect", 3) - def __init__(self, policy_name: str, policy_int_repr: int): - self.policy_name = policy_name - self.policy_int_repr = policy_int_repr + def __init__(self, action_name: str, action_int_repr: int): + self.action_name = action_name + self.action_int_repr = action_int_repr def __str__(self) -> str: - return self.policy_name + return self.action_name def __int__(self) -> int: - return self.policy_int_repr + return self.action_int_repr class CryptoAlg(Enum): """Encryption algorithms.""" + NONE = ("none", 0, "none", 0) AES_CBC_128 = ("aes-cbc-128", 1, "AES-CBC", 16) AES_CBC_256 = ("aes-cbc-256", 3, "AES-CBC", 32) AES_GCM_128 = ("aes-gcm-128", 7, "AES-GCM", 16) @@ -94,10 +101,16 @@ class CryptoAlg(Enum): self.scapy_name = scapy_name self.key_len = key_len + # TODO: Investigate if __int__ works with PAPI. It was not enough for "if". + def __bool__(self): + """A shorthand to enable "if crypto_alg:" constructs.""" + return self.alg_int_repr != 0 + class IntegAlg(Enum): """Integrity algorithm.""" + NONE = ("none", 0, "none", 0) SHA_256_128 = ("sha-256-128", 4, "SHA2-256-128", 32) SHA_512_256 = ("sha-512-256", 6, "SHA2-512-256", 64) @@ -109,18 +122,44 @@ class IntegAlg(Enum): self.scapy_name = scapy_name self.key_len = key_len + def __bool__(self): + """A shorthand to enable "if integ_alg:" constructs.""" + return self.alg_int_repr != 0 + +# TODO: Base on Enum, so str values can be defined as in alg enums? class IPsecProto(IntEnum): - """IPsec protocol.""" + """IPsec protocol. + + Mirroring VPP: src/vnet/ipsec/ipsec_types.api enum ipsec_proto. + """ - IPSEC_API_PROTO_ESP = 50 - IPSEC_API_PROTO_AH = 51 + ESP = 50 + AH = 51 + NONE = 255 + def __str__(self) -> str: + """Return string suitable for CLI commands. + + None is not supported. + + :returns: Lowercase name of the proto. + :rtype: str + :raises: ValueError if the numeric value is not recognized. + """ + num = int(self) + if num == 50: + return "esp" + if num == 51: + return "ah" + raise ValueError(f"String form not defined for IPsecProto {num}") + +# The rest of enums do not appear outside this file, so no no change needed yet. class IPsecSadFlags(IntEnum): """IPsec Security Association Database flags.""" - IPSEC_API_SAD_FLAG_NONE = 0 + IPSEC_API_SAD_FLAG_NONE = NONE = 0 # Enable extended sequence numbers IPSEC_API_SAD_FLAG_USE_ESN = 0x01 # Enable Anti - replay @@ -139,7 +178,7 @@ class IPsecSadFlags(IntEnum): class TunnelEncpaDecapFlags(IntEnum): """Flags controlling tunnel behaviour.""" - TUNNEL_API_ENCAP_DECAP_FLAG_NONE = 0 + TUNNEL_API_ENCAP_DECAP_FLAG_NONE = NONE = 0 # at encap, copy the DF bit of the payload into the tunnel header TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DF = 1 # at encap, set the DF bit in the tunnel header @@ -156,177 +195,93 @@ class TunnelMode(IntEnum): """Tunnel modes.""" # point-to-point - TUNNEL_API_MODE_P2P = 0 + TUNNEL_API_MODE_P2P = NONE = 0 # multi-point TUNNEL_API_MODE_MP = 1 -class IPsecUtil: - """IPsec utilities.""" - - @staticmethod - def policy_action_bypass() -> PolicyAction: - """Return policy action bypass. - - :returns: PolicyAction enum BYPASS object. - :rtype: PolicyAction - """ - return PolicyAction.BYPASS - - @staticmethod - def policy_action_discard() -> PolicyAction: - """Return policy action discard. - - :returns: PolicyAction enum DISCARD object. - :rtype: PolicyAction - """ - return PolicyAction.DISCARD - - @staticmethod - def policy_action_protect() -> PolicyAction: - """Return policy action protect. - - :returns: PolicyAction enum PROTECT object. - :rtype: PolicyAction - """ - return PolicyAction.PROTECT +# Derived types for type hints, based on capabilities of get_enum_instance. +IpsecSpdAction.InputType = Union[IpsecSpdAction, str, None] +CryptoAlg.InputType = Union[CryptoAlg, str, None] +IntegAlg.InputType = Union[IntegAlg, str, None] +IPsecProto.InputType = Union[IPsecProto, str, int, None] +# TODO: Introduce a metaclass that adds .find and .InputType automatically? - @staticmethod - def crypto_alg_aes_cbc_128() -> CryptoAlg: - """Return encryption algorithm aes-cbc-128. - :returns: CryptoAlg enum AES_CBC_128 object. - :rtype: CryptoAlg - """ - return CryptoAlg.AES_CBC_128 - - @staticmethod - def crypto_alg_aes_cbc_256() -> CryptoAlg: - """Return encryption algorithm aes-cbc-256. - - :returns: CryptoAlg enum AES_CBC_256 object. - :rtype: CryptoAlg - """ - return CryptoAlg.AES_CBC_256 - - @staticmethod - def crypto_alg_aes_gcm_128() -> CryptoAlg: - """Return encryption algorithm aes-gcm-128. - - :returns: CryptoAlg enum AES_GCM_128 object. - :rtype: CryptoAlg - """ - return CryptoAlg.AES_GCM_128 - - @staticmethod - def crypto_alg_aes_gcm_256() -> CryptoAlg: - """Return encryption algorithm aes-gcm-256. +class IPsecUtil: + """IPsec utilities.""" - :returns: CryptoAlg enum AES_GCM_128 object. - :rtype: CryptoAlg - """ - return CryptoAlg.AES_GCM_256 + # The following 4 methods are Python one-liners, + # but they are useful when called as a Robot keyword. @staticmethod - def get_crypto_alg_key_len(crypto_alg: CryptoAlg) -> int: + def get_crypto_alg_key_len(crypto_alg: CryptoAlg.InputType) -> int: """Return encryption algorithm key length. + This is a Python one-liner, but useful when called as a Robot keyword. + :param crypto_alg: Encryption algorithm. - :type crypto_alg: CryptoAlg + :type crypto_alg: CryptoAlg.InputType :returns: Key length. :rtype: int """ - return crypto_alg.key_len + return get_enum_instance(CryptoAlg, crypto_alg).key_len @staticmethod - def get_crypto_alg_scapy_name(crypto_alg: CryptoAlg) -> str: + def get_crypto_alg_scapy_name(crypto_alg: CryptoAlg.InputType) -> str: """Return encryption algorithm scapy name. + This is a Python one-liner, but useful when called as a Robot keyword. + :param crypto_alg: Encryption algorithm. - :type crypto_alg: CryptoAlg + :type crypto_alg: CryptoAlg.InputType :returns: Algorithm scapy name. :rtype: str """ - return crypto_alg.scapy_name - - @staticmethod - def integ_alg_sha_256_128() -> IntegAlg: - """Return integrity algorithm SHA-256-128. - - :returns: IntegAlg enum SHA_256_128 object. - :rtype: IntegAlg - """ - return IntegAlg.SHA_256_128 + return get_enum_instance(CryptoAlg, crypto_alg).scapy_name + # The below to keywords differ only by enum type conversion from str. @staticmethod - def integ_alg_sha_512_256() -> IntegAlg: - """Return integrity algorithm SHA-512-256. - - :returns: IntegAlg enum SHA_512_256 object. - :rtype: IntegAlg - """ - return IntegAlg.SHA_512_256 - - @staticmethod - def get_integ_alg_key_len(integ_alg: Optional[IntegAlg]) -> int: + def get_integ_alg_key_len(integ_alg: IntegAlg.InputType) -> int: """Return integrity algorithm key length. - None argument is accepted, returning zero. - :param integ_alg: Integrity algorithm. - :type integ_alg: Optional[IntegAlg] + :type integ_alg: IntegAlg.InputType :returns: Key length. :rtype: int """ - return 0 if integ_alg is None else integ_alg.key_len + return get_enum_instance(IntegAlg, integ_alg).key_len @staticmethod - def get_integ_alg_scapy_name(integ_alg: Optional[IntegAlg]) -> str: + def get_integ_alg_scapy_name(integ_alg: IntegAlg.InputType) -> str: """Return integrity algorithm scapy name. :param integ_alg: Integrity algorithm. - :type integ_alg: IntegAlg + :type integ_alg: IntegAlg.InputType :returns: Algorithm scapy name. :rtype: str """ - return integ_alg.scapy_name - - @staticmethod - def ipsec_proto_esp() -> int: - """Return IPSec protocol ESP. - - :returns: IPsecProto enum ESP object. - :rtype: IPsecProto - """ - return int(IPsecProto.IPSEC_API_PROTO_ESP) - - @staticmethod - def ipsec_proto_ah() -> int: - """Return IPSec protocol AH. - - :returns: IPsecProto enum AH object. - :rtype: IPsecProto - """ - return int(IPsecProto.IPSEC_API_PROTO_AH) + return get_enum_instance(IntegAlg, integ_alg).scapy_name @staticmethod def vpp_ipsec_select_backend( - node: dict, protocol: int, index: int = 1 + node: dict, proto: IPsecProto.InputType, index: int = 1 ) -> None: """Select IPsec backend. :param node: VPP node to select IPsec backend on. - :param protocol: IPsec protocol. + :param proto: IPsec protocol. :param index: Backend index. :type node: dict - :type protocol: IPsecProto + :type proto: IPsecProto.InputType :type index: int :raises RuntimeError: If failed to select IPsec backend or if no API reply received. """ + proto = get_enum_instance(IPsecProto, proto) cmd = "ipsec_select_backend" err_msg = f"Failed to select IPsec backend on host {node['host']}" - args = dict(protocol=protocol, index=index) + args = dict(protocol=proto, index=index) with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @@ -420,9 +375,9 @@ class IPsecUtil: node: dict, sad_id: int, spi: int, - crypto_alg: CryptoAlg, - crypto_key: str, - integ_alg: Optional[IntegAlg] = None, + crypto_alg: CryptoAlg.InputType = None, + crypto_key: str = "", + integ_alg: IntegAlg.InputType = None, integ_key: str = "", tunnel_src: Optional[str] = None, tunnel_dst: Optional[str] = None, @@ -443,13 +398,15 @@ class IPsecUtil: :type node: dict :type sad_id: int :type spi: int - :type crypto_alg: CryptoAlg + :type crypto_alg: CryptoAlg.InputType :type crypto_key: str - :type integ_alg: Optional[IntegAlg] + :type integ_alg: IntegAlg.InputType :type integ_key: str :type tunnel_src: Optional[str] :type tunnel_dst: Optional[str] """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) if isinstance(crypto_key, str): crypto_key = crypto_key.encode(encoding="utf-8") if isinstance(integ_key, str): @@ -480,7 +437,7 @@ class IPsecUtil: spi=int(spi), crypto_algorithm=crypto_alg.alg_int_repr, crypto_key=ckey, - integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0, + integrity_algorithm=integ_alg.alg_int_repr, integrity_key=ikey, flags=flags, tunnel=dict( @@ -492,7 +449,7 @@ class IPsecUtil: ), dscp=int(IpDscp.IP_API_DSCP_CS0), ), - protocol=int(IPsecProto.IPSEC_API_PROTO_ESP), + protocol=IPsecProto.ESP, udp_src_port=IPSEC_UDP_PORT_DEFAULT, udp_dst_port=IPSEC_UDP_PORT_DEFAULT, anti_replay_window_size=IPSEC_REPLAY_WINDOW_DEFAULT, @@ -507,9 +464,9 @@ class IPsecUtil: n_entries: int, sad_id: int, spi: int, - crypto_alg: CryptoAlg, - crypto_key: str, - integ_alg: Optional[IntegAlg] = None, + crypto_alg: CryptoAlg.InputType = None, + crypto_key: str = "", + integ_alg: IntegAlg.InputType = None, integ_key: str = "", tunnel_src: Optional[str] = None, tunnel_dst: Optional[str] = None, @@ -537,14 +494,16 @@ class IPsecUtil: :type n_entries: int :type sad_id: int :type spi: int - :type crypto_alg: CryptoAlg + :type crypto_alg: CryptoAlg.InputType :type crypto_key: str - :type integ_alg: Optional[IntegAlg] + :type integ_alg: IntegAlg.InputType :type integ_key: str :type tunnel_src: Optional[str] :type tunnel_dst: Optional[str] :type tunnel_addr_incr: bool """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) if isinstance(crypto_key, str): crypto_key = crypto_key.encode(encoding="utf-8") if isinstance(integ_key, str): @@ -585,7 +544,7 @@ class IPsecUtil: spi=int(spi), crypto_algorithm=crypto_alg.alg_int_repr, crypto_key=ckey, - integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0, + integrity_algorithm=integ_alg.alg_int_repr, integrity_key=ikey, flags=flags, tunnel=dict( @@ -597,7 +556,7 @@ class IPsecUtil: ), dscp=int(IpDscp.IP_API_DSCP_CS0), ), - protocol=int(IPsecProto.IPSEC_API_PROTO_ESP), + protocol=IPsecProto.ESP, udp_src_port=IPSEC_UDP_PORT_DEFAULT, udp_dst_port=IPSEC_UDP_PORT_DEFAULT, anti_replay_window_size=IPSEC_REPLAY_WINDOW_DEFAULT, @@ -774,7 +733,7 @@ class IPsecUtil: entry_amount: int, local_addr_range: Union[str, IPv4Address, IPv6Address], remote_addr_range: Union[str, IPv4Address, IPv6Address], - action: PolicyAction = PolicyAction.BYPASS, + action: IpsecSpdAction.InputType = IpsecSpdAction.BYPASS, inbound: bool = False, bidirectional: bool = True, ) -> None: @@ -801,7 +760,7 @@ class IPsecUtil: :param remote_addr_range: Matching remote address range in direction 1 in format IP/prefix or IP/mask. If no mask is provided, it's considered to be /32. - :param action: Policy action. + :param action: IPsec SPD action. :param inbound: If True policy is for inbound traffic, otherwise outbound. :param bidirectional: When True, will create SPDs in both directions @@ -814,14 +773,16 @@ class IPsecUtil: Union[str, IPv4Address, IPv6Address] :type remote_addr_range: Union[str, IPv4Address, IPv6Address] - :type action: PolicyAction + :type action: IpsecSpdAction.InputType :type inbound: bool :type bidirectional: bool - :raises NotImplementedError: When the action is PolicyAction.PROTECT. + :raises NotImplementedError: When the action is IpsecSpdAction.PROTECT. """ - - if action == PolicyAction.PROTECT: - raise NotImplementedError("Policy action PROTECT is not supported.") + action = get_enum_instance(IpsecSpdAction, action) + if action == IpsecSpdAction.PROTECT: + raise NotImplementedError( + "IPsec SPD action PROTECT is not supported." + ) spd_id_dir1 = 1 spd_id_dir2 = 2 @@ -913,10 +874,10 @@ class IPsecUtil: executor: PapiSocketExecutor, spd_id: int, priority: int, - action: PolicyAction, + action: IpsecSpdAction.InputType, inbound: bool = True, sa_id: Optional[int] = None, - proto: Optional[int] = None, + proto: IPsecProto.InputType = None, laddr_range: Optional[str] = None, raddr_range: Optional[str] = None, lport_range: Optional[str] = None, @@ -932,10 +893,10 @@ class IPsecUtil: :param executor: Open PAPI executor (async handling) to add commands to. :param spd_id: SPD ID to add entry on. :param priority: SPD entry priority, higher number = higher priority. - :param action: Policy action. + :param action: IPsec SPD action. :param inbound: If True policy is for inbound traffic, otherwise outbound. - :param sa_id: SAD entry ID for action PolicyAction.PROTECT. + :param sa_id: SAD entry ID for action IpsecSpdAction.PROTECT. :param proto: Policy selector next layer protocol number. :param laddr_range: Policy selector local IPv4 or IPv6 address range in format IP/prefix or IP/mask. If no mask is provided, @@ -952,16 +913,18 @@ class IPsecUtil: :type executor: PapiSocketExecutor :type spd_id: int :type priority: int - :type action: PolicyAction + :type action: IpsecSpdAction.InputType :type inbound: bool :type sa_id: Optional[int] - :type proto: Optional[int] + :type proto: IPsecProto.InputType :type laddr_range: Optional[str] :type raddr_range: Optional[str] :type lport_range: Optional[str] :type rport_range: Optional[str] :type is_ipv6: bool """ + action = get_enum_instance(IpsecSpdAction, action) + proto = get_enum_instance(IPsecProto, proto) if laddr_range is None: laddr_range = "::/0" if is_ipv6 else "0.0.0.0/0" @@ -979,7 +942,7 @@ class IPsecUtil: is_outbound=not inbound, sa_id=int(sa_id) if sa_id else 0, policy=int(action), - protocol=255 if proto is None else int(proto), + protocol=proto, remote_address_start=IPAddress.create_ip_address_object( remote_net.network_address ), @@ -1013,10 +976,10 @@ class IPsecUtil: node: dict, spd_id: int, priority: int, - action: PolicyAction, + action: IpsecSpdAction.InputType, inbound: bool = True, sa_id: Optional[int] = None, - proto: Optional[int] = None, + proto: IPsecProto.InputType = None, laddr_range: Optional[str] = None, raddr_range: Optional[str] = None, lport_range: Optional[str] = None, @@ -1028,10 +991,10 @@ class IPsecUtil: :param node: VPP node to add SPD entry on. :param spd_id: SPD ID to add entry on. :param priority: SPD entry priority, higher number = higher priority. - :param action: Policy action. + :param action: IPsec SPD action. :param inbound: If True policy is for inbound traffic, otherwise outbound. - :param sa_id: SAD entry ID for action PolicyAction.PROTECT. + :param sa_id: SAD entry ID for action IpsecSpdAction.PROTECT. :param proto: Policy selector next layer protocol number. :param laddr_range: Policy selector local IPv4 or IPv6 address range in format IP/prefix or IP/mask. If no mask is provided, @@ -1048,16 +1011,18 @@ class IPsecUtil: :type node: dict :type spd_id: int :type priority: int - :type action: PolicyAction + :type action: IpsecSpdAction.InputType :type inbound: bool :type sa_id: Optional[int] - :type proto: Optional[int] + :type proto: IPsecProto.InputType :type laddr_range: Optional[str] :type raddr_range: Optional[str] :type lport_range: Optional[str] :type rport_range: Optional[str] :type is_ipv6: bool """ + action = get_enum_instance(IpsecSpdAction, action) + proto = get_enum_instance(IPsecProto, proto) err_msg = ( "Failed to add entry to Security Policy Database" f" {spd_id} on host {node['host']}" @@ -1085,10 +1050,10 @@ class IPsecUtil: n_entries: int, spd_id: int, priority: Optional[ObjIncrement], - action: PolicyAction, + action: IpsecSpdAction.InputType, inbound: bool, sa_id: Optional[ObjIncrement] = None, - proto: Optional[int] = None, + proto: IPsecProto.InputType = None, laddr_range: Optional[NetworkIncrement] = None, raddr_range: Optional[NetworkIncrement] = None, lport_range: Optional[str] = None, @@ -1101,10 +1066,10 @@ class IPsecUtil: :param n_entries: Number of SPD entries to be added. :param spd_id: SPD ID to add entries on. :param priority: SPD entries priority, higher number = higher priority. - :param action: Policy action. + :param action: IPsec SPD action. :param inbound: If True policy is for inbound traffic, otherwise outbound. - :param sa_id: SAD entry ID for action PolicyAction.PROTECT. + :param sa_id: SAD entry ID for action IpsecSpdAction.PROTECT. :param proto: Policy selector next layer protocol number. :param laddr_range: Policy selector local IPv4 or IPv6 address range in format IP/prefix or IP/mask. If no mask is provided, @@ -1122,16 +1087,18 @@ class IPsecUtil: :type n_entries: int :type spd_id: int :type priority: Optional[ObjIncrement] - :type action: PolicyAction + :type action: IpsecSpdAction.InputType :type inbound: bool :type sa_id: Optional[ObjIncrement] - :type proto: Optional[int] + :type proto: IPsecProto.InputType :type laddr_range: Optional[NetworkIncrement] :type raddr_range: Optional[NetworkIncrement] :type lport_range: Optional[str] :type rport_range: Optional[str] :type is_ipv6: bool """ + action = get_enum_instance(IpsecSpdAction, action) + proto = get_enum_instance(IPsecProto, proto) if laddr_range is None: laddr_range = "::/0" if is_ipv6 else "0.0.0.0/0" laddr_range = NetworkIncrement(ip_network(laddr_range), 0) @@ -1253,8 +1220,8 @@ class IPsecUtil: if1_key: str, if2_key: str, n_tunnels: int, - crypto_alg: CryptoAlg, - integ_alg: Optional[IntegAlg], + crypto_alg: CryptoAlg.InputType, + integ_alg: IntegAlg.InputType, raddr_ip2: Union[IPv4Address, IPv6Address], addr_incr: int, spi_d: dict, @@ -1285,8 +1252,8 @@ class IPsecUtil: :type if1_key: str :type if2_key: str :type n_tunnels: int - :type crypto_alg: CryptoAlg - :type integ_alg: Optional[IntegAlg] + :type crypto_alg: CryptoAlg.InputType + :type integ_alg: IntegAlg.InputType :type raddr_ip2: Union[IPv4Address, IPv6Address] :type addr_incr: int :type spi_d: dict @@ -1294,6 +1261,8 @@ class IPsecUtil: :returns: Generated ckeys and ikeys. :rtype: List[bytes], List[bytes] """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) if not existing_tunnels: loop_sw_if_idx = IPsecUtil._ipsec_create_loopback_dut1_papi( nodes, tun_ips, if1_key, if2_key @@ -1365,10 +1334,10 @@ class IPsecUtil: sad_entry = dict( sad_id=None, spi=None, - protocol=int(IPsecProto.IPSEC_API_PROTO_ESP), + protocol=IPsecProto.ESP, crypto_algorithm=crypto_alg.alg_int_repr, crypto_key=c_key, - integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0, + integrity_algorithm=integ_alg.alg_int_repr, integrity_key=i_key, flags=common_flags, tunnel=dict( @@ -1387,12 +1356,8 @@ class IPsecUtil: ) args = dict(entry=sad_entry) for i in range(existing_tunnels, n_tunnels): - ckeys.append( - gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg)) - ) - ikeys.append( - gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg)) - ) + ckeys.append(gen_key(crypto_alg.key_len)) + ikeys.append(gen_key(integ_alg.key_len)) # SAD entry for outband / tx path sad_entry["sad_id"] = i sad_entry["spi"] = spi_d["spi_1"] + i @@ -1497,9 +1462,9 @@ class IPsecUtil: tun_ips: dict, if2_key: str, n_tunnels: int, - crypto_alg: CryptoAlg, + crypto_alg: CryptoAlg.InputType, ckeys: Sequence[bytes], - integ_alg: Optional[IntegAlg], + integ_alg: IntegAlg.InputType, ikeys: Sequence[bytes], raddr_ip1: Union[IPv4Address, IPv6Address], addr_incr: int, @@ -1532,15 +1497,17 @@ class IPsecUtil: :type tun_ips: dict :type if2_key: str :type n_tunnels: int - :type crypto_alg: CryptoAlg + :type crypto_alg: CryptoAlg.InputType :type ckeys: Sequence[bytes] - :type integ_alg: Optional[IntegAlg] + :type integ_alg: IntegAlg.InputType :type ikeys: Sequence[bytes] :type raddr_ip1: Union[IPv4Address, IPv6Address] :type addr_incr: int :type spi_d: dict :type existing_tunnels: int """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) with PapiSocketExecutor(nodes["DUT2"], is_async=True) as papi_exec: if not existing_tunnels: # Set IP address on VPP node 2 interface @@ -1605,10 +1572,10 @@ class IPsecUtil: sad_entry = dict( sad_id=None, spi=None, - protocol=int(IPsecProto.IPSEC_API_PROTO_ESP), + protocol=IPsecProto.ESP, crypto_algorithm=crypto_alg.alg_int_repr, crypto_key=c_key, - integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0, + integrity_algorithm=integ_alg.alg_int_repr, integrity_key=i_key, flags=common_flags, tunnel=dict( @@ -1627,12 +1594,8 @@ class IPsecUtil: ) args = dict(entry=sad_entry) for i in range(existing_tunnels, n_tunnels): - ckeys.append( - gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg)) - ) - ikeys.append( - gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg)) - ) + ckeys.append(gen_key(crypto_alg.key_len)) + ikeys.append(gen_key(integ_alg.key_len)) # SAD entry for outband / tx path sad_entry["sad_id"] = 100000 + i sad_entry["spi"] = spi_d["spi_2"] + i @@ -1749,8 +1712,8 @@ class IPsecUtil: if1_key: str, if2_key: str, n_tunnels: int, - crypto_alg: CryptoAlg, - integ_alg: Optional[IntegAlg], + crypto_alg: CryptoAlg.InputType, + integ_alg: IntegAlg.InputType, raddr_ip1: str, raddr_ip2: str, raddr_range: int, @@ -1790,8 +1753,8 @@ class IPsecUtil: :type if1_key: str :type if2_key: str :type n_tunnels: int - :type crypto_alg: CryptoAlg - :type integ_alg: Optional[IntegAlg] + :type crypto_alg: CryptoAlg.InputType + :type integ_alg: IntegAlg.InputType :type raddr_ip1: str :type raddr_ip2: str :type raddr_range: int @@ -1800,6 +1763,8 @@ class IPsecUtil: :returns: Ckeys, ikeys, spi_1, spi_2. :rtype: Optional[Tuple[List[bytes], List[bytes], int, int]] """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) n_tunnels = int(n_tunnels) existing_tunnels = int(existing_tunnels) spi_d = dict(spi_1=100000, spi_2=200000) @@ -1848,13 +1813,56 @@ class IPsecUtil: return None @staticmethod + def _create_ipsec_script_files( + dut: str, instances: int + ) -> List[TextIOWrapper]: + """Create script files for configuring IPsec in containers + + :param dut: DUT node on which to create the script files + :param instances: number of containers on DUT node + :type dut: str + :type instances: int + :returns: Created opened file handles. + :rtype: List[TextIOWrapper] + """ + scripts = [] + for cnf in range(0, instances): + script_filename = ( + f"/tmp/ipsec_create_tunnel_cnf_{dut}_{cnf + 1}.config" + ) + scripts.append(open(script_filename, "w", encoding="utf-8")) + return scripts + + @staticmethod + def _close_and_copy_ipsec_script_files( + dut: str, nodes: dict, instances: int, scripts: Sequence[TextIOWrapper] + ) -> None: + """Close created scripts and copy them to containers + + :param dut: DUT node on which to create the script files + :param nodes: VPP nodes + :param instances: number of containers on DUT node + :param scripts: dictionary holding the script files + :type dut: str + :type nodes: dict + :type instances: int + :type scripts: dict + """ + for cnf in range(0, instances): + scripts[cnf].close() + script_filename = ( + f"/tmp/ipsec_create_tunnel_cnf_{dut}_{cnf + 1}.config" + ) + scp_node(nodes[dut], script_filename, script_filename) + + @staticmethod def vpp_ipsec_add_multiple_tunnels( nodes: dict, interface1: Union[str, int], interface2: Union[str, int], n_tunnels: int, - crypto_alg: CryptoAlg, - integ_alg: Optional[IntegAlg], + crypto_alg: CryptoAlg.InputType, + integ_alg: IntegAlg.InputType, tunnel_ip1: str, tunnel_ip2: str, raddr_ip1: str, @@ -1884,8 +1892,8 @@ class IPsecUtil: :type interface1: Union[str, int] :type interface2: Union[str, int] :type n_tunnels: int - :type crypto_alg: CryptoAlg - :type integ_alg: Optional[IntegAlg] + :type crypto_alg: CryptoAlg.InputType + :type integ_alg: IntegAlg.InputType :type tunnel_ip1: str :type tunnel_ip2: str :type raddr_ip1: str @@ -1893,6 +1901,9 @@ class IPsecUtil: :type raddr_range: int :type tunnel_addr_incr: bool """ + crypto_alg = get_enum_instance(CryptoAlg, crypto_alg) + integ_alg = get_enum_instance(IntegAlg, integ_alg) + spd_id = 1 p_hi = 100 p_lo = 10 @@ -1901,15 +1912,8 @@ class IPsecUtil: spi_1 = 300000 spi_2 = 400000 - crypto_key = gen_key( - IPsecUtil.get_crypto_alg_key_len(crypto_alg) - ).decode() - integ_key = ( - gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg)).decode() - if integ_alg - else "" - ) - + crypto_key = gen_key(crypto_alg.key_len).decode() + integ_key = gen_key(integ_alg.key_len).decode() rmac = ( Topology.get_interface_mac(nodes["DUT2"], interface2) if "DUT2" in nodes.keys() @@ -1946,9 +1950,9 @@ class IPsecUtil: nodes["DUT1"], spd_id, p_hi, - PolicyAction.BYPASS, + IpsecSpdAction.BYPASS, inbound=False, - proto=50, + proto=IPsecProto.ESP, laddr_range=dut1_local_outbound_range, raddr_range=dut1_remote_outbound_range, ) @@ -1956,9 +1960,9 @@ class IPsecUtil: nodes["DUT1"], spd_id, p_hi, - PolicyAction.BYPASS, + IpsecSpdAction.BYPASS, inbound=True, - proto=50, + proto=IPsecProto.ESP, laddr_range=dut1_remote_outbound_range, raddr_range=dut1_local_outbound_range, ) @@ -1982,7 +1986,7 @@ class IPsecUtil: n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0), - action=PolicyAction.PROTECT, + action=IpsecSpdAction.PROTECT, inbound=False, sa_id=ObjIncrement(sa_id_1, 1), raddr_range=NetworkIncrement(ip_network(raddr_ip2)), @@ -2006,7 +2010,7 @@ class IPsecUtil: n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0), - action=PolicyAction.PROTECT, + action=IpsecSpdAction.PROTECT, inbound=True, sa_id=ObjIncrement(sa_id_2, 1), raddr_range=NetworkIncrement(ip_network(raddr_ip1)), @@ -2039,9 +2043,9 @@ class IPsecUtil: nodes["DUT2"], spd_id, p_hi, - PolicyAction.BYPASS, + IpsecSpdAction.BYPASS, inbound=False, - proto=50, + proto=IPsecProto.ESP, laddr_range=dut2_remote_outbound_range, raddr_range=dut2_local_outbound_range, ) @@ -2049,9 +2053,9 @@ class IPsecUtil: nodes["DUT2"], spd_id, p_hi, - PolicyAction.BYPASS, + IpsecSpdAction.BYPASS, inbound=True, - proto=50, + proto=IPsecProto.ESP, laddr_range=dut2_local_outbound_range, raddr_range=dut2_remote_outbound_range, ) @@ -2074,7 +2078,7 @@ class IPsecUtil: n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0), - action=PolicyAction.PROTECT, + action=IpsecSpdAction.PROTECT, inbound=True, sa_id=ObjIncrement(sa_id_1, 1), raddr_range=NetworkIncrement(ip_network(raddr_ip2)), @@ -2098,7 +2102,7 @@ class IPsecUtil: n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0), - action=PolicyAction.PROTECT, + action=IpsecSpdAction.PROTECT, inbound=False, sa_id=ObjIncrement(sa_id_2, 1), raddr_range=NetworkIncrement(ip_network(raddr_ip1)), @@ -2125,7 +2129,10 @@ class IPsecUtil: @staticmethod def vpp_ipsec_flow_enable_rss( - node: dict, proto: str, rss_type: str, function: str = "default" + node: dict, + proto: str = "IPSEC_ESP", + rss_type: str = "esp", + function: str = "default", ) -> int: """Ipsec flow enable rss action. @@ -2133,14 +2140,18 @@ class IPsecUtil: :param proto: The flow protocol. :param rss_type: RSS type. :param function: RSS function. - :type node: dict - :type proto: str + :type proto: IPsecProto.InputType :type rss_type: str :type function: str :returns: flow_index. :rtype: int """ + # The proto argument does not correspond to IPsecProto. + # The allowed values come from src/vnet/ip/protocols.def + # and we do not have a good enum for that yet. + # FlowUti. and FlowUtil. are close but not exactly the same. + # TODO: to be fixed to use full PAPI when it is ready in VPP cmd = ( f"test flow add src-ip any proto {proto} rss function" diff --git a/resources/libraries/python/enum_util.py b/resources/libraries/python/enum_util.py new file mode 100644 index 0000000000..41dfd8a459 --- /dev/null +++ b/resources/libraries/python/enum_util.py @@ -0,0 +1,67 @@ +# Copyright (c) 2024 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# 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. + +"""Utility functions for handling VPP API enum values from Robot.""" + + +from enum import Enum, IntEnum +from typing import Type, Union + + +# The return type is enum_class, but it is hard to explain that to pylint. +def get_enum_instance( + enum_class: Type[Enum], value: Union[Enum, str, int, None] +) -> Enum: + """Return an enum instance matching the string name. + + In Robot, it is not convenient to construct Enum instances, + most values defined in Robot are strings. + + This helper function can be used in Python L1 keywords + to convert string into the corresponding Enum instance. + Aliases are also recognized. + + As an added benefit, support various Robot-like niceties, + like lower case, or dash or space instead of underscore. + + As a common shortcut, value is returned it it already is an instance. + + Another convenience: None or empty string is processed as "NONE". + + If the class is a subclass of IntEnum, int values + and (string) values convertable to int are also accepted as input. + + :param enum_class: Class object instance of which should be returned. + :param value: String or any other recognized form of an enum instance. + :type enum_class: Type[Enum] + :type value: Union[enum_class, str, int, None] + :returns: The matching instance, if found. + :rtype: enum_class + :raises: ValueError if no matching instance is found. + """ + if issubclass(enum_class, IntEnum): + try: + int_value = int(value) + return enum_class(int_value) + except (TypeError, ValueError): + pass + if isinstance(value, enum_class): + return value + if not value: + value = "NONE" + normalized_name = str(value).upper().replace("-", "_").replace(" ", "_") + members = enum_class.__members__ # Includes aliases, useful for NONE. + if normalized_name not in members: + msg = f"Enum class {enum_class} does not have value {normalized_name!r}" + raise ValueError(msg) + return members[normalized_name] diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot index 8403ae4516..ebaac15bc8 100644 --- a/resources/libraries/robot/crypto/ipsec.robot +++ b/resources/libraries/robot/crypto/ipsec.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -152,18 +152,16 @@ | | ... | ${r_tunnel} | ${l_tunnel} | | VPP IPsec Add SPD | ${node} | ${spd_id} | | VPP IPsec SPD Add If | ${node} | ${spd_id} | ${interface} -| | ${action}= | Policy Action Bypass -| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | ${action} -| | ... | inbound=${TRUE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6} +| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | BYPASS +| | ... | inbound=${TRUE} | proto=ESP | is_ipv6=${is_ipv6} | | ... | laddr_range=${tg_tun_ip} | raddr_range=${dut_tun_ip} -| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | ${action} -| | ... | inbound=${FALSE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6} +| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | BYPASS +| | ... | inbound=${FALSE} | proto=ESP | is_ipv6=${is_ipv6} | | ... | laddr_range=${dut_tun_ip} | raddr_range=${tg_tun_ip} -| | ${action}= | Policy Action Protect -| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | ${action} +| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | PROTECT | | ... | sa_id=${r_sa_id} | laddr_range=${l_ip} | | ... | raddr_range=${r_ip} | inbound=${TRUE} -| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | ${action} +| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | PROTECT | | ... | sa_id=${l_sa_id} | laddr_range=${l_ip} | | ... | raddr_range=${r_ip} | inbound=${FALSE} diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot index 1033c1c008..20c071dc2d 100644 --- a/resources/libraries/robot/hoststack/hoststack.robot +++ b/resources/libraries/robot/hoststack/hoststack.robot @@ -698,5 +698,4 @@ | | | ... | ${dut}.Add DPDK Dev Default Tso | | | Run keyword If | '${nic_driver}' == 'vfio-pci' | | | ... | ${dut}.Add DPDK Enable Tcp Udp Checksum -| | | Run keyword | ${dut}.Add Api Trace | | END diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot index c91ae637ee..0d50fde74a 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -79,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES CBC 128 -| | ${auth_alg} = | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot index d424ee4727..621dcec74c 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -79,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES CBC 128 -| | ${auth_alg} = | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot index 88e769a2e1..bac48c58c8 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip4}= | 192.168.100.2 | ${tg_if2_ip4}= | 192.168.4.4 | ${dut_if1_ip4}= | 192.168.100.3 @@ -80,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot index ca456cef1c..285154c87f 100644 --- a/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip4/2n1l-10ge2p1x710-ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip4}= | 192.168.100.2 | ${tg_if2_ip4}= | 192.168.4.4 | ${dut_if1_ip4}= | 192.168.100.3 @@ -80,10 +81,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot index 3b417ab15e..0b20f05a00 100644 --- a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${54} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip6}= | 3ffe:5f::1 | ${tg_if2_ip6}= | 3ffe:60::4 | ${dut_if1_ip6}= | 3ffe:5f::2 @@ -81,10 +82,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot index 71e92f80f0..93c8142a1b 100644 --- a/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot +++ b/tests/vpp/device/crypto/ethip6/2n1l-10ge2p1x710-ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha-scapy.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -45,6 +45,8 @@ | ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -54,7 +56,6 @@ | ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} -| ${ESP_PROTO}= | ${50} | ${tg_if1_ip6}= | 3ffe:5f::1 | ${tg_if2_ip6}= | 3ffe:60::4 | ${dut_if1_ip6}= | 3ffe:5f::2 @@ -81,10 +82,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot index 570019efb3..0e1cecab98 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot index be4b178442..38848d4489 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot index 3cd947f871..1cb7670472 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -104,10 +106,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot index 7026477690..d1842e0d76 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlhwasync-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -104,10 +106,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 92fa3ec088..30a5709fbc 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 43be8b69d0..89b3f8c2ce 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,10 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index f698dc3224..3c213b58fc 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,10 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index a2ad1c8b10..4f6cd8ea10 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot index ea252c70cf..e093b2329d 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot index 7c96ba7cd0..521e4b57aa 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 805abae617..41ceb5270e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -103,10 +105,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot index bd3ea282fc..2e2729a4d5 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot index 8da9cd552f..82b7143deb 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot index b7d02d80c2..bcc46079fd 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr.robot index 56af1531fa..3ad94ac96e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -104,11 +106,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr.robot index e6019e8803..9af8dc5f66 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr.robot @@ -64,6 +64,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -107,11 +109,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr.robot index c8019f97a3..31b5079f7b 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr.robot @@ -64,6 +64,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,11 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} @@ -117,11 +114,9 @@ | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface | | And Initialize IPSec in 3-node circular topology -| | ${flow_index} = | And VPP Ipsec Flow Enable Rss -| | ... | ${dut1} | IPSEC_ESP | esp | default +| | ${flow_index} = | And VPP Ipsec Flow Enable Rss | ${dut1} | | And VPP Flow Enable | ${dut1} | ${DUT1_${int}2}[0] | ${flow_index} -| | ${flow_index} = | And VPP Ipsec Flow Enable Rss -| | ... | ${dut2} | IPSEC_ESP | esp | default +| | ${flow_index} = | And VPP Ipsec Flow Enable Rss | ${dut2} | | And VPP Flow Enable | ${dut2} | ${DUT2_${int}1}[0] | ${flow_index} | | And VPP IPsec Add Multiple Tunnels | | ... | ${nodes} | ${DUT1_${int}2}[0] | ${DUT2_${int}1}[0] | ${n_tunnels} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 50f10cf291..bd2d615040 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot index 949b6e16f3..d0a41db9f4 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 7af42b2898..53dafb0189 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index d25982f5be..4635b70c49 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot index ca4c96f57b..bd399f8ecb 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,11 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index dfae17c01b..299a32f0ac 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -103,11 +105,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot index 28625236c0..62f328434e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -104,11 +106,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 8babe45faa..d36dff2597 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -103,10 +105,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot index acb280aa06..b85ff35478 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot index 9abbbb06a2..5d0d94a93f 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot @@ -64,6 +64,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -103,10 +105,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot index 522315ead9..df06d31201 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index dfd3bdb674..4bb76d2458 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot index 6d20449f98..fd8fb4e20f 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index b6b5d6cabc..f48386ad64 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index a5cdd82761..5613b9db59 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot index 10e8dab25f..7fd798a8b0 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,11 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index a52ce922d3..a16e041220 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot index 4b67c07e89..cc39fbbb20 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-reassembly-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,11 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 26675c4505..be49518121 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot index d8d091ee0a..cbb11a7286 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot index 88ed9d70c8..bdc58b7143 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index e9b966ff00..8ba2e18400 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot index ced1024fb3..7e5410e6c7 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot index 61b576e013..be13f10713 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index bc4c0aec53..2444f1e9af 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 6317aba965..a4918d449a 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index 4eb838683f..442f776f53 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot index 73f01a0958..e64ad376af 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-policy-fastpath-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot index 9dac092cbf..5c2f2c528b 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot @@ -59,6 +59,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -99,10 +101,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot index ec6bbd133a..04ce94a9e9 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot @@ -59,6 +59,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot index b3d57fc0f5..7dcae27f84 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot @@ -59,6 +59,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index b126c27372..0d41aa51d5 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index cdcd4f782b..d4262a52dc 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index ecb3d9de96..d702bd5a64 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index a82851e988..5105a367fb 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index fa6c98d123..8449ae35f6 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -103,10 +105,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot index f85092bfd0..99f1470270 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot index 442311b3a3..97f2e2adf2 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot index 851360e5dc..96fad57a18 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index c7f90fb9f9..fdda0fea82 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -101,10 +103,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot index 724fdc23a4..f84e8b4e37 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot index 5515eb9d1f..9429fe7eef 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot index 1f559c9832..b53451438a 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot @@ -62,6 +62,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -100,11 +102,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot index 6a0884ffeb..ac08ca4d3c 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-flow-cache-aes256gcm-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -106,11 +108,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 372e4086e0..6e6adf98fb 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot index 6e0b68c358..f3702ebe1d 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot index f704fd4b38..87e3326d08 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot index 15ea9311ed..8222c983ee 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot index cf46405ed9..ba0cbc1020 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot index feb641d898..ba25db9e8e 100644 --- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr.robot @@ -65,6 +65,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -105,10 +107,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index a85f6447b6..6fb300157c 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index cca185038e..f081fa5e82 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index f7901e19c8..348408f6ff 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 09deade771..3438416d05 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -99,10 +101,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot index 99723b510a..13e198a3c5 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot index 6a34e7a836..1c85d67bed 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot index 07d953ee50..08ff9528e7 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 52a9480de8..ac344e98b8 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index 2f967f5f68..d932dc9045 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index 1c4382007c..6295a38812 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot index 6024e8f6e5..22d1279e03 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 85bb7be77f..3526fbe86a 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -99,10 +101,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot index 7bda4726e4..b16457abaf 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot index 83a882215d..55a09728fd 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot index f95733dd97..4dc63497e3 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 054b205ec9..c1f6ccca12 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index 4e788704f3..7fe71eb06f 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index e569935659..115099c929 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot index a700a87ad8..e47f23dfba 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 39a5291304..8b8525a2db 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot index 01834cd466..15f8d35708 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot index 95e9eb6afc..cefadb21e2 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index ccca2c592c..c3652c3c70 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot index ecb457b5d9..e6985dac09 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot index a9c8f3b2e4..ae425ed9be 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec2tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 3d5bfa20fe..5cd317d7f5 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index f20e782d4d..efad663ecb 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index dd7a0fe2f9..e653af06bf 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-udir-reconf.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-udir-reconf.robot index 9b6adb3647..0e0a6273c8 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-udir-reconf.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-udir-reconf.robot @@ -58,6 +58,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,10 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-udir-reconf.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-udir-reconf.robot index db57d81c84..a772eb8c42 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-udir-reconf.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-udir-reconf.robot @@ -58,6 +58,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -96,11 +98,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-udir-reconf.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-udir-reconf.robot index 00f844d6d4..6b3ef04b8d 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-udir-reconf.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-udir-reconf.robot @@ -58,6 +58,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -96,11 +98,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | ${n_total_tunnels} = | Evaluate | ${n_tunnels} + ${n_added_tunnels} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index b5ae2d1702..45e981ccc1 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index 141f346b89..ac3b0b5f0f 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index e1c3af4231..5a2a540063 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot index 3b74b44fd7..6c420f76f1 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 8c3bc25bd0..198278ba1e 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -99,10 +101,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot index 44618a04f8..a5bc4139d0 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot index 2b1d2d78e6..12af09eda6 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | HW_DH895xcc +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,11 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | ${ipsec_proto}= | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index 30e2c0cb9d..c379426060 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -98,10 +100,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot index 6400cc9edb..4302188ff7 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 128 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot index b88a945bd7..2c8af17b36 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot index a6cba480ab..662c9307df 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot @@ -60,6 +60,8 @@ | ... | crypto_native_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -97,11 +99,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg} = | Crypto Alg AES GCM 256 -| | ${auth_alg} = | Set Variable | ${NONE} -| | ${ipsec_proto} = | IPsec Proto ESP -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index f7c98c92d4..4bb8330e5e 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot index 66be7722b3..330631c3ff 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot index 4e8344aeae..85cfd2b346 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot index fe4e9e5e37..6d851928e0 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES CBC 128 +| ${auth_alg}= | SHA 512 256 | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES CBC 128 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot index 82648f626e..bf6c5fe286 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 128 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 128 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot index 9393bebf30..fb562f220e 100644 --- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot +++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-udir-ndrpdr.robot @@ -63,6 +63,8 @@ | ... | crypto_ipsecmb_plugin.so | crypto_sw_scheduler_plugin.so | ... | crypto_openssl_plugin.so | ${crypto_type}= | ${None} +| ${encr_alg}= | AES GCM 256 +| ${auth_alg}= | NONE | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -102,10 +104,6 @@ | | | | Set Test Variable | \${frame_size} | | -| | # These are enums (not strings) so they cannot be in Variables table. -| | ${encr_alg}= | Crypto Alg AES GCM 256 -| | ${auth_alg}= | Set Variable | ${NONE} -| | | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot index 64b06a2b98..fe1b16b561 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -48,8 +48,9 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} *** Keywords *** diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot index a06123a7d9..e60e7b0655 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -48,8 +48,9 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${pkts_per_drop}= | ${100} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot index a0a993a8dd..e0877d54d1 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams} | ${10} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot index 9d60b445db..906ac67194 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${pkts_per_drop}= | ${100} | ${streams}= | ${10} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot index a77e25f287..3eac654e16 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -48,8 +48,9 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${iperf3_packet_length}= | ${1460} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot index a9da173944..70e6302301 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -47,8 +47,9 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${bytes}= | 5G diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot index 3c5145087e..5ecefbd725 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${clients}= | ${10} | ${streams}= | ${10} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot index ece7379f12..97e4862ef0 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${clients}= | ${10} | ${bytes}= | 1G diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot index dab2f757bf..04fa9090de 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams}= | ${10} | ${bytes}= | 1G diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot index a516acf456..ff131d2e2d 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -49,7 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams} | ${10} | ${iperf3_packet_length}= | ${1460} |