Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NCP-VPC & NHN Cloud regions & zones #1180

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/testclient/scripts/8.mcis/id-list-vmgroup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

echo "####################################################################"
echo "## 8. VM: List ID"
echo "####################################################################"

source ../init.sh

if [ "${INDEX}" == "0" ]; then
MCISID=${POSTFIX}
else
MCISID=${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}
fi

echo "${MCISID}"

curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/ns/$NSID/mcis/${MCISID}/vmgroup | jq ''


#get_mcis
108 changes: 96 additions & 12 deletions src/testclient/scripts/conf.env
Original file line number Diff line number Diff line change
Expand Up @@ -1985,7 +1985,7 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}


###########################################
## NCP VPC (4 Regions)
## NCP VPC (3 Regions)
IX=$IndexNCPVPC
ProviderName[$IX]=NCPVPC
DriverLibFileName[$IX]=ncpvpc-driver-v1.0.so
Expand Down Expand Up @@ -2061,6 +2061,38 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
# DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
# DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# Region05
IY=$NcpVpcJapan4
# Location: NCPVPC Japan 4
RegionLocation[$IX,$IY]="Japan 4"
RegionName[$IX,$IY]=ncpvpc-jpn-4
RegionKey01[$IX,$IY]=Region
RegionVal01[$IX,$IY]=JPN
RegionKey02[$IX,$IY]=Zone
RegionVal02[$IX,$IY]=JPN-4
CONN_CONFIG[$IX,$IY]=ncpvpc-jpn-4
IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# # Region06
# IY=$NcpVpcJapan5
# # Location: NCPVPC Japan 5
# RegionLocation[$IX,$IY]="Japan 5"
# RegionName[$IX,$IY]=ncpvpc-jpn-5
# RegionKey01[$IX,$IY]=Region
# RegionVal01[$IX,$IY]=JPN
# RegionKey02[$IX,$IY]=Zone
# RegionVal02[$IX,$IY]=JPN-5
# CONN_CONFIG[$IX,$IY]=ncpvpc-jpn-5
# IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
# IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
# SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
# DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
# DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}




Expand Down Expand Up @@ -2728,49 +2760,101 @@ CommonDiskSize[$IX]=default


# region01
IY=$NHNcloudKrPangyo
IY=$NHNcloudKrPangyo1
# Location: South Korea (Pangyo)
RegionLocation[$IX,$IY]="South Korea (Pangyo)"
RegionName[$IX,$IY]=nhncloud-kr-pangyo
RegionName[$IX,$IY]=nhncloud-kr-pangyo1
RegionKey01[$IX,$IY]=Region
RegionVal01[$IX,$IY]=KR1
CONN_CONFIG[$IX,$IY]=nhncloud-kr-pangyo
RegionKey02[$IX,$IY]=Zone
RegionVal02[$IX,$IY]=kr-pub-a
CONN_CONFIG[$IX,$IY]=nhncloud-kr-pangyo1
IMAGE_NAME[$IX,$IY]=5396655e-166a-4875-80d2-ed8613aa054f
IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
SPEC_NAME[$IX,$IY]=m2.c4m8
DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# # region02
# IY=$NHNcloudKrPangyo2
# # Location: South Korea (Pangyo)
# RegionLocation[$IX,$IY]="South Korea (Pangyo)"
# RegionName[$IX,$IY]=nhncloud-kr-pangyo2
# RegionKey01[$IX,$IY]=Region
# RegionVal01[$IX,$IY]=KR1
# RegionKey02[$IX,$IY]=Zone
# RegionVal02[$IX,$IY]=kr-pub-b
# CONN_CONFIG[$IX,$IY]=nhncloud-kr-pangyo2
# IMAGE_NAME[$IX,$IY]=5396655e-166a-4875-80d2-ed8613aa054f
# IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
# SPEC_NAME[$IX,$IY]=m2.c4m8
# DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
# DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
Comment on lines +2778 to +2792
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jihoon-seo
향후에도 활용이 필요한 코드인가요?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conf.env 에 나열되어 있는 다른 CSP, 예를 들어 AWS를 보면,
각 엔티티는 각 AWS 리전 (예: ap-southeast-1) 을 나타내며,
각 엔티티 (리전) 에 대해 존까지 지정하고 있습니다. (예: ap-southeast-1a)

한편, conf.env 에서 NHN Cloud, NCP-VPC 의 경우

  • NHNcloudKrPangyo1: KR1 리전의 kr-pub-a
  • NHNcloudKrPangyo2: KR1 리전의 kr-pub-b
  • ...

에 해당됩니다.

다른 CSP에 대해서도 각 리전별로 존을 지정하여 1 리전 (+ 1 존) - 1 엔트리 형식으로 입력되어 있는 현황을 고려하여
NHN Cloud, NCP-VPC 에 대해서도 1 리전 (+ 1 존) - 1 엔트리 형식을 가져가기 위해
각 리전별 1존에 대해서만 enable 하였으며
나머지 존은 주석 처리 해 두었습니다.

향후 유사시 주석을 해제하여 활용 가능할 것으로 보입니다. 😊


# region02
IY=$NHNcloudKrPyeongchon
# region03
IY=$NHNcloudKrPyeongchon1
# Location: South Korea (Pyeongchon)
RegionLocation[$IX,$IY]="South Korea (Pyeongchon)"
RegionName[$IX,$IY]=nhncloud-kr-pyeongchon
RegionName[$IX,$IY]=nhncloud-kr-pyeongchon1
RegionKey01[$IX,$IY]=Region
RegionVal01[$IX,$IY]=KR2
CONN_CONFIG[$IX,$IY]=nhncloud-kr-pyeongchon
RegionKey02[$IX,$IY]=Zone
RegionVal02[$IX,$IY]=kr2-pub-a
CONN_CONFIG[$IX,$IY]=nhncloud-kr-pyeongchon1
IMAGE_NAME[$IX,$IY]=71893505-923c-4982-b0eb-844eb520661c
IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
SPEC_NAME[$IX,$IY]=m2.c4m8
DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# # region04
# IY=$NHNcloudKrPyeongchon2
# # Location: South Korea (Pyeongchon)
# RegionLocation[$IX,$IY]="South Korea (Pyeongchon)"
# RegionName[$IX,$IY]=nhncloud-kr-pyeongchon2
# RegionKey01[$IX,$IY]=Region
# RegionVal01[$IX,$IY]=KR2
# RegionKey02[$IX,$IY]=Zone
# RegionVal02[$IX,$IY]=kr2-pub-b
# CONN_CONFIG[$IX,$IY]=nhncloud-kr-pyeongchon2
# IMAGE_NAME[$IX,$IY]=71893505-923c-4982-b0eb-844eb520661c
# IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
# SPEC_NAME[$IX,$IY]=m2.c4m8
# DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
# DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# region03
IY=$NHNcloudJpTokyo
# region05
IY=$NHNcloudJpTokyo1
# Location: Japan (Tokyo)
RegionLocation[$IX,$IY]="Japan (Tokyo)"
RegionName[$IX,$IY]=nhncloud-jp-tokyo
RegionName[$IX,$IY]=nhncloud-jp-tokyo1
RegionKey01[$IX,$IY]=Region
RegionVal01[$IX,$IY]=JP1
CONN_CONFIG[$IX,$IY]=nhncloud-jp-tokyo
RegionKey02[$IX,$IY]=Zone
RegionVal02[$IX,$IY]=jp-pub-a
CONN_CONFIG[$IX,$IY]=nhncloud-jp-tokyo1
IMAGE_NAME[$IX,$IY]=ca69fad9-92f3-4c9b-a6e4-7e8b0e4d3a58
IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
SPEC_NAME[$IX,$IY]=m2.c4m8
DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}

# # region06
# IY=$NHNcloudJpTokyo2
# # Location: Japan (Tokyo)
# RegionLocation[$IX,$IY]="Japan (Tokyo)"
# RegionName[$IX,$IY]=nhncloud-jp-tokyo2
# RegionKey01[$IX,$IY]=Region
# RegionVal01[$IX,$IY]=JP1
# RegionKey02[$IX,$IY]=Zone
# RegionVal02[$IX,$IY]=jp-pub-b
# CONN_CONFIG[$IX,$IY]=nhncloud-jp-tokyo2
# IMAGE_NAME[$IX,$IY]=ca69fad9-92f3-4c9b-a6e4-7e8b0e4d3a58
# IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
# SPEC_NAME[$IX,$IY]=m2.c4m8
# DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
# DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}



###########################################
Expand Down
18 changes: 11 additions & 7 deletions src/testclient/scripts/testSet.env
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,18 @@ NcpJapan=$((++IY)) # Location: NCP Japan



# NCP VPC (Total: 4 Regions / Recommend: ? Regions / Not tested yet)
# NCP VPC (Total: 6 Regions / Recommend: ? Regions / Not tested yet)
NumRegion[$IndexNCPVPC]=1

TotalNumRegion[$IndexNCPVPC]=2
TotalNumRegion[$IndexNCPVPC]=3

IY=0
NcpVpcKorea1=$((++IY)) # Location: NCP VPC Korea 1
# NcpVpcKorea2=$((++IY)) # Location: NCP VPC Korea 2
NcpVpcSingapore4=$((++IY)) # Location: NCP VPC Singapore 4
# NcpVpcSingapore5=$((++IY)) # Location: NCP VPC Singapore 5

NcpVpcJapan4=$((++IY)) # Location: NCP VPC Japan 4
# NcpVpcJapan5=$((++IY)) # Location: NCP VPC Japan 5



Expand Down Expand Up @@ -318,15 +319,18 @@ IbmVpcJpTokyo=$((++IY)) # Location: Tokyo (Japan)



# NHN Cloud (Total: 3 Regions / Recommend: n Regions)
# NHN Cloud (Total: 6 Regions / Recommend: n Regions)
NumRegion[$IndexNHNcloud]=1

TotalNumRegion[$IndexNHNcloud]=3

IY=0
NHNcloudKrPangyo=$((++IY)) # Location: South Korea (Pangyo)
NHNcloudKrPyeongchon=$((++IY)) # Location: South Korea (Pyeongchon)
NHNcloudJpTokyo=$((++IY)) # Location: Japan (Tokyo)
NHNcloudKrPangyo1=$((++IY)) # Location: South Korea (Pangyo)
# NHNcloudKrPangyo2=$((++IY)) # Location: South Korea (Pangyo)
NHNcloudKrPyeongchon1=$((++IY)) # Location: South Korea (Pyeongchon)
# NHNcloudKrPyeongchon2=$((++IY)) # Location: South Korea (Pyeongchon)
NHNcloudJpTokyo1=$((++IY)) # Location: Japan (Tokyo)
# NHNcloudJpTokyo2=$((++IY)) # Location: Japan (Tokyo)



Expand Down