Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
feat(terraform): 1n_aws_c5n
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
common.sh
diff --git
a/resources/libraries/bash/function/common.sh
b/resources/libraries/bash/function/common.sh
index
8e8a663
..
fa57071
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-439,10
+439,14
@@
function get_test_code () {
NODENESS="1n"
FLAVOR="skx"
;;
NODENESS="1n"
FLAVOR="skx"
;;
- *"1n-tx2"*)
+
*"1n-tx2"*)
NODENESS="1n"
FLAVOR="tx2"
;;
NODENESS="1n"
FLAVOR="tx2"
;;
+ *"1n-aws"*)
+ NODENESS="1n"
+ FLAVOR="aws"
+ ;;
*"2n-aws"*)
NODENESS="2n"
FLAVOR="aws"
*"2n-aws"*)
NODENESS="2n"
FLAVOR="aws"
@@
-455,18
+459,26
@@
function get_test_code () {
NODENESS="2n"
FLAVOR="skx"
;;
NODENESS="2n"
FLAVOR="skx"
;;
- *"2n-zn2"*)
- NODENESS="2n"
- FLAVOR="zn2"
- ;;
*"3n-skx"*)
NODENESS="3n"
FLAVOR="skx"
;;
*"3n-skx"*)
NODENESS="3n"
FLAVOR="skx"
;;
+ *"2n-zn2"*)
+ NODENESS="2n"
+ FLAVOR="zn2"
+ ;;
*"2n-clx"*)
NODENESS="2n"
FLAVOR="clx"
;;
*"2n-clx"*)
NODENESS="2n"
FLAVOR="clx"
;;
+ *"2n-icx"*)
+ NODENESS="2n"
+ FLAVOR="icx"
+ ;;
+ *"3n-icx"*)
+ NODENESS="3n"
+ FLAVOR="icx"
+ ;;
*"2n-dnv"*)
NODENESS="2n"
FLAVOR="dnv"
*"2n-dnv"*)
NODENESS="2n"
FLAVOR="dnv"
@@
-654,12
+666,7
@@
function prepare_topology () {
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
- "2n_aws")
- export TF_VAR_testbed_name="${TEST_CODE}"
- terraform_init || die "Failed to call terraform init."
- terraform_apply || die "Failed to call terraform apply."
- ;;
- "3n_aws")
+ "1n_aws" | "2n_aws" | "3n_aws")
export TF_VAR_testbed_name="${TEST_CODE}"
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
export TF_VAR_testbed_name="${TEST_CODE}"
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
@@
-841,17
+848,24
@@
function select_tags () {
set -exuo pipefail
# NIC SELECTION
set -exuo pipefail
# NIC SELECTION
- start_pattern='^ TG:'
+ case "${TEST_CODE}" in
+ *"1n-aws"*)
+ start_pattern='^ SUT:'
+ ;;
+ *)
+ start_pattern='^ TG:'
+ ;;
+ esac
end_pattern='^ \? \?[A-Za-z0-9]\+:'
end_pattern='^ \? \?[A-Za-z0-9]\+:'
- # Remove the
TG section
from topology file
+ # Remove the
sections
from topology file
sed_command="/${start_pattern}/,/${end_pattern}/d"
sed_command="/${start_pattern}/,/${end_pattern}/d"
- # All topologies
DUT
NICs
+ # All topologies NICs
available=$(sed "${sed_command}" "${TOPOLOGIES_DIR}"/* \
| grep -hoP "model: \K.*" | sort -u)
available=$(sed "${sed_command}" "${TOPOLOGIES_DIR}"/* \
| grep -hoP "model: \K.*" | sort -u)
- # Selected topology
DUT
NICs
+ # Selected topology NICs
reserved=$(sed "${sed_command}" "${WORKING_TOPOLOGY}" \
| grep -hoP "model: \K.*" | sort -u)
reserved=$(sed "${sed_command}" "${WORKING_TOPOLOGY}" \
| grep -hoP "model: \K.*" | sort -u)
- # All topologies
DUT NICs - Selected topology DUT
NICs
+ # All topologies
NICs - Selected topology
NICs
exclude_nics=($(comm -13 <(echo "${reserved}") <(echo "${available}"))) || {
die "Computation of excluded NICs failed."
}
exclude_nics=($(comm -13 <(echo "${reserved}") <(echo "${available}"))) || {
die "Computation of excluded NICs failed."
}
@@
-864,13
+878,16
@@
function select_tags () {
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
+ *"3n-icx"* | *"2n-icx"*)
+ default_nic="nic_intel-xxv710"
+ ;;
*"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
*"2n-tx2"* | *"mrr-daily-master")
default_nic="nic_intel-xl710"
;;
*"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
*"2n-tx2"* | *"mrr-daily-master")
default_nic="nic_intel-xl710"
;;
- *"2n-aws"* | *"3n-aws"*)
+ *"
1n-aws"* | *"
2n-aws"* | *"3n-aws"*)
default_nic="nic_amazon-nitro-50g"
;;
*)
default_nic="nic_amazon-nitro-50g"
;;
*)
@@
-985,6
+1002,14
@@
function select_tags () {
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
+ *"2n-icx"*)
+ test_tag_array+=("!ipsechw")
+ ;;
+ *"3n-icx"*)
+ test_tag_array+=("!ipsechw")
+ # Not enough nic_intel-xxv710 to support double link tests.
+ test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
+ ;;
*"2n-zn2"*)
test_tag_array+=("!ipsechw")
;;
*"2n-zn2"*)
test_tag_array+=("!ipsechw")
;;
@@
-1010,7
+1035,7
@@
function select_tags () {
test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
;;
test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
;;
- *"2n-aws"* | *"3n-aws"*)
+ *"
1n-aws"* | *"
2n-aws"* | *"3n-aws"*)
test_tag_array+=("!ipsechw")
;;
esac
test_tag_array+=("!ipsechw")
;;
esac
@@
-1097,10
+1122,18
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
+ "3n_icx")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml )
+ TOPOLOGIES_TAGS="3_node_*_link_topo"
+ ;;
"2n_clx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"2n_clx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
+ "2n_icx")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
+ TOPOLOGIES_TAGS="2_node_*_link_topo"
+ ;;
"2n_dnv")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
"2n_dnv")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
@@
-1117,12
+1150,16
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
+ "1n_aws")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-aws*.yaml )
+ TOPOLOGIES_TAGS="1_node_single_link_topo"
+ ;;
"2n_aws")
"2n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n
_
aws*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n
-
aws*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"3n_aws")
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"3n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n
_
aws*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n
-
aws*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
*)
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
*)
@@
-1150,7
+1187,7
@@
function set_environment_variables () {
set -exuo pipefail
case "${TEST_CODE}" in
set -exuo pipefail
case "${TEST_CODE}" in
- *"2n-aws"* | *"3n-aws"*)
+ *"
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"
# T-Rex 2.88 workaround for ENA NICs
export TREX_RX_DESCRIPTORS_COUNT=1024
export TREX_EXTRA_CMDLINE="--mbuf-factor 19"
@@
-1197,7
+1234,7
@@
function untrap_and_unreserve_testbed () {
die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2
}
case "${TEST_CODE}" in
die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2
}
case "${TEST_CODE}" in
- *"2n-aws"* | *"3n-aws"*)
+ *"
1n-aws"* | *"
2n-aws"* | *"3n-aws"*)
terraform_destroy || die "Failed to call terraform destroy."
;;
*)
terraform_destroy || die "Failed to call terraform destroy."
;;
*)