Skip to content

Commit 67f8c0a

Browse files
mbashtovayaaviyerMSFT
mbashtovaya
authored and
aviyerMSFT
committed
NetworkCloud 2022-12-12-preview add approved preview corrections (Azure#22820)
* first public preview version for NetworkCloud APIs * added custom words * added required attribute to payloads to correct aaz-dev-tool CLI generation * corrected console patch API payload
1 parent 07477d6 commit 67f8c0a

File tree

4 files changed

+38
-11
lines changed

4 files changed

+38
-11
lines changed

‎specification/networkcloud/resource-manager/Microsoft.NetworkCloud/preview/2022-12-12-preview/examples/Consoles_Patch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"sshPublicKey": {
1515
"keyData": "ssh-rsa AAtsE3njSONzDYRIZv/WLjVuMfrUSByHp+jfaaOLHTIIB4fJvo6dQUZxE20w2iDHV3tEkmnTo84eba97VMueQD6OzJPEyWZMRpz8UYWOd0IXeRqiFu1lawNblZhwNT/ojNZfpB3af/YDzwQCZgTcTRyNNhL4o/blKUmug0daSsSXISTRnIDpcf5qytjs1Xo+yYyJMvzLL59mhAyb3p/cD+Y3/s3WhAx+l0XOKpzXnblrv9d3q4c2tWmm/SyFqthaqd0= admin@vm"
1616
},
17-
"duration": "P1D",
17+
"expiration": "2022-06-01T01:27:03.008Z",
1818
"enabled": "True"
1919
}
2020
}

‎specification/networkcloud/resource-manager/Microsoft.NetworkCloud/preview/2022-12-12-preview/examples/HybridAksClusters_Create.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"subscriptionId": "subscriptionId",
55
"resourceGroupName": "resourceGroupName",
66
"hybridAksClusterName": "hybridAksClusterName",
7-
"HybridAksClusterParameters": {
7+
"hybridAksClusterParameters": {
88
"location": "location",
99
"tags": {
1010
"key1": "myvalue1",

‎specification/networkcloud/resource-manager/Microsoft.NetworkCloud/preview/2022-12-12-preview/examples/L2Networks_Create.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"subscriptionId": "subscriptionId",
55
"resourceGroupName": "resourceGroupName",
66
"l2NetworkName": "l2NetworkName",
7-
"L2NetworkParameters": {
7+
"l2NetworkParameters": {
88
"location": "location",
99
"tags": {
1010
"key1": "myvalue1",

‎specification/networkcloud/resource-manager/Microsoft.NetworkCloud/preview/2022-12-12-preview/networkcloud.json

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@
865865
"description": "The request body.",
866866
"name": "bareMetalMachineParameters",
867867
"in": "body",
868+
"required": true,
868869
"schema": {
869870
"$ref": "#/definitions/BareMetalMachine"
870871
}
@@ -1316,6 +1317,7 @@
13161317
"description": "The request body.",
13171318
"name": "bareMetalMachineRunCommandParameters",
13181319
"in": "body",
1320+
"required": true,
13191321
"schema": {
13201322
"$ref": "#/definitions/BareMetalMachineRunCommandParameters"
13211323
}
@@ -1374,6 +1376,7 @@
13741376
"description": "The request body.",
13751377
"name": "bareMetalMachineRunDataExtractsParameters",
13761378
"in": "body",
1379+
"required": true,
13771380
"schema": {
13781381
"$ref": "#/definitions/BareMetalMachineRunDataExtractsParameters"
13791382
}
@@ -1432,6 +1435,7 @@
14321435
"description": "The request body.",
14331436
"name": "bareMetalMachineRunReadCommandsParameters",
14341437
"in": "body",
1438+
"required": true,
14351439
"schema": {
14361440
"$ref": "#/definitions/BareMetalMachineRunReadCommandsParameters"
14371441
}
@@ -1590,6 +1594,7 @@
15901594
"description": "The request body.",
15911595
"name": "bareMetalMachineValidateHardwareParameters",
15921596
"in": "body",
1597+
"required": true,
15931598
"schema": {
15941599
"$ref": "#/definitions/BareMetalMachineValidateHardwareParameters"
15951600
}
@@ -1726,6 +1731,7 @@
17261731
"description": "The request body.",
17271732
"name": "cloudServicesNetworkParameters",
17281733
"in": "body",
1734+
"required": true,
17291735
"schema": {
17301736
"$ref": "#/definitions/CloudServicesNetwork"
17311737
}
@@ -1981,6 +1987,7 @@
19811987
"description": "The request body.",
19821988
"name": "clusterManagerParameters",
19831989
"in": "body",
1990+
"required": true,
19841991
"schema": {
19851992
"$ref": "#/definitions/ClusterManager"
19861993
}
@@ -2220,6 +2227,7 @@
22202227
"description": "The request body.",
22212228
"name": "clusterParameters",
22222229
"in": "body",
2230+
"required": true,
22232231
"schema": {
22242232
"$ref": "#/definitions/Cluster"
22252233
}
@@ -2487,6 +2495,7 @@
24872495
"description": "The request body.",
24882496
"name": "bareMetalMachineKeySetParameters",
24892497
"in": "body",
2498+
"required": true,
24902499
"schema": {
24912500
"$ref": "#/definitions/BareMetalMachineKeySet"
24922501
}
@@ -2757,6 +2766,7 @@
27572766
"description": "The request body.",
27582767
"name": "bmcKeySetParameters",
27592768
"in": "body",
2769+
"required": true,
27602770
"schema": {
27612771
"$ref": "#/definitions/BmcKeySet"
27622772
}
@@ -3088,6 +3098,7 @@
30883098
"description": "The request body.",
30893099
"name": "metricsConfigurationParameters",
30903100
"in": "body",
3101+
"required": true,
30913102
"schema": {
30923103
"$ref": "#/definitions/ClusterMetricsConfiguration"
30933104
}
@@ -3271,6 +3282,7 @@
32713282
"description": "The request body.",
32723283
"name": "clusterUpdateVersionParameters",
32733284
"in": "body",
3285+
"required": true,
32743286
"schema": {
32753287
"$ref": "#/definitions/ClusterUpdateVersionParameters"
32763288
}
@@ -3407,6 +3419,7 @@
34073419
"description": "The request body.",
34083420
"name": "defaultCniNetworkParameters",
34093421
"in": "body",
3422+
"required": true,
34103423
"schema": {
34113424
"$ref": "#/definitions/DefaultCniNetwork"
34123425
}
@@ -3646,6 +3659,7 @@
36463659
"description": "The request body.",
36473660
"name": "hybridAksClusterParameters",
36483661
"in": "body",
3662+
"required": true,
36493663
"schema": {
36503664
"$ref": "#/definitions/HybridAksCluster"
36513665
}
@@ -3807,6 +3821,7 @@
38073821
"description": "The request body.",
38083822
"name": "hybridAksClusterRestartNodeParameters",
38093823
"in": "body",
3824+
"required": true,
38103825
"schema": {
38113826
"$ref": "#/definitions/HybridAksClusterRestartNodeParameters"
38123827
}
@@ -3943,6 +3958,7 @@
39433958
"description": "The request body.",
39443959
"name": "l2NetworkParameters",
39453960
"in": "body",
3961+
"required": true,
39463962
"schema": {
39473963
"$ref": "#/definitions/L2Network"
39483964
}
@@ -4182,6 +4198,7 @@
41824198
"description": "The request body.",
41834199
"name": "l3NetworkParameters",
41844200
"in": "body",
4201+
"required": true,
41854202
"schema": {
41864203
"$ref": "#/definitions/L3Network"
41874204
}
@@ -4421,6 +4438,7 @@
44214438
"description": "The request body.",
44224439
"name": "rackParameters",
44234440
"in": "body",
4441+
"required": true,
44244442
"schema": {
44254443
"$ref": "#/definitions/Rack"
44264444
}
@@ -4676,6 +4694,7 @@
46764694
"description": "The request body.",
46774695
"name": "storageApplianceParameters",
46784696
"in": "body",
4697+
"required": true,
46794698
"schema": {
46804699
"$ref": "#/definitions/StorageAppliance"
46814700
}
@@ -4961,6 +4980,7 @@
49614980
"description": "The request body.",
49624981
"name": "storageApplianceRunReadCommandsParameters",
49634982
"in": "body",
4983+
"required": true,
49644984
"schema": {
49654985
"$ref": "#/definitions/StorageApplianceRunReadCommandsParameters"
49664986
}
@@ -5019,6 +5039,7 @@
50195039
"description": "The request body.",
50205040
"name": "storageApplianceValidateHardwareParameters",
50215041
"in": "body",
5042+
"required": true,
50225043
"schema": {
50235044
"$ref": "#/definitions/StorageApplianceValidateHardwareParameters"
50245045
}
@@ -5155,6 +5176,7 @@
51555176
"description": "The request body.",
51565177
"name": "trunkedNetworkParameters",
51575178
"in": "body",
5179+
"required": true,
51585180
"schema": {
51595181
"$ref": "#/definitions/TrunkedNetwork"
51605182
}
@@ -5394,6 +5416,7 @@
53945416
"description": "The request body.",
53955417
"name": "virtualMachineParameters",
53965418
"in": "body",
5419+
"required": true,
53975420
"schema": {
53985421
"$ref": "#/definitions/VirtualMachine"
53995422
}
@@ -5571,6 +5594,7 @@
55715594
"description": "The request body.",
55725595
"name": "virtualMachineAttachVolumeParameters",
55735596
"in": "body",
5597+
"required": true,
55745598
"schema": {
55755599
"$ref": "#/definitions/VirtualMachineVolumeParameters"
55765600
}
@@ -5716,6 +5740,7 @@
57165740
"description": "The request body.",
57175741
"name": "consoleParameters",
57185742
"in": "body",
5743+
"required": true,
57195744
"schema": {
57205745
"$ref": "#/definitions/Console"
57215746
}
@@ -5899,6 +5924,7 @@
58995924
"description": "The request body.",
59005925
"name": "virtualMachineDetachVolumeParameters",
59015926
"in": "body",
5927+
"required": true,
59025928
"schema": {
59035929
"$ref": "#/definitions/VirtualMachineVolumeParameters"
59045930
}
@@ -6243,6 +6269,7 @@
62436269
"description": "The request body.",
62446270
"name": "volumeParameters",
62456271
"in": "body",
6272+
"required": true,
62466273
"schema": {
62476274
"$ref": "#/definitions/Volume"
62486275
}
@@ -7917,9 +7944,6 @@
79177944
"ClusterMetricsConfigurationPatchProperties": {
79187945
"type": "object",
79197946
"title": "ClusterMetricsConfigurationPatchProperties represents the properties of metrics configuration for the cluster for patching.",
7920-
"required": [
7921-
"collectionInterval"
7922-
],
79237947
"properties": {
79247948
"collectionInterval": {
79257949
"description": "The interval in minutes by which metrics will be collected.",
@@ -8250,6 +8274,9 @@
82508274
"ClusterUpdateVersionParameters": {
82518275
"type": "object",
82528276
"title": "ClusterUpdateVersionParameters represents the body of the request to update cluster version.",
8277+
"required": [
8278+
"targetClusterVersion"
8279+
],
82538280
"properties": {
82548281
"targetClusterVersion": {
82558282
"description": "The version to be applied to the cluster during update.",
@@ -8414,11 +8441,6 @@
84148441
"type": "object",
84158442
"title": "ConsolePatchProperties represents the properties of the virtual machine console that can be patched.",
84168443
"properties": {
8417-
"duration": {
8418-
"description": "The duration this console access will be allowed for the user. The values are specified in ISO8601 duration format.",
8419-
"type": "string",
8420-
"pattern": "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)?)?$"
8421-
},
84228444
"enabled": {
84238445
"description": "The credentials used to login to the image repository that has access to the specified image.",
84248446
"type": "string",
@@ -8431,6 +8453,11 @@
84318453
"name": "ConsoleEnabled"
84328454
}
84338455
},
8456+
"expiration": {
8457+
"description": "The date and time after which the key will be disallowed access.",
8458+
"type": "string",
8459+
"format": "date-time"
8460+
},
84348461
"sshPublicKey": {
84358462
"$ref": "#/definitions/SshPublicKey"
84368463
}

0 commit comments

Comments
 (0)