Skip to content

Commit e1d6f9d

Browse files
OAS Update
1 parent 45ad957 commit e1d6f9d

File tree

2 files changed

+88
-84
lines changed

2 files changed

+88
-84
lines changed

services/iaas/v1alpha1/iaas.json

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -530,12 +530,9 @@
530530
"writeOnly": true
531531
},
532532
"source": {
533-
"oneOf": [
534-
{
535-
"$ref": "#/components/schemas/VolumeSourceImage"
536-
},
533+
"allOf": [
537534
{
538-
"$ref": "#/components/schemas/VolumeSourceVolume"
535+
"$ref": "#/components/schemas/BootVolumeSource"
539536
}
540537
],
541538
"writeOnly": true
@@ -547,6 +544,26 @@
547544
],
548545
"type": "object"
549546
},
547+
"BootVolumeSource": {
548+
"description": "The source object of a boot volume.",
549+
"properties": {
550+
"id": {
551+
"$ref": "#/components/schemas/UUID"
552+
},
553+
"type": {
554+
"$ref": "#/components/schemas/BootVolumeSourceTypes"
555+
}
556+
},
557+
"required": [
558+
"type",
559+
"id"
560+
],
561+
"type": "object"
562+
},
563+
"BootVolumeSourceTypes": {
564+
"description": "The source types of a boot volume.",
565+
"type": "string"
566+
},
550567
"CIDR": {
551568
"description": "Classless Inter-Domain Routing (CIDR).",
552569
"example": "192.168.0.0/24",
@@ -867,6 +884,14 @@
867884
],
868885
"readOnly": true
869886
},
887+
"errorMessage": {
888+
"allOf": [
889+
{
890+
"$ref": "#/components/schemas/errorMessage"
891+
}
892+
],
893+
"readOnly": true
894+
},
870895
"id": {
871896
"allOf": [
872897
{
@@ -894,10 +919,12 @@
894919
"$ref": "#/components/schemas/Labels"
895920
},
896921
"launchedAt": {
897-
"example": "2023-09-22T11:39:48.205Z",
898-
"format": "date-time",
899-
"readOnly": true,
900-
"type": "string"
922+
"allOf": [
923+
{
924+
"$ref": "#/components/schemas/LaunchedAt"
925+
}
926+
],
927+
"readOnly": true
901928
},
902929
"machineType": {
903930
"allOf": [
@@ -1059,20 +1086,7 @@
10591086
"$ref": "#/components/schemas/SizeInGB"
10601087
},
10611088
"source": {
1062-
"oneOf": [
1063-
{
1064-
"$ref": "#/components/schemas/VolumeSourceImage"
1065-
},
1066-
{
1067-
"$ref": "#/components/schemas/VolumeSourceVolume"
1068-
},
1069-
{
1070-
"$ref": "#/components/schemas/VolumeSourceSnapshot"
1071-
},
1072-
{
1073-
"$ref": "#/components/schemas/VolumeSourceBackup"
1074-
}
1075-
]
1089+
"$ref": "#/components/schemas/VolumeSource"
10761090
},
10771091
"status": {
10781092
"allOf": [
@@ -1123,8 +1137,7 @@
11231137
"type": "integer"
11241138
},
11251139
"msg": {
1126-
"example": "Project not found",
1127-
"type": "string"
1140+
"$ref": "#/components/schemas/errorMessage"
11281141
}
11291142
},
11301143
"required": [
@@ -1153,13 +1166,15 @@
11531166
"code": {
11541167
"description": "ICMP code. Can be set if the protocol is ICMP.",
11551168
"example": 0,
1169+
"format": "int64",
11561170
"maximum": 255,
11571171
"minimum": 0,
11581172
"type": "integer"
11591173
},
11601174
"type": {
11611175
"description": "ICMP type. Can be set if the protocol is ICMP.",
11621176
"example": 8,
1177+
"format": "int64",
11631178
"maximum": 255,
11641179
"minimum": 0,
11651180
"type": "integer"
@@ -1228,6 +1243,12 @@
12281243
"format": "json",
12291244
"type": "object"
12301245
},
1246+
"LaunchedAt": {
1247+
"description": "Date-time when resource was launched.",
1248+
"example": "2023-09-22T11:39:48Z",
1249+
"format": "date-time",
1250+
"type": "string"
1251+
},
12311252
"MAC": {
12321253
"description": "Object that represents an MAC address.",
12331254
"example": "00:80:41:ae:fd:7e",
@@ -1616,13 +1637,15 @@
16161637
"max": {
16171638
"description": "The maximum port number. Should be greater or equal to the minimum.",
16181639
"example": 22,
1640+
"format": "int64",
16191641
"maximum": 65535,
16201642
"minimum": 0,
16211643
"type": "integer"
16221644
},
16231645
"min": {
16241646
"description": "The minimum port number. Should be less or equal to the minimum.",
16251647
"example": 22,
1648+
"format": "int64",
16261649
"maximum": 65535,
16271650
"minimum": 0,
16281651
"type": "integer"
@@ -1705,6 +1728,7 @@
17051728
"Protocol": {
17061729
"description": "The protocol number which the rule should match.",
17071730
"example": 1,
1731+
"format": "int64",
17081732
"maximum": 255,
17091733
"minimum": 0,
17101734
"type": "integer"
@@ -2132,6 +2156,14 @@
21322156
],
21332157
"readOnly": true
21342158
},
2159+
"errorMessage": {
2160+
"allOf": [
2161+
{
2162+
"$ref": "#/components/schemas/errorMessage"
2163+
}
2164+
],
2165+
"readOnly": true
2166+
},
21352167
"id": {
21362168
"allOf": [
21372169
{
@@ -2159,10 +2191,12 @@
21592191
"$ref": "#/components/schemas/Labels"
21602192
},
21612193
"launchedAt": {
2162-
"example": "2023-09-22T11:39:48.205Z",
2163-
"format": "date-time",
2164-
"readOnly": true,
2165-
"type": "string"
2194+
"allOf": [
2195+
{
2196+
"$ref": "#/components/schemas/LaunchedAt"
2197+
}
2198+
],
2199+
"readOnly": true
21662200
},
21672201
"machineType": {
21682202
"allOf": [
@@ -2461,6 +2495,7 @@
24612495
"SizeInGB": {
24622496
"description": "Size in Gigabyte.",
24632497
"example": 1337,
2498+
"format": "int64",
24642499
"type": "integer"
24652500
},
24662501
"Stateful": {
@@ -2745,20 +2780,7 @@
27452780
"$ref": "#/components/schemas/SizeInGB"
27462781
},
27472782
"source": {
2748-
"oneOf": [
2749-
{
2750-
"$ref": "#/components/schemas/VolumeSourceImage"
2751-
},
2752-
{
2753-
"$ref": "#/components/schemas/VolumeSourceVolume"
2754-
},
2755-
{
2756-
"$ref": "#/components/schemas/VolumeSourceSnapshot"
2757-
},
2758-
{
2759-
"$ref": "#/components/schemas/VolumeSourceBackup"
2760-
}
2761-
]
2783+
"$ref": "#/components/schemas/VolumeSource"
27622784
},
27632785
"status": {
27642786
"allOf": [
@@ -2876,59 +2898,36 @@
28762898
],
28772899
"type": "object"
28782900
},
2879-
"VolumeSourceBackup": {
2880-
"description": "The volume source type to generate a new volume based on a existing Backup.",
2901+
"VolumeSource": {
2902+
"description": "The source object of a volume.",
28812903
"properties": {
2882-
"backupId": {
2883-
"$ref": "#/components/schemas/UUID"
2884-
}
2885-
},
2886-
"required": [
2887-
"backupId"
2888-
],
2889-
"type": "object"
2890-
},
2891-
"VolumeSourceImage": {
2892-
"description": "The volume source type to generate a new volume based on an image.",
2893-
"properties": {
2894-
"imageId": {
2895-
"$ref": "#/components/schemas/UUID"
2896-
}
2897-
},
2898-
"required": [
2899-
"imageId"
2900-
],
2901-
"type": "object"
2902-
},
2903-
"VolumeSourceSnapshot": {
2904-
"description": "The volume source type to generate a new volume based on a existing Snapshot.",
2905-
"properties": {
2906-
"snapshotId": {
2904+
"id": {
29072905
"$ref": "#/components/schemas/UUID"
2906+
},
2907+
"type": {
2908+
"$ref": "#/components/schemas/VolumeSourceTypes"
29082909
}
29092910
},
29102911
"required": [
2911-
"snapshotId"
2912+
"type",
2913+
"id"
29122914
],
29132915
"type": "object"
29142916
},
2915-
"VolumeSourceVolume": {
2916-
"description": "The volume source type to generate a new volume by cloning an existing one.",
2917-
"properties": {
2918-
"volumeId": {
2919-
"$ref": "#/components/schemas/UUID"
2920-
}
2921-
},
2922-
"required": [
2923-
"volumeId"
2924-
],
2925-
"type": "object"
2917+
"VolumeSourceTypes": {
2918+
"description": "The source types of a volume.",
2919+
"type": "string"
29262920
},
29272921
"VolumeStatus": {
29282922
"description": "The status of a volume object.",
29292923
"example": "ATTACHED",
29302924
"type": "string"
29312925
},
2926+
"errorMessage": {
2927+
"description": "An error message.",
2928+
"example": "Project not found",
2929+
"type": "string"
2930+
},
29322931
"v1NetworkGateway": {
29332932
"allOf": [
29342933
{
@@ -4731,6 +4730,7 @@
47314730
"length": {
47324731
"default": 2000,
47334732
"description": "Set to 0 to retrieve the complete log.",
4733+
"format": "int64",
47344734
"minimum": 0,
47354735
"type": "integer"
47364736
}

services/iaas/v1beta1/iaas.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,7 @@
493493
"type": "integer"
494494
},
495495
"msg": {
496-
"example": "Project not found",
497-
"type": "string"
496+
"$ref": "#/components/schemas/errorMessage"
498497
}
499498
},
500499
"required": [
@@ -1070,6 +1069,11 @@
10701069
"format": "date-time",
10711070
"type": "string"
10721071
},
1072+
"errorMessage": {
1073+
"description": "An error message.",
1074+
"example": "Project not found",
1075+
"type": "string"
1076+
},
10731077
"v1NetworkGateway": {
10741078
"allOf": [
10751079
{

0 commit comments

Comments
 (0)