Merge pull request #1122 from seokho-son/main

Update to enable disk type settings
cloud-barista · May 30, 2022 · 4def60b · 4def60b
2 parents ec711b2 + 88f2fe1
commit 4def60b
Show file tree

Hide file tree

Showing 7 changed files with 367 additions and 462 deletions.
diff --git a/assets/cloudspec.csv b/assets/cloudspec.csv
diff --git a/scripts/runSpider.sh b/scripts/runSpider.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CONTAINER_NAME_READ="CB-Spider"
-CONTAINER_VERSION="0.5.3"
+CONTAINER_VERSION="0.5.6-p1"
 CONTAINER_PORT="-p 1024:1024 -p 2048:2048"
 CONTAINER_DATA_PATH="/root/go/src/github.com/cloud-barista/cb-spider/meta_db"
 

diff --git a/src/api/grpc/request/mcirapi.go b/src/api/grpc/request/mcirapi.go
@@ -130,45 +130,6 @@ type TbSpecInfoRequest struct {
 	Item core_mcir.TbSpecInfo `yaml:"spec" json:"spec"`
 }
 
-// TbSpecInfo
-// type TbSpecInfo struct { // Tumblebug
-// 	Namespace             string   `json:"namespace"` // required to save in RDB
-// 	Id                    string   `json:"id"`
-// 	Name                  string   `json:"name"`
-// 	ConnectionName        string   `json:"connectionName"`
-// 	CspSpecName           string   `json:"cspSpecName"`
-// 	OsType                string   `json:"osType"`
-// 	NumvCPU               uint16   `json:"numvCPU"`
-// 	NumCore               uint16   `json:"numCore"`
-// 	MemGiB                uint16   `json:"memGiB"`
-// 	StorageGiB            uint32   `json:"storageGiB"`
-// 	Description           string   `json:"description"`
-// 	CostPerHour           float32  `json:"costPerHour"`
-// 	NumStorage            uint8    `json:"numStorage"`
-// 	MaxNumStorage         uint8    `json:"maxNumStorage"`
-// 	MaxTotalStorageTiB    uint16   `json:"maxTotalStorageTiB"`
-// 	NetBwGbps             uint16   `json:"netBwGbps"`
-// 	EbsBwMbps             uint32   `json:"ebsBwMbps"`
-// 	GpuModel              string   `json:"gpuModel"`
-// 	NumGpu                uint8    `json:"numGpu"`
-// 	GpuMemGiB             uint16   `json:"gpuMemGiB"`
-// 	GpuP2p                string   `json:"gpuP2p"`
-// 	OrderInFilteredResult uint16   `json:"orderInFilteredResult"`
-// 	EvaluationStatus      string   `json:"evaluationStatus"`
-// 	EvaluationScore01     float32  `json:"evaluationScore01"`
-// 	EvaluationScore02     float32  `json:"evaluationScore02"`
-// 	EvaluationScore03     float32  `json:"evaluationScore03"`
-// 	EvaluationScore04     float32  `json:"evaluationScore04"`
-// 	EvaluationScore05     float32  `json:"evaluationScore05"`
-// 	EvaluationScore06     float32  `json:"evaluationScore06"`
-// 	EvaluationScore07     float32  `json:"evaluationScore07"`
-// 	EvaluationScore08     float32  `json:"evaluationScore08"`
-// 	EvaluationScore09     float32  `json:"evaluationScore09"`
-// 	EvaluationScore10     float32  `json:"evaluationScore10"`
-// 	AssociatedObjectList  []string `json:"associatedObjectList"`
-// 	IsAutoGenerated       bool     `json:"isAutoGenerated"`
-// }
-
 // TbSshKeyCreateRequest is for Wrapper struct
 type TbSshKeyCreateRequest struct {
 	NsId string                `yaml:"nsId" json:"nsId"`

diff --git a/src/core/mcir/common.go b/src/core/mcir/common.go
@@ -1384,7 +1384,23 @@ func LoadCommonResource() (common.IdList, error) {
 				// RandomSleep for safe parallel executions
 				common.RandomSleep(0, 20)
 				specReqTmp := TbSpecReq{}
-				// [0]connectionName, [1]cspSpecName, [2]CostPerHour, [3]evaluationScore01, ..., [12]evaluationScore10
+				// 0	providerName
+				// 1	regionName
+				// 2	connectionName
+				// 3	cspSpecName
+				// 4	CostPerHour
+				// 5	evaluationScore01
+				// 6	evaluationScore02
+				// 7	evaluationScore03
+				// 8	evaluationScore04
+				// 9	evaluationScore05
+				// 10	evaluationScore06
+				// 11	evaluationScore07
+				// 12	evaluationScore08
+				// 13	evaluationScore09
+				// 14	evaluationScore10
+				// 15	rootDiskType
+				// 16	rootDiskSize
 				specReqTmp.ConnectionName = row[2]
 				specReqTmp.CspSpecName = row[3]
 				// Give a name for spec object by combining ConnectionName and CspSpecName
@@ -1409,9 +1425,10 @@ func LoadCommonResource() (common.IdList, error) {
 
 				// Update registered Spec object with ProviderName
 				providerName := row[0]
-
 				// Update registered Spec object with RegionName
 				regionName := row[1]
+				rootDiskType := row[15]
+				rootDiskSize := row[16]
 
 				// Update registered Spec object with Cost info
 				costPerHour, err2 := strconv.ParseFloat(strings.ReplaceAll(row[4], " ", ""), 32)
@@ -1433,6 +1450,8 @@ func LoadCommonResource() (common.IdList, error) {
 						ProviderName:      providerName,
 						RegionName:        regionName,
 						CostPerHour:       float32(costPerHour),
+						RootDiskType:      rootDiskType,
+						RootDiskSize:      rootDiskSize,
 						EvaluationScore01: float32(evaluationScore01),
 					}
 

diff --git a/src/core/mcir/spec.go b/src/core/mcir/spec.go
@@ -117,6 +117,8 @@ type TbSpecInfo struct { // Tumblebug
 	EvaluationScore08     float32  `json:"evaluationScore08"`
 	EvaluationScore09     float32  `json:"evaluationScore09"`
 	EvaluationScore10     float32  `json:"evaluationScore10"`
+	RootDiskType          string   `json:"rootDiskType"`
+	RootDiskSize          string   `json:"rootDiskSize"`
 	AssociatedObjectList  []string `json:"associatedObjectList,omitempty"`
 	IsAutoGenerated       bool     `json:"isAutoGenerated,omitempty"`
 

diff --git a/src/testclient/scripts/misc/gen-csv-image.sh b/src/testclient/scripts/misc/gen-csv-image.sh
diff --git a/src/testclient/scripts/misc/gen-csv-spec-image.sh b/src/testclient/scripts/misc/gen-csv-spec-image.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+echo "####################################################################"
+echo "## Gen csv file from script config"
+echo "####################################################################"
+
+source ../init.sh
+
+PRINT="ProviderName,connectionName,cspImageId,OsType"
+echo "${PRINT}"
+echo "${PRINT}" >./cloudimage.csv
+
+INDEXX=${TotalNumCSP}
+for ((cspi = 1; cspi <= INDEXX; cspi++)); do
+	INDEXY=${TotalNumRegion[$cspi]}
+	for ((cspj = 1; cspj <= INDEXY; cspj++)); do
+		PRINT="${ProviderName[$cspi]},${CONN_CONFIG[$cspi,$cspj]},${IMAGE_NAME[$cspi,$cspj]},${IMAGE_TYPE[$cspi,$cspj]}"
+		echo "$PRINT"
+		echo "$PRINT" >>./cloudimage.csv
+	done
+done
+
+PRINT="providerName,regionName,connectionName,cspSpecName,CostPerHour,evaluationScore01,evaluationScore02,evaluationScore03,evaluationScore04,evaluationScore05,evaluationScore06,evaluationScore07,evaluationScore08,evaluationScore09,evaluationScore10,rootDiskType,rootDiskSize"
+echo "${PRINT}"
+echo "${PRINT}" >./cloudspec.csv
+
+INDEXX=${TotalNumCSP}
+for ((cspi = 1; cspi <= INDEXX; cspi++)); do
+	INDEXY=${TotalNumRegion[$cspi]}
+	for ((cspj = 1; cspj <= INDEXY; cspj++)); do
+		PRINT="${ProviderName[$cspi]},${RegionName[$cspi,$cspj]},${CONN_CONFIG[$cspi,$cspj]},${SPEC_NAME[$cspi,$cspj]},,,,,,,,,,,${DISK_TYPE[$cspi,$cspj]},${DISK_SIZE[$cspi,$cspj]}"
+		echo "$PRINT"
+		echo "$PRINT" >>./cloudspec.csv
+	done
+done