Skip to content

Commit 8acb308

Browse files
SungWoongzSungWoongz
authored
Merge branch 'cloud-barista:master' into master
2 parents 9b693ff + 42d3309 commit 8acb308

29 files changed

Lines changed: 2724 additions & 137 deletions

File tree

‎api-runtime/common-runtime/PriceInfoHandler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func getProviderSpecificPFName(providerName, pfName string) string {
126126
case "NCP":
127127
return "SVR"
128128
case "NCPVPC":
129-
return "SVR"
129+
return "Server"
130130
default:
131131
return pfName
132132
}

‎api-runtime/rest-runtime/admin-web/AdminWeb-VPC-Subnet.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
// The CB-Spider is a sub-Framework of the Cloud-Barista Multi-Cloud Project.
2+
// The CB-Spider Mission is to connect all the clouds with a single interface.
3+
//
4+
// * Cloud-Barista: https://github.com/cloud-barista
5+
//
6+
// by CB-Spider Team, 2024.08.
7+
18
package adminweb
29

310
import (

‎api/docs.go‎

Lines changed: 121 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8340,22 +8340,22 @@ const docTemplate = `{
83408340
],
83418341
"properties": {
83428342
"Count": {
8343-
"description": "Number of GPUs",
8343+
"description": "Number of GPUs, \"-1\" when not applicable",
83448344
"type": "string",
83458345
"example": "1"
83468346
},
83478347
"Mem": {
8348-
"description": "Memory size of the GPU in MB",
8348+
"description": "Memory size of the GPU in MB, \"-1\" when not applicable",
83498349
"type": "string",
83508350
"example": "8192"
83518351
},
83528352
"Mfr": {
8353-
"description": "Manufacturer of the GPU",
8353+
"description": "Manufacturer of the GPU, NA when not applicable",
83548354
"type": "string",
83558355
"example": "NVIDIA"
83568356
},
83578357
"Model": {
8358-
"description": "Model of the GPU",
8358+
"description": "Model of the GPU, NA when not applicable",
83598359
"type": "string",
83608360
"example": "Tesla K80"
83618361
}
@@ -8459,16 +8459,23 @@ const docTemplate = `{
84598459
"required": [
84608460
"GuestOS",
84618461
"IId",
8462+
"Name",
8463+
"OSArchitecture",
8464+
"OSDiskSizeInGB",
8465+
"OSDiskType",
8466+
"OSDistribution",
8467+
"OSPlatform",
8468+
"Status",
84628469
"Status"
84638470
],
84648471
"properties": {
84658472
"GuestOS": {
8466-
"description": "Windows7, Ubuntu etc.",
8473+
"description": "Windows7, Ubuntu etc. // Deprecated",
84678474
"type": "string",
84688475
"example": "Ubuntu 18.04"
84698476
},
84708477
"IId": {
8471-
"description": "{NameId, SystemId}",
8478+
"description": "{NameId, SystemId} // Deprecated",
84728479
"allOf": [
84738480
{
84748481
"$ref": "#/definitions/spider.IID"
@@ -8481,13 +8488,68 @@ const docTemplate = `{
84818488
"$ref": "#/definitions/spider.KeyValue"
84828489
}
84838490
},
8484-
"Status": {
8485-
"description": "available, unavailable",
8491+
"Name": {
8492+
"description": "ami-00aa5a103ddf4509f",
8493+
"type": "string",
8494+
"example": "ami-00aa5a103ddf4509f"
8495+
},
8496+
"OSArchitecture": {
8497+
"description": "arm64, x86_64 etc.",
8498+
"allOf": [
8499+
{
8500+
"$ref": "#/definitions/spider.OSArchitecture"
8501+
}
8502+
],
8503+
"example": "x86_64"
8504+
},
8505+
"OSDiskSizeInGB": {
8506+
"description": "35, etc., GB",
8507+
"type": "string",
8508+
"example": "35"
8509+
},
8510+
"OSDiskType": {
8511+
"description": "gp3, etc.",
8512+
"type": "string",
8513+
"example": "gp3"
8514+
},
8515+
"OSDistribution": {
8516+
"description": "Ubuntu 22.04~, CentOS 8 etc.",
84868517
"type": "string",
8487-
"example": "available"
8518+
"example": "Ubuntu 22.04~"
8519+
},
8520+
"OSPlatform": {
8521+
"description": "Linux/UNIX, Windows, NA",
8522+
"allOf": [
8523+
{
8524+
"$ref": "#/definitions/spider.OSPlatform"
8525+
}
8526+
],
8527+
"example": "Linux/UNIX"
8528+
},
8529+
"Status": {
8530+
"description": "Available, Unavailable",
8531+
"allOf": [
8532+
{
8533+
"$ref": "#/definitions/spider.ImageStatus"
8534+
}
8535+
],
8536+
"example": "Available"
84888537
}
84898538
}
84908539
},
8540+
"spider.ImageStatus": {
8541+
"type": "string",
8542+
"enum": [
8543+
"Available",
8544+
"Unavailable",
8545+
"NA"
8546+
],
8547+
"x-enum-varnames": [
8548+
"ImageAvailable",
8549+
"ImageUnavailable",
8550+
"ImageNA"
8551+
]
8552+
},
84918553
"spider.ImageType": {
84928554
"type": "string",
84938555
"enum": [
@@ -8879,6 +8941,36 @@ const docTemplate = `{
88798941
"NodeGroupDeleting"
88808942
]
88818943
},
8944+
"spider.OSArchitecture": {
8945+
"type": "string",
8946+
"enum": [
8947+
"arm64",
8948+
"arm64_mac",
8949+
"x86_64",
8950+
"x86_64_mac",
8951+
"NA"
8952+
],
8953+
"x-enum-varnames": [
8954+
"ARM64",
8955+
"ARM64_MAC",
8956+
"X86_64",
8957+
"X86_64_MAC",
8958+
"ArchitectureNA"
8959+
]
8960+
},
8961+
"spider.OSPlatform": {
8962+
"type": "string",
8963+
"enum": [
8964+
"Linux/UNIX",
8965+
"Windows",
8966+
"NA"
8967+
],
8968+
"x-enum-varnames": [
8969+
"Linux_UNIX",
8970+
"Windows",
8971+
"PlatformNA"
8972+
]
8973+
},
88828974
"spider.Platform": {
88838975
"type": "string",
88848976
"enum": [
@@ -9152,13 +9244,18 @@ const docTemplate = `{
91529244
"spider.RegionZoneInfo": {
91539245
"type": "object",
91549246
"required": [
9247+
"CSPDisplayName",
91559248
"DisplayName",
91569249
"Name"
91579250
],
91589251
"properties": {
9252+
"CSPDisplayName": {
9253+
"type": "string",
9254+
"example": "US East (N. Virginia)"
9255+
},
91599256
"DisplayName": {
91609257
"type": "string",
9161-
"example": "US East"
9258+
"example": "United States, Ohio"
91629259
},
91639260
"KeyValueList": {
91649261
"type": "array",
@@ -9303,12 +9400,12 @@ const docTemplate = `{
93039400
],
93049401
"properties": {
93059402
"Clock": {
9306-
"description": "Clock speed in GHz",
9403+
"description": "Clock speed in GHz, \"-1\" when not applicable",
93079404
"type": "string",
93089405
"example": "2.5"
93099406
},
93109407
"Count": {
9311-
"description": "Number of CPU cores",
9408+
"description": "Number of CPU cores, \"-1\" when not applicable",
93129409
"type": "string",
93139410
"example": "2"
93149411
}
@@ -9548,12 +9645,18 @@ const docTemplate = `{
95489645
"spider.VMSpecInfo": {
95499646
"type": "object",
95509647
"required": [
9648+
"Disk",
95519649
"Mem",
95529650
"Name",
95539651
"Region",
95549652
"VCpu"
95559653
],
95569654
"properties": {
9655+
"Disk": {
9656+
"description": "Disk size in GB, \"-1\" when not applicable",
9657+
"type": "string",
9658+
"example": "8"
9659+
},
95579660
"Gpu": {
95589661
"description": "GPU details if available",
95599662
"type": "array",
@@ -9697,14 +9800,19 @@ const docTemplate = `{
96979800
"spider.ZoneInfo": {
96989801
"type": "object",
96999802
"required": [
9803+
"CSPDisplayName",
97009804
"DisplayName",
97019805
"Name",
97029806
"Status"
97039807
],
97049808
"properties": {
9809+
"CSPDisplayName": {
9810+
"type": "string",
9811+
"example": "US East (N. Virginia)"
9812+
},
97059813
"DisplayName": {
97069814
"type": "string",
9707-
"example": "US East 1A"
9815+
"example": "United States, Ohio"
97089816
},
97099817
"KeyValueList": {
97109818
"type": "array",

0 commit comments

Comments
 (0)