diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 105 | ||||
| -rw-r--r-- | resources/libraries/python/Constants.py | 14 |
2 files changed, 116 insertions, 3 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index fa4b8e757c..fc019facda 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -452,6 +452,30 @@ function get_test_code () { NODENESS="3n" FLAVOR="aws" ;; + *"1n-c6gn"*) + NODENESS="1n" + FLAVOR="c6gn" + ;; + *"2n-c6gn"*) + NODENESS="2n" + FLAVOR="c6gn" + ;; + *"3n-c6gn"*) + NODENESS="3n" + FLAVOR="c6gn" + ;; + *"1n-c6in"*) + NODENESS="1n" + FLAVOR="c6in" + ;; + *"2n-c6in"*) + NODENESS="2n" + FLAVOR="c6in" + ;; + *"3n-c6in"*) + NODENESS="3n" + FLAVOR="c6in" + ;; *"2n-zn2"*) NODENESS="2n" FLAVOR="zn2" @@ -642,6 +666,24 @@ function prepare_topology () { } terraform_apply || die "Failed to call terraform apply." ;; + "1n_c6gn" | "2n_c6gn" | "3n_c6gn") + export TF_VAR_testbed_name="${TEST_CODE}" + TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-c6gn" + terraform_init || die "Failed to call terraform init." + trap "terraform_destroy" ERR EXIT || { + die "Trap attempt failed, please cleanup manually. Aborting!" + } + terraform_apply || die "Failed to call terraform apply." + ;; + "1n_c6in" | "2n_c6in" | "3n_c6in") + export TF_VAR_testbed_name="${TEST_CODE}" + TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-c6in" + terraform_init || die "Failed to call terraform init." + trap "terraform_destroy" ERR EXIT || { + die "Trap attempt failed, please cleanup manually. Aborting!" + } + terraform_apply || die "Failed to call terraform apply." + ;; esac } @@ -815,7 +857,7 @@ function select_tags () { # NIC SELECTION case "${TEST_CODE}" in - *"1n-aws"*) + *"1n-aws"* | *"1n-c6gn"* | *"1n-c6in"*) start_pattern='^ SUT:' ;; *) @@ -865,6 +907,12 @@ function select_tags () { *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) default_nic="nic_amazon-nitro-50g" ;; + *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*) + default_nic="nic_amazon-nitro-100g" + ;; + *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*) + default_nic="nic_amazon-nitro-200g" + ;; *) default_nic="nic_intel-x710" ;; @@ -883,6 +931,8 @@ function select_tags () { awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");' awk_nics_sub_cmd+='gsub("vic1385","40ge2p1vic1385");' awk_nics_sub_cmd+='gsub("nitro-50g","50ge1p1ENA");' + awk_nics_sub_cmd+='gsub("nitro-100g","100ge1p1ENA");' + awk_nics_sub_cmd+='gsub("nitro-200g","200ge1p1ENA");' awk_nics_sub_cmd+='if ($9 =="drv_avf") drv="avf-";' awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";' awk_nics_sub_cmd+='else if ($9 =="drv_mlx5_core") drv ="mlx5-";' @@ -1011,6 +1061,12 @@ function select_tags () { *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) test_tag_array+=("!ipsechw") ;; + *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*) + test_tag_array+=("!ipsechw") + ;; + *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*) + test_tag_array+=("!ipsechw") + ;; esac # We will add excluded NICs. @@ -1147,6 +1203,30 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-aws*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; + "1n_c6gn") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-c6gn*.yaml ) + TOPOLOGIES_TAGS="1_node_single_link_topo" + ;; + "2n_c6gn") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6gn*.yaml ) + TOPOLOGIES_TAGS="2_node_single_link_topo" + ;; + "3n_c6gn") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c6gn*.yaml ) + TOPOLOGIES_TAGS="3_node_single_link_topo" + ;; + "1n_c6in") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-c6in*.yaml ) + TOPOLOGIES_TAGS="1_node_single_link_topo" + ;; + "2n_c6in") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6in*.yaml ) + TOPOLOGIES_TAGS="2_node_single_link_topo" + ;; + "3n_c6in") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c6in*.yaml ) + TOPOLOGIES_TAGS="3_node_single_link_topo" + ;; *) # No falling back to default, that should have been done # by the function which has set NODENESS and FLAVOR. @@ -1173,7 +1253,20 @@ function set_environment_variables () { case "${TEST_CODE}" in *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) - # T-Rex 2.88+ workaround for ENA NICs. + export TREX_RX_DESCRIPTORS_COUNT=1024 + export TREX_EXTRA_CMDLINE="--mbuf-factor 19" + export TREX_CORE_COUNT=6 + # Settings to prevent duration stretching. + export PERF_TRIAL_STL_DELAY=0.1 + ;; + *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*) + export TREX_RX_DESCRIPTORS_COUNT=1024 + export TREX_EXTRA_CMDLINE="--mbuf-factor 19" + export TREX_CORE_COUNT=6 + # Settings to prevent duration stretching. + export PERF_TRIAL_STL_DELAY=0.1 + ;; + *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*) export TREX_RX_DESCRIPTORS_COUNT=1024 export TREX_EXTRA_CMDLINE="--mbuf-factor 19" export TREX_CORE_COUNT=6 @@ -1227,6 +1320,14 @@ function untrap_and_unreserve_testbed () { TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}-c5n" terraform_destroy || die "Failed to call terraform destroy." ;; + *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*) + TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}" + terraform_destroy || die "Failed to call terraform destroy." + ;; + *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*) + TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}" + terraform_destroy || die "Failed to call terraform destroy." + ;; *) ;; esac diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 92a16e6b8b..f30f5fa5e6 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -318,6 +318,8 @@ class Constants: u"Mellanox-CX6DX": 100000000000, u"Mellanox-CX7VEAT": 200000000000, u"Amazon-Nitro-50G": 10000000000, + u"Amazon-Nitro-100G": 10000000000, + u"Amazon-Nitro-200G": 20000000000, u"virtual": 100000000, } @@ -333,7 +335,9 @@ class Constants: u"Mellanox-CX556A": 148809523, u"Mellanox-CX6DX": 148809523, u"Mellanox-CX7VEAT": 297619046, - u"Amazon-Nitro-50G": 1200000, + u"Amazon-Nitro-50G": 1500000, + u"Amazon-Nitro-100G": 3000000, + u"Amazon-Nitro-200G": 6000000, u"virtual": 14880952, } @@ -347,6 +351,8 @@ class Constants: u"Intel-E822CQ": u"25ge2p1e822cq", u"Intel-E810CQ": u"100ge2p1e810cq", u"Amazon-Nitro-50G": u"50ge1p1ena", + u"Amazon-Nitro-100G": u"100ge1p1ena", + u"Amazon-Nitro-200G": u"200ge1p1ena", u"Mellanox-CX556A": u"100ge2p1cx556a", u"Mellanox-CX6DX": u"100ge2p1cx6dx", u"Mellanox-CX7VEAT": u"200ge2p1cx7veat", @@ -362,6 +368,8 @@ class Constants: u"25ge2p1e822cq": u"e822cq", u"100ge2p1e810cq": u"e810cq", u"50ge1p1ena": u"ena", + u"100ge1p1ena": u"ena100", + u"200ge1p1ena": u"ena200", u"100ge2p1cx556a": u"cx556a", u"100ge2p1cx6dx": u"cx6dx", u"200ge2p1cx7veat": u"cx7veat", @@ -377,6 +385,8 @@ class Constants: u"Intel-E822CQ": [u"vfio-pci", u"avf", u"af_xdp"], u"Intel-E810CQ": [u"vfio-pci", u"avf", u"af_xdp"], u"Amazon-Nitro-50G": [u"vfio-pci"], + u"Amazon-Nitro-100G": [u"vfio-pci"], + u"Amazon-Nitro-200G": [u"vfio-pci"], u"Mellanox-CX556A": [u"rdma-core", u"mlx5_core", u"af_xdp"], u"Mellanox-CX6DX": [u"rdma-core", u"mlx5_core", u"af_xdp"], u"Mellanox-CX7VEAT": [u"rdma-core", u"mlx5_core", u"af_xdp"], @@ -428,6 +438,8 @@ class Constants: u"Intel-E822CQ": [u"vfio-pci"], u"Intel-E810CQ": [u"vfio-pci"], u"Amazon-Nitro-50G": [u"vfio-pci"], + u"Amazon-Nitro-100G": [u"vfio-pci"], + u"Amazon-Nitro-200G": [u"vfio-pci"], u"Mellanox-CX556A": [u"mlx5_core"], u"Mellanox-CX6DX": [u"mlx5_core"], u"Mellanox-CX7VEAT": [u"mlx5_core"], |