Merge pull request #1948 from seokho-son/main

Remove the CSP support for KT Cloud classic
cloud-barista · Dec 18, 2024 · 199ad3e · 199ad3e
2 parents 120d0e1 + 3fa2aba
commit 199ad3e
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 123 deletions.
diff --git a/assets/cloudimage.csv b/assets/cloudimage.csv
@@ -131,8 +131,5 @@ NHNCLOUD,KR2,7042a062-9bf5-4bed-b850-f14d88338ee2,Ubuntu 20.04,Ubuntu Server 20.
 NHNCLOUD,KR2,8b70ca65-5efa-4b14-8539-3f408dae205f,Ubuntu 22.04,Ubuntu Server 22.04.4 LTS - Container (2024.08.20),,k8s
 NHNCLOUD,JP1,d4923746-1cd2-4d4d-9974-ccaa5c120933,Ubuntu 20.04,,,vm
 NHNCLOUD,JP1,b82b6275-68f8-4ff5-8857-66c1735a22cc,Ubuntu 22.04,,,vm
-KTCLOUD,KOR-Central,87838094-af4f-449f-a2f4-f5b4b581eb29,Ubuntu 20.04,,,vm
-KTCLOUD,KOR-Seoul,87838094-af4f-449f-a2f4-f5b4b581eb29,Ubuntu 20.04,,,vm
-KTCLOUD,KOR-Seoul,23bc4025-8a16-4ebf-aa49-3160ee2ac24b,Ubuntu 20.04,,,vm
 KTCLOUDVPC,KR1,eeeedf84-c661-49eb-9758-5df1495a1e2e,Ubuntu 22.04,,,vm
 KTCLOUDVPC,KR1,9c630edc-4c77-40e6-91b7-72273ad1a5df,Ubuntu 24.04,,,vm
diff --git a/assets/cloudinfo.yaml b/assets/cloudinfo.yaml
@@ -1620,30 +1620,6 @@ cloud:
         - eu-es-1
         - eu-es-2
         - eu-es-3
-  ktcloud:
-    description: KT Cloud (Classic without VPC)
-    driver: ktcloud-driver-v1.0.so
-    region:
-      KOR-Seoul:
-        id: KOR-Seoul
-        description: Seoul (South Korea)
-        location:
-          display: Seoul (South Korea)
-          latitude: 37.466535
-          longitude: 126.877969
-        zone:
-        - 95e2f517-d64a-4866-8585-5177c256f7c7
-        - d7d0177e-6cda-404a-a46f-a5b356d2874e
-      KOR-Central:
-        id: KOR-Central
-        description: Cheonan (South Korea)
-        location:
-          display: Cheonan (South Korea)
-          latitude: 36.802725
-          longitude: 127.177481
-        zone:
-        - 9845bd17-d438-4bde-816d-1b12f37d5080
-        - eceb5d65-6571-4696-875f-5a17949f3317
   ktcloudvpc:
     description: KT Cloud (VPC)
     driver: ktcloudvpc-driver-v1.0.so

diff --git a/assets/cloudspec.csv b/assets/cloudspec.csv
@@ -605,12 +605,6 @@ NHNCLOUD,all,g2.v100.c4m90,,,,,,,,,,,,default,default,gpu,NVIDIA V100,1,32,,vm|k
 NHNCLOUD,all,g2.v100.c8m180,,,,,,,,,,,,default,default,gpu,NVIDIA V100,2,64,,vm|k8s
 NHNCLOUD,all,g2.v100.c16m360,,,,,,,,,,,,default,default,gpu,NVIDIA V100,4,128,,vm|k8s
 NHNCLOUD,all,g2.v100.c32m720,,,,,,,,,,,,default,default,gpu,NVIDIA V100,8,256,,vm|k8s
-KTCLOUD,kor-central,d3530ad2-462b-43ad-97d5-e1087b952b7d!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
-KTCLOUD,kor-central,b6b360db-dcbf-48d4-b571-89a6e19bc4b4!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
-KTCLOUD,kor-seoul,d3530ad2-462b-43ad-97d5-e1087b952b7d!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
-KTCLOUD,kor-seoul,b6b360db-dcbf-48d4-b571-89a6e19bc4b4!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
-KTCLOUD,kor-seoul,c308f760-068a-4cdd-abc9-edb581d18e58!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
-KTCLOUD,kor-seoul,c219de89-e664-49f0-aa64-d533b93dd2cf!_disk20GB,,,,,,,,,,,,default,default,,,,,,vm
 KTCLOUDVPC,all,4x16.itl,,,,,,,,,,,,default,default,,,,,,vm
 KTCLOUDVPC,all,8x16.itl,,,,,,,,,,,,default,default,,,,,,vm
 KTCLOUDVPC,all,16x32.itl,,,,,,,,,,,,default,default,,,,,,vm
diff --git a/init/template.credentials.yaml b/init/template.credentials.yaml
@@ -51,9 +51,6 @@ credentialholder:
       # https://cloud.ibm.com/docs/account?topic=account-userapikey
       # ex: 5fwefhLlehfkaseefeffhcviuneiunifhnizHe3uhiL
       ApiKey: 
-    ktcloud:
-      ClientId: 
-      ClientSecret: 
     ktcloudvpc:
       IdentityEndpoint: https://api.ucloudbiz.olleh.com/d1/identity/v3/
       Username: 

diff --git a/scripts/misc/update-cloudinfo.py b/scripts/misc/update-cloudinfo.py
@@ -44,7 +44,6 @@
     'tencent': 'tencent-ap-singapore',
     'ncp': 'ncp-kr',
     'ncpvpc': 'ncpvpc-kr',
-    'ktcloud': 'ktcloud-kor-central',
     'ktcloudvpc': 'ktcloudvpc-kr1',
     'nhncloud': 'nhncloud-kr1'
     # Add more CSPs here

diff --git a/src/testclient/scripts/conf.env b/src/testclient/scripts/conf.env
@@ -2406,72 +2406,6 @@ CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerUbuntu2004[$IX]}
 
 
 
-
-###########################################
-## KTcloud (6 Regions)
-IX=$IndexKTcloud
-ProviderName[$IX]=KTCLOUD
-DriverLibFileName[$IX]=ktcloud-driver-v1.0.so
-DriverName[$IX]=ktcloud-driver01
-CommonImageUbuntu2004[$IX]=87838094-af4f-449f-a2f4-f5b4b581eb29
-CommonSpecSmall[$IX]=d3530ad2-462b-43ad-97d5-e1087b952b7d!_disk20GB
-CommonSpecMedium[$IX]=b6b360db-dcbf-48d4-b571-89a6e19bc4b4!_disk20GB
-CommonImageType[$IX]="Ubuntu 20.04"
-CommonDiskType[$IX]=default
-CommonDiskSize[$IX]=default
-
-
-# region01
-IY=$KTcloudKRCentralA
-# Location: Cheon-an - South Korea
-RegionLocation[$IX,$IY]="Cheon-an - South Korea"
-RegionNativeName[$IX,$IY]=kr-central-a
-CONN_CONFIG[$IX,$IY]=ktcloud-kor-central-eceb5d65-6571-4696-875f-5a17949f3317
-IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu2004[$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]}
-
-# region02
-IY=$KTcloudKRCentralB
-# Location: Cheon-an - South Korea
-RegionLocation[$IX,$IY]="Cheon-an - South Korea"
-RegionNativeName[$IX,$IY]=kr-central-b
-CONN_CONFIG[$IX,$IY]=ktcloud-kor-central-9845bd17-d438-4bde-816d-1b12f37d5080
-IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu2004[$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]}
-
-# region03
-IY=$KTcloudKRSeoulM
-# Location: Seoul - South Korea
-RegionLocation[$IX,$IY]="Seoul - South Korea"
-RegionNativeName[$IX,$IY]=kor-seoul-m
-CONN_CONFIG[$IX,$IY]=ktcloud-kor-seoul-95e2f517-d64a-4866-8585-5177c256f7c7
-IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu2004[$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]}
-
-# region04
-IY=$KTcloudKRSeoulM2
-# Location: Seoul - South Korea
-RegionLocation[$IX,$IY]="Seoul - South Korea"
-RegionNativeName[$IX,$IY]=kor-seoul-m2
-CONN_CONFIG[$IX,$IY]=ktcloud-kor-seoul-d7d0177e-6cda-404a-a46f-a5b356d2874e
-IMAGE_NAME[$IX,$IY]=23bc4025-8a16-4ebf-aa49-3160ee2ac24b
-IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
-SPEC_NAME[$IX,$IY]=c308f760-068a-4cdd-abc9-edb581d18e58!_disk20GB
-DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
-DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
-
-
-
-
 ###########################################
 ## KTcloud VPC (1 Region)
 IX=$IndexKTcloudVPC
@@ -2932,9 +2866,6 @@ function getCloudIndex()
 	elif [ "${CSP}" == "tencent" ]; then
 		# echo "[Tencent driver]"
 		CSPIndex=$IndexTencent
-	elif [ "${CSP}" == "ktcloud" ]; then
-		# echo "[KTcloud driver]"
-		CSPIndex=$IndexKTcloud
 	elif [ "${CSP}" == "ktcloudvpc" ]; then
 		# echo "[KTcloudVPC driver]"
 		CSPIndex=$IndexKTcloudVPC
@@ -3003,9 +2934,6 @@ function getCloudIndexGeneral()
 	elif [ "${CSP}" == "tencent" ]; then
 		# echo "[Tencent driver]"
 		CSPIndex=o
-	elif [ "${CSP}" == "ktcloud" ]; then
-		# echo "[KTcloud driver]"
-		CSPIndex=p
 	elif [ "${CSP}" == "ktcloudvpc" ]; then
 		# echo "[KTcloudVPC driver]"
 		CSPIndex=q

diff --git a/src/testclient/scripts/testSet.env b/src/testclient/scripts/testSet.env
@@ -29,7 +29,6 @@ IndexNCP=$((++IX))
 IndexNCPVPC=$((++IX))
 IndexCloudit=$((++IX))
 IndexTencent=$((++IX))
-IndexKTcloud=$((++IX))
 IndexKTcloudVPC=$((++IX))
 IndexIBMVPC=$((++IX))
 
@@ -50,7 +49,6 @@ CSPType[$IndexNCPVPC]=ncpvpc
 CSPType[$IndexCloudTwin]=cloudtwin
 CSPType[$IndexCloudit]=cloudit
 CSPType[$IndexTencent]=tencent
-CSPType[$IndexKTcloud]=ktcloud
 CSPType[$IndexKTcloudVPC]=ktcloudvpc
 CSPType[$IndexIBMVPC]=ibm
 CSPType[$IndexNHNcloud]=nhncloud
@@ -312,18 +310,6 @@ TencentApHongKong=$((++IY))		    	# Location: Hong Kong
 
 
 
-# KT cloud (Total: 6 Regions / Recommend: n Regions)
-NumRegion[$IndexKTcloud]=4
-
-TotalNumRegion[$IndexKTcloud]=4
-
-IY=0
-KTcloudKRCentralA=$((++IY))			# Location: Cheon-an, South Korea
-KTcloudKRCentralB=$((++IY))			# Location: Cheon-an, South Korea
-KTcloudKRSeoulM=$((++IY))			# Location: Seoul, South Korea
-KTcloudKRSeoulM2=$((++IY))			# Location: Seoul, South Korea
-
-
 # KT cloud VPC (Total: 1 Regions / Recommend: ? Regions)
 NumRegion[$IndexKTcloudVPC]=1