# Variables read:
# - NODENESS - Node multiplicity of desired testbed.
# - FLAVOR - Node flavor string, usually describing the processor.
- # - CSIT_NO_CLEANUP - Variable to disable cleaning up the environment.
set -exuo pipefail
- if [[ ${CSIT_NO_CLEANUP:-0} -eq 0 ]]; then
- case_text="${NODENESS}_${FLAVOR}"
- case "${case_text}" in
- "1n_skx" | "1n_tx2" | "1n_spr")
- ssh="ssh root@172.17.0.1 -p 6022"
- env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
- # The "declare -f" output is long and boring.
- set +x
- ${ssh} "$(declare -f); deactivate_wrapper ${env_vars}" || {
- die "Topology cleanup via shim-dcr failed!"
- }
- set -x
- ;;
- "1n_vbox")
- enter_mutex || die
- clean_environment || {
- die "Topology cleanup locally failed!"
- }
- exit_mutex || die
- ;;
- *)
- die "Unknown specification: ${case_text}!"
- esac
- else
- echo "CSIT_NO_CLEANUP environment variable is set"
- echo "Environment Cleanup Abandoned"
- fi
+ case_text="${NODENESS}_${FLAVOR}"
+ case "${case_text}" in
+ "1n_skx" | "1n_tx2" | "1n_spr")
+ ssh="ssh root@172.17.0.1 -p 6022"
+ env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
+ # The "declare -f" output is long and boring.
+ set +x
+ ${ssh} "$(declare -f); deactivate_wrapper ${env_vars}" || {
+ die "Topology cleanup via shim-dcr failed!"
+ }
+ set -x
+ ;;
+ "1n_vbox")
+ enter_mutex || die
+ clean_environment || {
+ die "Topology cleanup locally failed!"
+ }
+ exit_mutex || die
+ ;;
+ *)
+ die "Unknown specification: ${case_text}!"
+ esac
}
fi
case "${TEST_CODE}" in
- *"1n-vbox"*)
+ *"1n-vbox")
NODENESS="1n"
FLAVOR="vbox"
;;
- *"1n-skx"*)
+ *"1n-skx")
NODENESS="1n"
FLAVOR="skx"
;;
- *"1n-spr"*)
+ *"1n-spr")
NODENESS="1n"
FLAVOR="spr"
;;
- *"1n-tx2"*)
+ *"1n-tx2")
NODENESS="1n"
FLAVOR="tx2"
;;
- *"1n-aws"*)
+ *"1n-aws")
NODENESS="1n"
FLAVOR="aws"
;;
- *"2n-aws"*)
+ *"2n-aws")
NODENESS="2n"
FLAVOR="aws"
;;
- *"3n-aws"*)
+ *"3n-aws")
NODENESS="3n"
FLAVOR="aws"
;;
- *"1n-c6gn"*)
- NODENESS="1n"
- FLAVOR="c6gn"
- ;;
- *"2n-c6gn"*)
+ *"2n-c6gn")
NODENESS="2n"
FLAVOR="c6gn"
;;
- *"3n-c6gn"*)
+ *"3n-c6gn")
NODENESS="3n"
FLAVOR="c6gn"
;;
- *"1n-c6in"*)
+ *"2n-c7gn")
+ NODENESS="2n"
+ FLAVOR="c7gn"
+ ;;
+ *"3n-c7gn")
+ NODENESS="3n"
+ FLAVOR="c7gn"
+ ;;
+ *"1n-c6in")
NODENESS="1n"
FLAVOR="c6in"
;;
- *"2n-c6in"*)
+ *"2n-c6in")
NODENESS="2n"
FLAVOR="c6in"
;;
- *"3n-c6in"*)
+ *"3n-c6in")
NODENESS="3n"
FLAVOR="c6in"
;;
- *"2n-zn2"*)
+ *"2n-zn2")
NODENESS="2n"
FLAVOR="zn2"
;;
- *"2n-clx"*)
+ *"2n-clx")
NODENESS="2n"
FLAVOR="clx"
;;
- *"2n-icx"*)
+ *"2n-icx")
NODENESS="2n"
FLAVOR="icx"
;;
- *"2n-spr"*)
+ *"2n-spr")
NODENESS="2n"
FLAVOR="spr"
;;
- *"3n-icx"*)
+ *"3n-icx")
NODENESS="3n"
FLAVOR="icx"
;;
- *"3na-spr"*)
+ *"3na-spr")
NODENESS="3na"
FLAVOR="spr"
;;
- *"3nb-spr"*)
+ *"3nb-spr")
NODENESS="3nb"
FLAVOR="spr"
;;
- *"3n-snr"*)
+ *"3n-snr")
NODENESS="3n"
FLAVOR="snr"
;;
- *"2n-tx2"*)
+ *"3n-icxd")
+ NODENESS="3n"
+ FLAVOR="icxd"
+ ;;
+ *"2n-tx2")
NODENESS="2n"
FLAVOR="tx2"
;;
- *"3n-tsh"*)
+ *"3n-tsh")
NODENESS="3n"
FLAVOR="tsh"
;;
- *"3n-alt"*)
+ *"3n-alt")
NODENESS="3n"
FLAVOR="alt"
;;
}
terraform_apply || die "Failed to call terraform apply."
;;
- "1n_c6gn" | "2n_c6gn" | "3n_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."
}
terraform_apply || die "Failed to call terraform apply."
;;
+ "2n_c7gn" | "3n_c7gn")
+ export TF_VAR_testbed_name="${TEST_CODE}"
+ TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-c7gn"
+ 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"
# NIC SELECTION
case "${TEST_CODE}" in
- *"1n-aws"* | *"1n-c6gn"* | *"1n-c6in"*)
+ *"1n-aws"* | *"1n-c6in"*)
start_pattern='^ SUT:'
;;
*)
# Select default NIC tag.
case "${TEST_CODE}" in
- *"3n-snr"*)
+ *"3n-snr")
default_nic="nic_intel-e822cq"
;;
- *"3n-tsh"*)
+ *"3n-icxd")
+ default_nic="nic_intel-e823c"
+ ;;
+ *"3n-tsh")
default_nic="nic_intel-x520-da2"
;;
- *"3n-icx"* | *"2n-icx"*)
+ *"3n-icx" | *"2n-icx")
default_nic="nic_intel-e810cq"
;;
- *"3na-spr"*)
+ *"3na-spr")
default_nic="nic_mellanox-cx7veat"
;;
- *"3nb-spr"*)
+ *"3nb-spr")
default_nic="nic_intel-e810cq"
;;
- *"2n-spr"*)
+ *"2n-spr")
default_nic="nic_intel-e810cq"
;;
- *"2n-clx"* | *"2n-zn2"*)
+ *"2n-clx" | *"2n-zn2")
default_nic="nic_intel-xxv710"
;;
- *"2n-tx2"* | *"3n-alt"*)
+ *"2n-tx2" | *"3n-alt")
default_nic="nic_intel-xl710"
;;
- *"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
+ *"1n-aws" | *"2n-aws" | *"3n-aws")
default_nic="nic_amazon-nitro-50g"
;;
- *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*)
+ *"2n-c6gn" | *"3n-c6gn")
+ default_nic="nic_amazon-nitro-100g"
+ ;;
+ *"2n-c7gn" | *"3n-c7gn")
default_nic="nic_amazon-nitro-100g"
;;
- *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*)
+ *"1n-c6in" | *"2n-c6in" | *"3n-c6in")
default_nic="nic_amazon-nitro-200g"
;;
*)
awk_nics_sub_cmd+='gsub("cx7veat","200ge2p1cx7veat");'
awk_nics_sub_cmd+='gsub("cx6dx","100ge2p1cx6dx");'
awk_nics_sub_cmd+='gsub("e810cq","100ge2p1e810cq");'
+ awk_nics_sub_cmd+='gsub("e822cq","25ge2p1e822cq);'
+ awk_nics_sub_cmd+='gsub("e823c","25ge2p1e823c);'
awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");'
awk_nics_sub_cmd+='gsub("vic1385","40ge2p1vic1385");'
awk_nics_sub_cmd+='gsub("nitro-50g","50ge1p1ENA");'
# Reasons for blacklisting:
# - ipsechw - Blacklisted on testbeds without crypto hardware accelerator.
case "${TEST_CODE}" in
- *"1n-vbox"*)
+ *"1n-vbox")
test_tag_array+=("!avf")
test_tag_array+=("!vhost")
test_tag_array+=("!flow")
;;
- *"1n_tx2"*)
+ *"1n-tx2")
test_tag_array+=("!flow")
;;
- *"2n-clx"*)
+ *"2n-clx")
test_tag_array+=("!ipsechw")
;;
- *"2n-icx"*)
+ *"2n-icx")
test_tag_array+=("!ipsechw")
;;
- *"2n-spr"*)
+ *"2n-spr")
;;
- *"2n-tx2"*)
+ *"2n-tx2")
test_tag_array+=("!ipsechw")
;;
- *"2n-zn2"*)
+ *"2n-zn2")
test_tag_array+=("!ipsechw")
;;
- *"3n-alt"*)
+ *"3n-alt")
test_tag_array+=("!ipsechw")
;;
- *"3n-icx"*)
+ *"3n-icx")
test_tag_array+=("!ipsechw")
test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
- *"3n-snr"*)
+ *"3n-snr")
+ ;;
+ *"3n-icxd")
;;
- *"3na-spr"*)
+ *"3na-spr")
;;
- *"3nb-spr"*)
+ *"3nb-spr")
;;
- *"3n-tsh"*)
+ *"3n-tsh")
test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
;;
- *"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
+ *"1n-aws" | *"2n-aws" | *"3n-aws")
test_tag_array+=("!ipsechw")
;;
- *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*)
+ *"2n-c6gn" | *"3n-c6gn")
test_tag_array+=("!ipsechw")
;;
- *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*)
+ *"2n-c7gn" | *"3n-c7gn")
+ test_tag_array+=("!ipsechw")
+ ;;
+ *"1n-c6in" | *"2n-c6in" | *"3n-c6in")
test_tag_array+=("!ipsechw")
;;
esac
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
- "1n_vbox")
+ "1n_aws")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-aws*.yaml )
+ TOPOLOGIES_TAGS="1_node_single_link_topo"
+ ;;
+ "1n_c6in")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-c6in*.yaml )
+ TOPOLOGIES_TAGS="1_node_single_link_topo"
+ ;;
+ "1n_tx2" | "1n_spr")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
- "1n_skx" | "1n_tx2" | "1n_spr")
+ "1n_vbox")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
- "2n_skx")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
- TOPOLOGIES_TAGS="2_node_*_link_topo"
- ;;
- "2n_zn2")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2*.yaml )
- TOPOLOGIES_TAGS="2_node_*_link_topo"
- ;;
- "3n_skx")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
- TOPOLOGIES_TAGS="3_node_*_link_topo"
+ "2n_aws")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-aws*.yaml )
+ TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
- "3n_icx")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml )
- TOPOLOGIES_TAGS="3_node_*_link_topo"
+ "2n_c6gn")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6gn*.yaml )
+ TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
- "3na_spr")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3na_spr*.yaml )
- TOPOLOGIES_TAGS="3_node_*_link_topo"
+ "2n_c7gn")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c7gn*.yaml )
+ TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
- "3nb_spr")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3nb_spr*.yaml )
- TOPOLOGIES_TAGS="3_node_*_link_topo"
+ "2n_c6in")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6in*.yaml )
+ TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"2n_clx")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx_*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"2n_icx")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx_*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"2n_spr")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_spr*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_spr_*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
- "3n_snr")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr*.yaml )
- TOPOLOGIES_TAGS="3_node_single_link_topo"
- ;;
- "3n_tsh")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
- TOPOLOGIES_TAGS="3_node_single_link_topo"
- ;;
"2n_tx2")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2_*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
+ "2n_zn2")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2_*.yaml )
+ TOPOLOGIES_TAGS="2_node_*_link_topo"
+ ;;
"3n_alt")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_alt*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_alt_*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
- "1n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-aws*.yaml )
- TOPOLOGIES_TAGS="1_node_single_link_topo"
- ;;
- "2n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-aws*.yaml )
- TOPOLOGIES_TAGS="2_node_single_link_topo"
- ;;
"3n_aws")
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_c7gn")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c7gn*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
"3n_c6in")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c6in*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
+ "3n_icx")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx_*.yaml )
+ # Trailing underscore is needed to distinguish from 3n_icxd.
+ TOPOLOGIES_TAGS="3_node_*_link_topo"
+ ;;
+ "3n_icxd")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icxd_*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
+ ;;
+ "3n_snr")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr_*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
+ ;;
+ "3n_tsh")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh_*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
+ ;;
+ "3na_spr")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3na_spr_*.yaml )
+ TOPOLOGIES_TAGS="3_node_*_link_topo"
+ ;;
+ "3nb_spr")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3nb_spr_*.yaml )
+ TOPOLOGIES_TAGS="3_node_*_link_topo"
+ ;;
*)
# No falling back to default, that should have been done
# by the function which has set NODENESS and FLAVOR.
set -exuo pipefail
case "${TEST_CODE}" in
- *"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
+ *"1n-aws" | *"2n-aws" | *"3n-aws")
+ 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
+ ;;
+ *"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-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*)
+ *"2n-c7gn" | *"3n-c7gn")
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"*)
+ *"1n-c6in" | *"2n-c6in" | *"3n-c6in")
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
;;
- *"2n-zn2"*)
+ *"2n-zn2")
# Maciek's workaround for Zen2 with lower amount of cores.
export TREX_CORE_COUNT=14
esac
die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2
}
case "${TEST_CODE}" in
- *"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
+ *"1n-aws" | *"2n-aws" | *"3n-aws")
TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}-c5n"
terraform_destroy || die "Failed to call terraform destroy."
;;
- *"1n-c6gn"* | *"2n-c6gn"* | *"3n-c6gn"*)
+ *"2n-c6gn" | *"3n-c6gn")
+ TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}"
+ terraform_destroy || die "Failed to call terraform destroy."
+ ;;
+ *"2n-c7gn" | *"3n-c7gn")
TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}"
terraform_destroy || die "Failed to call terraform destroy."
;;
- *"1n-c6in"* | *"2n-c6in"* | *"3n-c6in"*)
+ *"1n-c6in" | *"2n-c6in" | *"3n-c6in")
TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}"
terraform_destroy || die "Failed to call terraform destroy."
;;
Code Review / csit.git / blobdiff