Sync cloud models with CB-Tumblebug

cloud-barista · Jun 7, 2024 · 5a2d728 · 5a2d728
2 parents 1e4a40a + 7d8f882
commit 5a2d728
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 132 deletions.
diff --git a/api/docs.go b/api/docs.go
@@ -1076,40 +1076,32 @@ const docTemplate = `{
                 "configName": {
                     "type": "string"
                 },
+                "credentialHolder": {
+                    "type": "string"
+                },
                 "credentialName": {
                     "type": "string"
                 },
                 "driverName": {
                     "type": "string"
                 },
-                "location": {
-                    "$ref": "#/definitions/common.GeoLocation"
-                },
                 "providerName": {
                     "type": "string"
                 },
-                "regionName": {
-                    "type": "string"
-                }
-            }
-        },
-        "common.GeoLocation": {
-            "type": "object",
-            "properties": {
-                "briefAddr": {
-                    "type": "string"
+                "regionDetail": {
+                    "$ref": "#/definitions/common.RegionDetail"
                 },
-                "cloudType": {
-                    "type": "string"
+                "regionRepresentative": {
+                    "type": "boolean"
                 },
-                "latitude": {
-                    "type": "string"
+                "regionZoneInfo": {
+                    "$ref": "#/definitions/common.RegionZoneInfo"
                 },
-                "longitude": {
+                "regionZoneInfoName": {
                     "type": "string"
                 },
-                "nativeRegion": {
-                    "type": "string"
+                "verified": {
+                    "type": "boolean"
                 }
             }
         },
@@ -1195,6 +1187,40 @@ const docTemplate = `{
                 }
             }
         },
+        "common.RegionDetail": {
+            "type": "object",
+            "properties": {
+                "description": {
+                    "type": "string"
+                },
+                "location": {
+                    "$ref": "#/definitions/common.Location"
+                },
+                "regionId": {
+                    "type": "string"
+                },
+                "regionName": {
+                    "type": "string"
+                },
+                "zones": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        },
+        "common.RegionZoneInfo": {
+            "type": "object",
+            "properties": {
+                "assignedRegion": {
+                    "type": "string"
+                },
+                "assignedZone": {
+                    "type": "string"
+                }
+            }
+        },
         "common.RestGetAllNsResponse": {
             "type": "object",
             "properties": {

diff --git a/api/swagger.json b/api/swagger.json
@@ -1069,40 +1069,32 @@
                 "configName": {
                     "type": "string"
                 },
+                "credentialHolder": {
+                    "type": "string"
+                },
                 "credentialName": {
                     "type": "string"
                 },
                 "driverName": {
                     "type": "string"
                 },
-                "location": {
-                    "$ref": "#/definitions/common.GeoLocation"
-                },
                 "providerName": {
                     "type": "string"
                 },
-                "regionName": {
-                    "type": "string"
-                }
-            }
-        },
-        "common.GeoLocation": {
-            "type": "object",
-            "properties": {
-                "briefAddr": {
-                    "type": "string"
+                "regionDetail": {
+                    "$ref": "#/definitions/common.RegionDetail"
                 },
-                "cloudType": {
-                    "type": "string"
+                "regionRepresentative": {
+                    "type": "boolean"
                 },
-                "latitude": {
-                    "type": "string"
+                "regionZoneInfo": {
+                    "$ref": "#/definitions/common.RegionZoneInfo"
                 },
-                "longitude": {
+                "regionZoneInfoName": {
                     "type": "string"
                 },
-                "nativeRegion": {
-                    "type": "string"
+                "verified": {
+                    "type": "boolean"
                 }
             }
         },
@@ -1188,6 +1180,40 @@
                 }
             }
         },
+        "common.RegionDetail": {
+            "type": "object",
+            "properties": {
+                "description": {
+                    "type": "string"
+                },
+                "location": {
+                    "$ref": "#/definitions/common.Location"
+                },
+                "regionId": {
+                    "type": "string"
+                },
+                "regionName": {
+                    "type": "string"
+                },
+                "zones": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        },
+        "common.RegionZoneInfo": {
+            "type": "object",
+            "properties": {
+                "assignedRegion": {
+                    "type": "string"
+                },
+                "assignedZone": {
+                    "type": "string"
+                }
+            }
+        },
         "common.RestGetAllNsResponse": {
             "type": "object",
             "properties": {

diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -276,29 +276,24 @@ definitions:
     properties:
       configName:
         type: string
+      credentialHolder:
+        type: string
       credentialName:
         type: string
       driverName:
         type: string
-      location:
-        $ref: '#/definitions/common.GeoLocation'
       providerName:
         type: string
-      regionName:
-        type: string
-    type: object
-  common.GeoLocation:
-    properties:
-      briefAddr:
-        type: string
-      cloudType:
-        type: string
-      latitude:
-        type: string
-      longitude:
-        type: string
-      nativeRegion:
+      regionDetail:
+        $ref: '#/definitions/common.RegionDetail'
+      regionRepresentative:
+        type: boolean
+      regionZoneInfo:
+        $ref: '#/definitions/common.RegionZoneInfo'
+      regionZoneInfoName:
         type: string
+      verified:
+        type: boolean
     type: object
   common.IID:
     properties:
@@ -355,6 +350,28 @@ definitions:
         example: ns01
         type: string
     type: object
+  common.RegionDetail:
+    properties:
+      description:
+        type: string
+      location:
+        $ref: '#/definitions/common.Location'
+      regionId:
+        type: string
+      regionName:
+        type: string
+      zones:
+        items:
+          type: string
+        type: array
+    type: object
+  common.RegionZoneInfo:
+    properties:
+      assignedRegion:
+        type: string
+      assignedZone:
+        type: string
+    type: object
   common.RestGetAllNsResponse:
     properties:
       ns:

diff --git a/pkg/core/common/config.go b/pkg/core/common/config.go
@@ -23,13 +23,44 @@ import (
 	cbstore_utils "github.com/cloud-barista/cb-store/utils"
 )
 
+// CloudInfo is structure for cloud information
+type CloudInfo struct {
+	CSPs map[string]CSPDetail `mapstructure:"cloud" json:"csps"`
+}
+
+// CSPDetail is structure for CSP information
+type CSPDetail struct {
+	Description string                  `mapstructure:"description" json:"description"`
+	Driver      string                  `mapstructure:"driver" json:"driver"`
+	Links       []string                `mapstructure:"link" json:"links"`
+	Regions     map[string]RegionDetail `mapstructure:"region" json:"regions"`
+}
+
+// RegionDetail is structure for region information
+type RegionDetail struct {
+	RegionId    string   `mapstructure:"id" json:"regionId"`
+	RegionName  string   `mapstructure:"regionName" json:"regionName"`
+	Description string   `mapstructure:"description" json:"description"`
+	Location    Location `mapstructure:"location" json:"location"`
+	Zones       []string `mapstructure:"zone" json:"zones"`
+}
+
 // Location is structure for location information
 type Location struct {
 	Display   string  `mapstructure:"display" json:"display"`
 	Latitude  float64 `mapstructure:"latitude" json:"latitude"`
 	Longitude float64 `mapstructure:"longitude" json:"longitude"`
 }
 
+// RuntimeCloudInfo is global variable for CloudInfo
+var RuntimeCloudInfo = CloudInfo{}
+
+type Credential struct {
+	Credentialholder map[string]map[string]map[string]string `yaml:"credentialholder"`
+}
+
+var RuntimeCredential = Credential{}
+
 // RuntimeLatancyMap is global variable for LatancyMap
 var RuntimeLatancyMap = [][]string{}