From fbee0334af3a08d575fe91842f76240d0fe13006 Mon Sep 17 00:00:00 2001 From: Sooyoung Kim Date: Fri, 20 Sep 2024 20:38:01 +0900 Subject: [PATCH] [k8scluster] update testscripts --- .../13.k8scluster/create-k8scluster.sh | 4 +- .../13.k8scluster/status-k8scluster.sh | 2 +- src/testclient/scripts/conf.env | 324 ++++++++++++------ .../clean-resource-ns-cloud.sh | 6 +- .../create-k8scluster-only.sh | 16 - .../create-resource-ns-cloud.sh | 1 - ...undeploy-nginx-with-pvc-from-k8scluster.sh | 4 +- src/testclient/scripts/testSet.env | 145 ++++---- 8 files changed, 320 insertions(+), 182 deletions(-) diff --git a/src/testclient/scripts/13.k8scluster/create-k8scluster.sh b/src/testclient/scripts/13.k8scluster/create-k8scluster.sh index a9da903c..c20a032a 100755 --- a/src/testclient/scripts/13.k8scluster/create-k8scluster.sh +++ b/src/testclient/scripts/13.k8scluster/create-k8scluster.sh @@ -18,7 +18,7 @@ else RootDiskSize="${DISK_SIZE[$INDEX,$REGION]}" fi -K8SNODEGROUPNAME="ng${INDEX}${REGION}${K8SCLUSTERID_ADD}" +K8SNODEGROUPNAME="ng${INDEX}${REGION}" if [ "${CSP}" == "azure" ]; then NODEIMAGEID="" # In azure, image designation is not supported @@ -75,7 +75,7 @@ else # Type-II CSP "k8sNodeGroupList": [ { "name": "${K8SNODEGROUPNAME}", "imageId": "${NODEIMAGEID}", - "specId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}", + "specId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}", "rootDiskType": "${RootDiskType}", "rootDiskSize": "${RootDiskSize}", "sshKeyId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}", diff --git a/src/testclient/scripts/13.k8scluster/status-k8scluster.sh b/src/testclient/scripts/13.k8scluster/status-k8scluster.sh index 3c931750..5c3af0d8 100755 --- a/src/testclient/scripts/13.k8scluster/status-k8scluster.sh +++ b/src/testclient/scripts/13.k8scluster/status-k8scluster.sh @@ -24,7 +24,7 @@ echo -e "${BOLD}" echo -e "${NC} ${BLUE} ${BOLD}" curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/ns/$NSID/k8scluster/${K8SCLUSTERID}?option=${GetK8sClusterOption} | jq '.status | .K8SCLUSTER | sort_by(.id)' | - jq -r '(["NodeGroup-ID","Status","ImageId","SpecId","RootDiskType","RootDiskSize","SshKeyId", "OnAutoScaling", "DesiredNodeSize", "MinNodeSize", "MaxNodeSize"] | (., map(length*"-"))), (.[] | [.id, .status, .imageId, .specId, .rootDiskType, .rootDiskSize, .sshKeyId, .onAutoScaling, .desiredNodeSize, .minNodeSize, .maxNodeSize]) | @tsv' | + jq -r '(["NodeGroup-ID","Status","cspImageName","cspSpecName","RootDiskType","RootDiskSize","SshKeyId", "OnAutoScaling", "DesiredNodeSize", "MinNodeSize", "MaxNodeSize"] | (., map(length*"-"))), (.[] | [.id, .status, .cspImageName, .cspSpecName, .rootDiskType, .rootDiskSize, .sshKeyId, .onAutoScaling, .desiredNodeSize, .minNodeSize, .maxNodeSize]) | @tsv' | column -t echo -e "${NC}" diff --git a/src/testclient/scripts/conf.env b/src/testclient/scripts/conf.env index 5fe42aa9..6be7101c 100644 --- a/src/testclient/scripts/conf.env +++ b/src/testclient/scripts/conf.env @@ -732,12 +732,13 @@ CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]} ########################################### -## GCP (25 Regions. Recommend 22 Regions.) +## GCP (40 Regions) IX=$IndexGCP IY=0 ProviderName[$IX]=GCP DriverLibFileName[$IX]=gcp-driver-v1.0.so DriverName[$IX]=gcp-driver01 +K8sClusterType[$IX]=type2 CommonImageUbuntu1804[$IX]="https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1804-bionic-v20220505" #CommonImageUbuntu2004[$IX]= CommonSpecSmall[$IX]=e2-small @@ -745,19 +746,16 @@ CommonSpecMedium[$IX]=e2-standard-2 CommonSpecLarge[$IX]=e2-standard-4 CommonImage[$IX]=${CommonImageUbuntu1804[$IX]} # ${CommonImageUbuntu2004[$IX]} CommonImageType[$IX]="Ubuntu 18.04" -CommonSpec[$IX]=${CommonSpecSmall[$IX]} # ${CommonSpecMedium[$IX]} # ${CommonSpecLarge[$IX]} # e2-standard-2 +CommonSpec[$IX]=${CommonSpecMedium[$IX]} # ${CommonSpecSmall[$IX]} # ${CommonSpecLarge[$IX]} # e2-standard-2 CommonDiskType[$IX]=default CommonDiskSize[$IX]=default CommonK8sVersion[$IX]=1.29.7-gke.1104000 # 1.30.3-gke.1225000, 1.29.7-gke.1104000, 1.28.12-gke.1052000, 1.27.16-gke.1051000 CommonK8sUpgradeVersion[$IX]=1.30.3-gke.1225000 - -# region01 -IY=$GcpAsiaEast1 -# Location: Changhua County Taiwan -RegionLocation[$IX,$IY]="Changhua County Taiwan [zone:a]" -RegionNativeName[$IX,$IY]=asia-east1 -CONN_CONFIG[$IX,$IY]=gcp-asia-east1 +IY=$GcpAfricaSouth1 +RegionLocation[$IX,$IY]="Johannesburg South Africa [zone:a]" +RegionNativeName[$IX,$IY]=africa-south1 +CONN_CONFIG[$IX,$IY]=gcp-africa-south1 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -766,12 +764,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region02 -IY=$GcpEuropeWest3 -# Location: Frankfurt Germany -RegionLocation[$IX,$IY]="Frankfurt Germany [zone:a]" -RegionNativeName[$IX,$IY]=europe-west3 -CONN_CONFIG[$IX,$IY]=gcp-europe-west3 +IY=$GcpAsiaEast1 +RegionLocation[$IX,$IY]="Changhua County Taiwan [zone:a]" +RegionNativeName[$IX,$IY]=asia-east1 +CONN_CONFIG[$IX,$IY]=gcp-asia-east1 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -780,7 +776,6 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region03 IY=$GcpAsiaEast2 # Location: Hong Kong RegionLocation[$IX,$IY]="Hong Kong [zone:a]" @@ -794,9 +789,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region04 -IY=$GcpAsiaNortheast1 -# Location: Tokyo Japan +IY=$GcpAsiaNorthEast1 RegionLocation[$IX,$IY]="Tokyo Japan [zone:a]" RegionNativeName[$IX,$IY]=asia-northeast1 CONN_CONFIG[$IX,$IY]=gcp-asia-northeast1 @@ -808,9 +801,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region05 -IY=$GcpAsiaNortheast2 -# Location: Osaka Japan +IY=$GcpAsiaNorthEast2 RegionLocation[$IX,$IY]="Osaka Japan [zone:a]" RegionNativeName[$IX,$IY]=asia-northeast2 CONN_CONFIG[$IX,$IY]=gcp-asia-northeast2 @@ -822,9 +813,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region06 -IY=$GcpAsiaNortheast3 -# Location: Seoul South Korea +IY=$GcpAsiaNorthEast3 RegionLocation[$IX,$IY]="Seoul South Korea [zone:a]" RegionNativeName[$IX,$IY]=asia-northeast3 CONN_CONFIG[$IX,$IY]=gcp-asia-northeast3 @@ -836,12 +825,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region7 -IY=$GcpUsWest4 -# Location: Las Vegas Nevada USA -RegionLocation[$IX,$IY]="Las Vegas USA [zone:a]" -RegionNativeName[$IX,$IY]=us-west4 -CONN_CONFIG[$IX,$IY]=gcp-us-west4 +IY=$GcpAsiaSouth1 +RegionLocation[$IX,$IY]="Mumbai India [zone:b]" +RegionNativeName[$IX,$IY]=asia-south1 +CONN_CONFIG[$IX,$IY]=gcp-asia-south1 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -850,9 +837,19 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region08 -IY=$GcpAsiaSoutheast1 -# Location: Jurong West Singapore +IY=$GcpAsiaSouth2 +RegionLocation[$IX,$IY]="Delhi India [zone:a]" +RegionNativeName[$IX,$IY]=asia-south2 +CONN_CONFIG[$IX,$IY]=gcp-asia-south2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpAsiaSouthEast1 RegionLocation[$IX,$IY]="Jurong West Singapore [zone:a]" RegionNativeName[$IX,$IY]=asia-southeast1 CONN_CONFIG[$IX,$IY]=gcp-asia-southeast1 @@ -864,9 +861,19 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region09 -IY=$GcpAustraliaSoutheast1 -# Location: Sydney Australia +IY=$GcpAsiaSouthEast2 +RegionLocation[$IX,$IY]="Jakarta, Indonesia, APAC [zone:a]" +RegionNativeName[$IX,$IY]=asia-southeast2 +CONN_CONFIG[$IX,$IY]=gcp-asia-southeast2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpAustraliaSouthEast1 RegionLocation[$IX,$IY]="Sydney Australia [zone:a]" RegionNativeName[$IX,$IY]=australia-southeast1 CONN_CONFIG[$IX,$IY]=gcp-australia-southeast1 @@ -878,9 +885,31 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region10 +IY=$GcpAustraliaSouthEast2 +RegionLocation[$IX,$IY]="Melbourne Australia [zone:a]" +RegionNativeName[$IX,$IY]=australia-southeast2 +CONN_CONFIG[$IX,$IY]=gcp-australia-southeast2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpEuropeCentral2 +RegionLocation[$IX,$IY]="Warsaw Poland [zone:a]" +RegionNativeName[$IX,$IY]=europe-central2 +CONN_CONFIG[$IX,$IY]=gcp-europe-central2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + IY=$GcpEuropeNorth1 -# Location: Hamina Finland RegionLocation[$IX,$IY]="Hamina Finland [zone:a]" RegionNativeName[$IX,$IY]=europe-north1 CONN_CONFIG[$IX,$IY]=gcp-europe-north1 @@ -892,9 +921,19 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region11 +IY=$GcpEuropeSouthWest1 +RegionLocation[$IX,$IY]="Marseille France [zone:a]" +RegionNativeName[$IX,$IY]=europe-southwest1 +CONN_CONFIG[$IX,$IY]=gcp-europe-southwest1 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + IY=$GcpEuropeWest1 -# Location: St. Ghislain Belgium RegionLocation[$IX,$IY]="St. Ghislain Belgium [zone:b]" RegionNativeName[$IX,$IY]=europe-west1 CONN_CONFIG[$IX,$IY]=gcp-europe-west1 @@ -906,9 +945,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region12 IY=$GcpEuropeWest2 -# Location: London England UK RegionLocation[$IX,$IY]="London England UK [zone:b]" RegionNativeName[$IX,$IY]=europe-west2 CONN_CONFIG[$IX,$IY]=gcp-europe-west2 @@ -920,9 +957,19 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region13 +IY=$GcpEuropeWest3 +RegionLocation[$IX,$IY]="Frankfurt Germany [zone:a]" +RegionNativeName[$IX,$IY]=europe-west3 +CONN_CONFIG[$IX,$IY]=gcp-europe-west3 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + IY=$GcpEuropeWest4 -# Location: Eemshaven Netherlands RegionLocation[$IX,$IY]="Eemshaven Netherlands [zone:a]" RegionNativeName[$IX,$IY]=europe-west4 CONN_CONFIG[$IX,$IY]=gcp-europe-west4 @@ -934,9 +981,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region14 IY=$GcpEuropeWest6 -# Location: Zurich Switzerland RegionLocation[$IX,$IY]="Zurich Switzerland [zone:a]" RegionNativeName[$IX,$IY]=europe-west6 CONN_CONFIG[$IX,$IY]=gcp-europe-west6 @@ -948,9 +993,91 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region15 -IY=$GcpNorthamericaNortheast1 -# Location: Montreal Quebec Canada +IY=$GcpEuropeWest8 +RegionLocation[$IX,$IY]="London England UK [zone:b]" +RegionNativeName[$IX,$IY]=europe-west8 +CONN_CONFIG[$IX,$IY]=gcp-europe-west8 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpEuropeWest9 +RegionLocation[$IX,$IY]="Frankfurt Germany [zone:a]" +RegionNativeName[$IX,$IY]=europe-west9 +CONN_CONFIG[$IX,$IY]=gcp-europe-west9 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpEuropeWest10 +RegionLocation[$IX,$IY]="Eemshaven Netherlands [zone:a]" +RegionNativeName[$IX,$IY]=europe-west10 +CONN_CONFIG[$IX,$IY]=gcp-europe-west10 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpEuropeWest12 +RegionLocation[$IX,$IY]="Zurich Switzerland [zone:a]" +RegionNativeName[$IX,$IY]=europe-west12 +CONN_CONFIG[$IX,$IY]=gcp-europe-west12 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpMeCentral1 +RegionLocation[$IX,$IY]="Dubai United Arab Emirates [zone:a]" +RegionNativeName[$IX,$IY]=me-central1 +CONN_CONFIG[$IX,$IY]=gcp-me-central1 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpMeCentral2 +RegionLocation[$IX,$IY]="Jeddah Saudi Arabia [zone:a]" +RegionNativeName[$IX,$IY]=me-central2 +CONN_CONFIG[$IX,$IY]=gcp-me-central2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpMeWest1 +RegionLocation[$IX,$IY]="Doha Qatar [zone:a]" +RegionNativeName[$IX,$IY]=me-west1 +CONN_CONFIG[$IX,$IY]=gcp-me-west1 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpNorthAmericaNorthEast1 RegionLocation[$IX,$IY]="Montreal Quebec Canada [zone:a]" RegionNativeName[$IX,$IY]=northamerica-northeast1 CONN_CONFIG[$IX,$IY]=gcp-northamerica-northeast1 @@ -962,9 +1089,19 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region16 -IY=$GcpSouthamericaEast1 -# Location: Osasco (Sao Paulo) Brazil +IY=$GcpNorthAmericaNorthEast2 +RegionLocation[$IX,$IY]="Toronto Ontario Canada [zone:a]" +RegionNativeName[$IX,$IY]=northamerica-northeast2 +CONN_CONFIG[$IX,$IY]=gcp-northamerica-northeast2 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + +IY=$GcpSouthAmericaEast1 RegionLocation[$IX,$IY]="Osasco (Sao Paulo) Brazil [zone:e]" RegionNativeName[$IX,$IY]=southamerica-east1 CONN_CONFIG[$IX,$IY]=gcp-southamerica-east1 @@ -976,9 +1113,20 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region17 + +IY=$GcpSouthAmericaWest1 +RegionLocation[$IX,$IY]="Santiago Chile [zone:a]" +RegionNativeName[$IX,$IY]=southamerica-west1 +CONN_CONFIG[$IX,$IY]=gcp-southamerica-west1 +IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} +IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} +SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} +DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]} +DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} +K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} +K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} + IY=$GcpUsCentral1 -# Location: Council Bluffs Iowa USA RegionLocation[$IX,$IY]="Council Bluffs Iowa USA [zone:a]" RegionNativeName[$IX,$IY]=us-central1 CONN_CONFIG[$IX,$IY]=gcp-us-central1 @@ -990,9 +1138,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region18 IY=$GcpUsEast1 -# Location: Moncks Corner South Carolina USA RegionLocation[$IX,$IY]="Moncks Corner South Carolina USA [zone:b]" RegionNativeName[$IX,$IY]=us-east1 CONN_CONFIG[$IX,$IY]=gcp-us-east1 @@ -1004,9 +1150,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region19 IY=$GcpUsEast4 -# Location: Ashburn Northern Virginia USA RegionLocation[$IX,$IY]="Ashburn Northern Virginia USA [zone:a]" RegionNativeName[$IX,$IY]=us-east4 CONN_CONFIG[$IX,$IY]=gcp-us-east4 @@ -1018,12 +1162,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region20 -IY=$GcpUsWest1 -# Location: The Dalles Oregon USA -RegionLocation[$IX,$IY]="Dalles Oregon USA [zone:a]" -RegionNativeName[$IX,$IY]=us-west1 -CONN_CONFIG[$IX,$IY]=gcp-us-west1 +IY=$GcpUsEast5 +RegionLocation[$IX,$IY]="Ashburn Northern Virginia USA [zone:a]" +RegionNativeName[$IX,$IY]=us-east5 +CONN_CONFIG[$IX,$IY]=gcp-us-east5 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1032,12 +1174,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region21 -IY=$GcpUsWest2 -# Location: Los Angeles California USA -RegionLocation[$IX,$IY]="LA California USA [zone:a]" -RegionNativeName[$IX,$IY]=us-west2 -CONN_CONFIG[$IX,$IY]=gcp-us-west2 +IY=$GcpUsSouth1 +RegionLocation[$IX,$IY]="São Paulo Brazil [zone:a]" +RegionNativeName[$IX,$IY]=us-south1 +CONN_CONFIG[$IX,$IY]=gcp-us-south1 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1046,12 +1186,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region22 -IY=$GcpUsWest3 -# Location: Salt Lake City Utah USA -RegionLocation[$IX,$IY]="Salt Lake City Utah USA [zone:a]" -RegionNativeName[$IX,$IY]=us-west3 -CONN_CONFIG[$IX,$IY]=gcp-us-west3 +IY=$GcpUsWest1 +RegionLocation[$IX,$IY]="Dalles Oregon USA [zone:a]" +RegionNativeName[$IX,$IY]=us-west1 +CONN_CONFIG[$IX,$IY]=gcp-us-west1 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1060,12 +1198,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region23 -IY=$GcpAsiaSouth1 -# Location: Mumbai India (zone b since zone a returns QUOTA_EXCEEDED) -RegionLocation[$IX,$IY]="Mumbai India [zone:b]" -RegionNativeName[$IX,$IY]=asia-south1 -CONN_CONFIG[$IX,$IY]=gcp-asia-south1 +IY=$GcpUsWest2 +RegionLocation[$IX,$IY]="LA California USA [zone:a]" +RegionNativeName[$IX,$IY]=us-west2 +CONN_CONFIG[$IX,$IY]=gcp-us-west2 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1074,12 +1210,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region24 -IY=$GcpAsiaSoutheast2 -# Location: Jakarta, Indonesia, APAC -RegionLocation[$IX,$IY]="Jakarta Indonesia [zone:a]" -RegionNativeName[$IX,$IY]=asia-southeast2 -CONN_CONFIG[$IX,$IY]=gcp-asia-southeast2 +IY=$GcpUsWest3 +RegionLocation[$IX,$IY]="Salt Lake City Utah USA [zone:a]" +RegionNativeName[$IX,$IY]=us-west3 +CONN_CONFIG[$IX,$IY]=gcp-us-west3 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1088,12 +1222,10 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]} K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} -# region25 -IY=$GcpEuropeCentral2 -# Location: Warsaw, Poland, Europe -RegionLocation[$IX,$IY]="Warsaw Poland [zone:a]" -RegionNativeName[$IX,$IY]=europe-central2 -CONN_CONFIG[$IX,$IY]=gcp-europe-central2 +IY=$GcpUsWest4 +RegionLocation[$IX,$IY]="Las Vegas USA [zone:a]" +RegionNativeName[$IX,$IY]=us-west4 +CONN_CONFIG[$IX,$IY]=gcp-us-west4 IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpec[$IX]} @@ -1104,8 +1236,6 @@ K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]} - - ########################################### ## Azure (40 Regions. Recommend 34 Regions.) diff --git a/src/testclient/scripts/sequentialFullTest/clean-resource-ns-cloud.sh b/src/testclient/scripts/sequentialFullTest/clean-resource-ns-cloud.sh index 3de8348b..98ab8edc 100755 --- a/src/testclient/scripts/sequentialFullTest/clean-resource-ns-cloud.sh +++ b/src/testclient/scripts/sequentialFullTest/clean-resource-ns-cloud.sh @@ -33,7 +33,7 @@ function clean_sequence() { if [ "${c}" == 20 ] && [ "${OUTPUT2}" == 1 ]; then echo "Problem in sshKey: Delete. Exit without unregister-cloud." - exit + break fi done @@ -63,7 +63,7 @@ function clean_sequence() { if [ "${c}" == 30 ] && [ "${OUTPUT2}" == 1 ]; then echo "Problem in SecurityGroup: Delete. Exit without unregister-cloud." - exit + break fi done @@ -93,7 +93,7 @@ function clean_sequence() { if [ "${c}" == 20 ] && [ "${OUTPUT2}" == 1 ]; then echo "Problem in delete-vNet. Exit without unregister-cloud." - exit + break fi done diff --git a/src/testclient/scripts/sequentialFullTest/create-k8scluster-only.sh b/src/testclient/scripts/sequentialFullTest/create-k8scluster-only.sh index 5a1cc08e..9ff44e78 100755 --- a/src/testclient/scripts/sequentialFullTest/create-k8scluster-only.sh +++ b/src/testclient/scripts/sequentialFullTest/create-k8scluster-only.sh @@ -89,22 +89,6 @@ if [ "${INDEX}" == "0" ]; then echo "" echo "[Waiting for initialization of K8SCLUSTER:$CNAME (3s)]" dozing 3 - -< $TMP_FILE_KUBECONFIG + jq -r '.CspViewK8sClusterDetail.AccessInfo.Kubeconfig' <<<"$K8SCLUSTERINFO" > $TMP_FILE_KUBECONFIG $KUBECTL --kubeconfig $TMP_FILE_KUBECONFIG delete -f ./nginx-with-pvc.yaml dozing 1 diff --git a/src/testclient/scripts/testSet.env b/src/testclient/scripts/testSet.env index 67f69b07..7c1a359f 100644 --- a/src/testclient/scripts/testSet.env +++ b/src/testclient/scripts/testSet.env @@ -7,20 +7,22 @@ NSID=default AgentInstallOn=no ## Number of CSP types and corresponding regions -NumCSP=3 +NumCSP=1 TotalNumCSP=18 ## Define sequential test order for cloud types # Note: you can change order by replacing lines (automatically assign continuous numbers starting from 1) IX=0 +IndexGCP=$((++IX)) +IndexAzure=$((++IX)) +IndexAWS=$((++IX)) +IndexNHNcloud=$((++IX)) + IndexTestCloud01=$((++IX)) IndexTestCloud02=$((++IX)) IndexTestCloud03=$((++IX)) -IndexAWS=$((++IX)) -IndexAzure=$((++IX)) -IndexGCP=$((++IX)) IndexAlibaba=$((++IX)) IndexOpenstack=$((++IX)) IndexNCP=$((++IX)) @@ -30,7 +32,6 @@ IndexTencent=$((++IX)) IndexKTcloud=$((++IX)) IndexKTcloudVPC=$((++IX)) IndexIBMVPC=$((++IX)) -IndexNHNcloud=$((++IX)) IndexCloudTwin=$((++IX)) IndexMock=$((++IX)) @@ -61,11 +62,12 @@ CSPType[$IndexTestCloud03]=testcloud03 # Note: you can change order by replacing lines (automatically assign continuous numbers starting from 1) # AWS (Total: 21 Regions / Recommend: 20 Regions) -NumRegion[$IndexAWS]=4 +NumRegion[$IndexAWS]=1 TotalNumRegion[$IndexAWS]=21 IY=0 +AwsApNortheast2=$((++IY)) # Location: Asia Pacific (Seoul) AwsApSoutheast1=$((++IY)) # Location: Asia Pacific (Singapore) AwsCaCentral1=$((++IY)) # Location: Canada (Central) AwsUsWest1=$((++IY)) # Location: US West (N. California) @@ -82,7 +84,6 @@ AwsEuWest1=$((++IY)) # Location: Europe (Ireland) AwsEuWest3=$((++IY)) # Location: Europe (Paris) AwsEuNorth1=$((++IY)) # Location: Europe (Stockholm) - No t2.xxx Specs. t3 c5 m5 r5 .. are availble AwsSaEast1=$((++IY)) # Location: South America (São Paulo) -AwsApNortheast2=$((++IY)) # Location: Asia Pacific (Seoul) AwsApEast1=$((++IY)) # Location: Asia Pacific (Hong Kong) - Opt-In required AwsMeSouth1=$((++IY)) # Location: Middle East (Bahrain) - Opt-In required AwsAfSouth1=$((++IY)) # Location: Africa (Cape Town) - Opt-In required @@ -123,87 +124,111 @@ AlibabaCnGuangzhou=$((++IY)) # Location: China (Guangzhou) - NEED TO CHECK NETW -# GCP (Total: 25 Regions / Recommend: 22 Regions) -NumRegion[$IndexGCP]=2 +# GCP (Total: 40 Regions) +NumRegion[$IndexGCP]=10 -TotalNumRegion[$IndexGCP]=25 +TotalNumRegion[$IndexGCP]=40 IY=0 -GcpAsiaEast1=$((++IY)) # Location: Changhua County Taiwan -GcpEuropeWest3=$((++IY)) # Location: Frankfurt Germany -GcpAsiaEast2=$((++IY)) # Location: Hong Kong -GcpAsiaNortheast1=$((++IY)) # Location: Tokyo Japan -GcpAsiaNortheast2=$((++IY)) # Location: Osaka Japan -GcpAsiaNortheast3=$((++IY)) # Location: Seoul South Korea -GcpUsWest4=$((++IY)) # Location: Las Vegas Nevada USA -GcpAsiaSoutheast1=$((++IY)) # Location: Jurong West Singapore -GcpAustraliaSoutheast1=$((++IY)) # Location: Sydney Australia +GcpAustraliaSouthEast1=$((++IY)) # Location: Sydney Australia +GcpAustraliaSouthEast2=$((++IY)) # Location: Melbourne Australia +GcpEuropeCentral2=$((++IY)) # Location: Warsaw, Poland, Europe GcpEuropeNorth1=$((++IY)) # Location: Hamina Finland +GcpEuropeSouthWest1=$((++IY)) # Location: Marseille France GcpEuropeWest1=$((++IY)) # Location: St. Ghislain Belgium GcpEuropeWest2=$((++IY)) # Location: London England UK +GcpEuropeWest3=$((++IY)) # Location: Frankfurt Germany GcpEuropeWest4=$((++IY)) # Location: Eemshaven Netherlands GcpEuropeWest6=$((++IY)) # Location: Zurich Switzerland -GcpNorthamericaNortheast1=$((++IY)) # Location: Montreal Quebec Canada -GcpSouthamericaEast1=$((++IY)) # Location: Osasco (Sao Paulo) Brazil + +GcpEuropeWest8=$((++IY)) # Location: London England UK +GcpEuropeWest9=$((++IY)) # Location: Frankfurt Germany +GcpEuropeWest10=$((++IY)) # Location: Eemshaven Netherlands +GcpEuropeWest12=$((++IY)) # Location: Zurich Switzerland +GcpMeCentral1=$((++IY)) # Location: Dubai United Arab Emirates +GcpMeCentral2=$((++IY)) # Location: Jeddah Saudi Arabia +GcpMeWest1=$((++IY)) # Location: Doha Qatar +GcpNorthAmericaNorthEast1=$((++IY)) # Location: Montreal Quebec Canada +GcpNorthAmericaNorthEast2=$((++IY)) # Location: Toronto Ontario Canada +GcpSouthAmericaEast1=$((++IY)) # Location: Osasco (Sao Paulo) Brazil + +GcpSouthAmericaWest1=$((++IY)) # Location: Santiago Chile GcpUsCentral1=$((++IY)) # Location: Council Bluffs Iowa USA GcpUsEast1=$((++IY)) # Location: Moncks Corner South Carolina USA GcpUsEast4=$((++IY)) # Location: Ashburn Northern Virginia USA +GcpUsEast5=$((++IY)) # Location: Ashburn Northern Virginia USA +GcpUsSouth1=$((++IY)) # Location: São Paulo Brazil GcpUsWest1=$((++IY)) # Location: The Dalles Oregon USA GcpUsWest2=$((++IY)) # Location: Los Angeles California USA GcpUsWest3=$((++IY)) # Location: Salt Lake City Utah USA -GcpAsiaSouth1=$((++IY)) # Location: Mumbai India (zone b since zone a returns QUOTA_EXCEEDED) -GcpAsiaSoutheast2=$((++IY)) # Location: Jakarta, Indonesia, APAC -GcpEuropeCentral2=$((++IY)) # Location: Warsaw, Poland, Europe - +GcpUsWest4=$((++IY)) # Location: Las Vegas Nevada USA +GcpAfricaSouth1=$((++IY)) # Location: Johannesburg South Africa +GcpAsiaEast1=$((++IY)) # Location: Changhua County Taiwan +GcpAsiaEast2=$((++IY)) # Location: Hong Kong +GcpAsiaNorthEast1=$((++IY)) # Location: Tokyo Japan +GcpAsiaNorthEast2=$((++IY)) # Location: Osaka Japan +GcpAsiaNorthEast3=$((++IY)) # Location: Seoul South Korea +GcpAsiaSouth1=$((++IY)) # Location: Mumbai India (zone b since zone a returns QUOTA_EXCEEDED) +GcpAsiaSouth2=$((++IY)) # Location: Delhi India +GcpAsiaSouthEast1=$((++IY)) # Location: Jurong West Singapore +GcpAsiaSouthEast2=$((++IY)) # Location: Jakarta, Indonesia, APAC # Azure (Total: 40 Regions / Recommend: 34 Regions) -NumRegion[$IndexAzure]=2 +NumRegion[$IndexAzure]=1 TotalNumRegion[$IndexAzure]=40 IY=0 -AzureWestus=$((++IY)) # Location: West US -AzureEastus=$((++IY)) # Location: East US -AzureNortheurope=$((++IY)) # Location: North Europe -AzureWesteurope=$((++IY)) # Location: West Europe -AzureEastasia=$((++IY)) # Location: East Asia -AzureSoutheastasia=$((++IY)) # Location: Southeast Asia -AzureNorthcentralus=$((++IY)) # Location: North Central US -AzureSouthcentralus=$((++IY)) # Location: South Central US -AzureCentralus=$((++IY)) # Location: Central US -AzureEastus2=$((++IY)) # Location: East US 2 -AzureJapaneast=$((++IY)) # Location: Japan East -AzureJapanwest=$((++IY)) # Location: Japan West -AzureBrazilsouth=$((++IY)) # Location: Brazil South -AzureAustraliaeast=$((++IY)) # Location: Australia East -AzureAustraliasoutheast=$((++IY)) # Location: Australia Southeast -AzureCentralindia=$((++IY)) # Location: Central India -AzureCanadacentral=$((++IY)) # Location: Canada Central -AzureCanadaeast=$((++IY)) # Location: Canada East -AzureWestcentralus=$((++IY)) # Location: West Central US -AzureWestus2=$((++IY)) # Location: West US 2 +AzureKoreacentral=$((++IY)) # Location: Korea Central +#AzureSouthafricawest=$((++IY)) # Location: South Africa West (not recommend) +#AzureSwitzerlandwest=$((++IY)) # Location: Switzerland West (not recommend) +#AzureGermanynorth=$((++IY)) # Location: Germany North (not recommend) +#AzureUaecentral=$((++IY)) # Location: UAE Central (not recommend) +#AzureNorwaywest=$((++IY)) # Location: Norway West (not recommend) +#AzureFrancesouth=$((++IY)) # Location: France South (not recommend) +#AzureAustraliacentral2=$((++IY)) # Location: Australia Central 2 (not recommend. not support vm service) + + +AzureWestindia=$((++IY)) # Location: West India (not recommend) ERR: not subscribed by default +AzureSouthindia=$((++IY)) # Location: South India (not recommend) ERR: not subscribed by default AzureUkwest=$((++IY)) # Location: UK West AzureUksouth=$((++IY)) # Location: UK South -AzureKoreacentral=$((++IY)) # Location: Korea Central -AzureKoreasouth=$((++IY)) # Location: Korea South AzureFrancecentral=$((++IY)) # Location: France Central +AzureNorwayeast=$((++IY)) # Location: Norway East +AzureJapanwest=$((++IY)) # Location: Japan West +AzureKoreasouth=$((++IY)) # Location: Korea South AzureAustraliacentral=$((++IY)) # Location: Australia Central AzureSouthafricanorth=$((++IY)) # Location: South Africa North AzureUaenorth=$((++IY)) # Location: UAE North AzureSwitzerlandnorth=$((++IY)) # Location: Switzerland North AzureGermanywestcentral=$((++IY)) # Location: Germany West Central -AzureNorwayeast=$((++IY)) # Location: Norway East -AzureSouthindia=$((++IY)) # Location: South India (not recommend) ERR: not subscribed by default -AzureWestindia=$((++IY)) # Location: West India (not recommend) ERR: not subscribed by default -AzureSouthafricawest=$((++IY)) # Location: South Africa West (not recommend) -AzureSwitzerlandwest=$((++IY)) # Location: Switzerland West (not recommend) -AzureGermanynorth=$((++IY)) # Location: Germany North (not recommend) -AzureUaecentral=$((++IY)) # Location: UAE Central (not recommend) -AzureNorwaywest=$((++IY)) # Location: Norway West (not recommend) -AzureFrancesouth=$((++IY)) # Location: France South (not recommend) -AzureAustraliacentral2=$((++IY)) # Location: Australia Central 2 (not recommend. not support vm service) + +AzureAustraliasoutheast=$((++IY)) # Location: Australia Southeast +AzureCentralindia=$((++IY)) # Location: Central India +AzureCanadacentral=$((++IY)) # Location: Canada Central +AzureCanadaeast=$((++IY)) # Location: Canada East +AzureWestcentralus=$((++IY)) # Location: West Central US +AzureWestus2=$((++IY)) # Location: West US 2 + +AzureBrazilsouth=$((++IY)) # Location: Brazil South +AzureAustraliaeast=$((++IY)) # Location: Australia East + +AzureCentralus=$((++IY)) # Location: Central US +AzureEastus2=$((++IY)) # Location: East US 2 +AzureJapaneast=$((++IY)) # Location: Japan East + +AzureSoutheastasia=$((++IY)) # Location: Southeast Asia +AzureNorthcentralus=$((++IY)) # Location: North Central US +AzureSouthcentralus=$((++IY)) # Location: South Central US + +AzureNortheurope=$((++IY)) # Location: North Europe +AzureWesteurope=$((++IY)) # Location: West Europe +AzureEastasia=$((++IY)) # Location: East Asia + +AzureWestus=$((++IY)) # Location: West US +AzureEastus=$((++IY)) # Location: East US @@ -236,7 +261,7 @@ NcpHongkong=$((++IY)) # Location: NCP Hongkong # NCP VPC (Total: 6 Regions / Recommend: ? Regions) -NumRegion[$IndexNCPVPC]=6 +NumRegion[$IndexNCPVPC]=1 TotalNumRegion[$IndexNCPVPC]=6 @@ -331,7 +356,7 @@ IbmVpcJpTokyo=$((++IY)) # Location: Tokyo (Japan) # NHN Cloud (Total: 6 Regions / Recommend: n Regions) -NumRegion[$IndexNHNcloud]=6 +NumRegion[$IndexNHNcloud]=1 TotalNumRegion[$IndexNHNcloud]=6