Skip to content

Commit c2161c8

Browse files
OAS Update
1 parent f933d40 commit c2161c8

File tree

3 files changed

+72
-15
lines changed

3 files changed

+72
-15
lines changed

services/iaas/v1/iaas.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,8 @@
13281328
"x-extensible-enum": [
13291329
"server",
13301330
"metadata",
1331-
"gateway"
1331+
"gateway",
1332+
"none"
13321333
]
13331334
}
13341335
},
@@ -1565,6 +1566,9 @@
15651566
],
15661567
"readOnly": true
15671568
},
1569+
"metadata": {
1570+
"$ref": "#/components/schemas/Metadata"
1571+
},
15681572
"name": {
15691573
"$ref": "#/components/schemas/ServerName"
15701574
},
@@ -1844,8 +1848,8 @@
18441848
"GenericName": {
18451849
"description": "The name for a General Object. Matches Names and also UUIDs.",
18461850
"example": "objectName26",
1847-
"maxLength": 63,
1848-
"pattern": "^[A-Za-z0-9]+((-|_|\\s|\\.)[A-Za-z0-9]+)*$",
1851+
"maxLength": 127,
1852+
"pattern": "^[A-Za-z0-9]+([ /._-]*[A-Za-z0-9]+)*$",
18491853
"type": "string"
18501854
},
18511855
"GenericNameList": {
@@ -2431,6 +2435,14 @@
24312435
],
24322436
"type": "object"
24332437
},
2438+
"Metadata": {
2439+
"description": "Object that represents the metadata of an object. Regex for keys: `^[a-zA-Z0-9-_:. ]{1,255}$`. Regex for values: `^.{0,255}$`.",
2440+
"example": {
2441+
"key": "value"
2442+
},
2443+
"format": "json",
2444+
"type": "object"
2445+
},
24342446
"NIC": {
24352447
"description": "Object that represents a network interface.",
24362448
"properties": {
@@ -2506,7 +2518,8 @@
25062518
"x-extensible-enum": [
25072519
"server",
25082520
"metadata",
2509-
"gateway"
2521+
"gateway",
2522+
"none"
25102523
]
25112524
}
25122525
},
@@ -3581,6 +3594,9 @@
35813594
],
35823595
"readOnly": true
35833596
},
3597+
"metadata": {
3598+
"$ref": "#/components/schemas/Metadata"
3599+
},
35843600
"name": {
35853601
"$ref": "#/components/schemas/ServerName"
35863602
},
@@ -3748,7 +3764,7 @@
37483764
"description": "The name for a Server.",
37493765
"example": "server1",
37503766
"maxLength": 63,
3751-
"pattern": "^[A-Za-z0-9]+((-|\\.)[A-Za-z0-9]+)*$",
3767+
"pattern": "^(([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$",
37523768
"type": "string"
37533769
},
37543770
"ServerNetwork": {
@@ -4299,6 +4315,9 @@
42994315
"labels": {
43004316
"$ref": "#/components/schemas/Labels"
43014317
},
4318+
"metadata": {
4319+
"$ref": "#/components/schemas/Metadata"
4320+
},
43024321
"name": {
43034322
"$ref": "#/components/schemas/ServerName"
43044323
}

services/iaas/v1alpha1/iaas.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,8 @@
13601360
"x-extensible-enum": [
13611361
"server",
13621362
"metadata",
1363-
"gateway"
1363+
"gateway",
1364+
"none"
13641365
]
13651366
}
13661367
},
@@ -1597,6 +1598,9 @@
15971598
],
15981599
"readOnly": true
15991600
},
1601+
"metadata": {
1602+
"$ref": "#/components/schemas/Metadata"
1603+
},
16001604
"name": {
16011605
"$ref": "#/components/schemas/ServerName"
16021606
},
@@ -1918,8 +1922,8 @@
19181922
"GenericName": {
19191923
"description": "The name for a General Object. Matches Names and also UUIDs.",
19201924
"example": "objectName26",
1921-
"maxLength": 63,
1922-
"pattern": "^[A-Za-z0-9]+((-|_|\\s|\\.)[A-Za-z0-9]+)*$",
1925+
"maxLength": 127,
1926+
"pattern": "^[A-Za-z0-9]+([ /._-]*[A-Za-z0-9]+)*$",
19231927
"type": "string"
19241928
},
19251929
"GenericNameList": {
@@ -2505,6 +2509,14 @@
25052509
],
25062510
"type": "object"
25072511
},
2512+
"Metadata": {
2513+
"description": "Object that represents the metadata of an object. Regex for keys: `^[a-zA-Z0-9-_:. ]{1,255}$`. Regex for values: `^.{0,255}$`.",
2514+
"example": {
2515+
"key": "value"
2516+
},
2517+
"format": "json",
2518+
"type": "object"
2519+
},
25082520
"NIC": {
25092521
"description": "Object that represents a network interface.",
25102522
"properties": {
@@ -2580,7 +2592,8 @@
25802592
"x-extensible-enum": [
25812593
"server",
25822594
"metadata",
2583-
"gateway"
2595+
"gateway",
2596+
"none"
25842597
]
25852598
}
25862599
},
@@ -3724,6 +3737,9 @@
37243737
],
37253738
"readOnly": true
37263739
},
3740+
"metadata": {
3741+
"$ref": "#/components/schemas/Metadata"
3742+
},
37273743
"name": {
37283744
"$ref": "#/components/schemas/ServerName"
37293745
},
@@ -3891,7 +3907,7 @@
38913907
"description": "The name for a Server.",
38923908
"example": "server1",
38933909
"maxLength": 63,
3894-
"pattern": "^[A-Za-z0-9]+((-|\\.)[A-Za-z0-9]+)*$",
3910+
"pattern": "^(([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$",
38953911
"type": "string"
38963912
},
38973913
"ServerNetwork": {
@@ -4442,6 +4458,9 @@
44424458
"labels": {
44434459
"$ref": "#/components/schemas/Labels"
44444460
},
4461+
"metadata": {
4462+
"$ref": "#/components/schemas/Metadata"
4463+
},
44454464
"name": {
44464465
"$ref": "#/components/schemas/ServerName"
44474466
}

services/iaas/v1beta1/iaas.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,8 @@
13281328
"x-extensible-enum": [
13291329
"server",
13301330
"metadata",
1331-
"gateway"
1331+
"gateway",
1332+
"none"
13321333
]
13331334
}
13341335
},
@@ -1565,6 +1566,9 @@
15651566
],
15661567
"readOnly": true
15671568
},
1569+
"metadata": {
1570+
"$ref": "#/components/schemas/Metadata"
1571+
},
15681572
"name": {
15691573
"$ref": "#/components/schemas/ServerName"
15701574
},
@@ -1844,8 +1848,8 @@
18441848
"GenericName": {
18451849
"description": "The name for a General Object. Matches Names and also UUIDs.",
18461850
"example": "objectName26",
1847-
"maxLength": 63,
1848-
"pattern": "^[A-Za-z0-9]+((-|_|\\s|\\.)[A-Za-z0-9]+)*$",
1851+
"maxLength": 127,
1852+
"pattern": "^[A-Za-z0-9]+([ /._-]*[A-Za-z0-9]+)*$",
18491853
"type": "string"
18501854
},
18511855
"GenericNameList": {
@@ -2431,6 +2435,14 @@
24312435
],
24322436
"type": "object"
24332437
},
2438+
"Metadata": {
2439+
"description": "Object that represents the metadata of an object. Regex for keys: `^[a-zA-Z0-9-_:. ]{1,255}$`. Regex for values: `^.{0,255}$`.",
2440+
"example": {
2441+
"key": "value"
2442+
},
2443+
"format": "json",
2444+
"type": "object"
2445+
},
24342446
"NIC": {
24352447
"description": "Object that represents a network interface.",
24362448
"properties": {
@@ -2506,7 +2518,8 @@
25062518
"x-extensible-enum": [
25072519
"server",
25082520
"metadata",
2509-
"gateway"
2521+
"gateway",
2522+
"none"
25102523
]
25112524
}
25122525
},
@@ -3581,6 +3594,9 @@
35813594
],
35823595
"readOnly": true
35833596
},
3597+
"metadata": {
3598+
"$ref": "#/components/schemas/Metadata"
3599+
},
35843600
"name": {
35853601
"$ref": "#/components/schemas/ServerName"
35863602
},
@@ -3748,7 +3764,7 @@
37483764
"description": "The name for a Server.",
37493765
"example": "server1",
37503766
"maxLength": 63,
3751-
"pattern": "^[A-Za-z0-9]+((-|\\.)[A-Za-z0-9]+)*$",
3767+
"pattern": "^(([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$",
37523768
"type": "string"
37533769
},
37543770
"ServerNetwork": {
@@ -4299,6 +4315,9 @@
42994315
"labels": {
43004316
"$ref": "#/components/schemas/Labels"
43014317
},
4318+
"metadata": {
4319+
"$ref": "#/components/schemas/Metadata"
4320+
},
43024321
"name": {
43034322
"$ref": "#/components/schemas/ServerName"
43044323
}

0 commit comments

Comments
 (0)