Skip to content

Commit beb0f61

Browse files
grizzlytheodoreTheodore Chang
authored and
aviyerMSFT
committed
Fix compute model validation errors (Azure#22271)
* remove instance view from virtualmachine list * remove instance view from vm list * add id to availability set object in examples * add id for dedicated host * add id for ssh key in examples * add id for capacity reservation in examples * LRO_Response_Header for examples * fix all the example titles to be singular * make example titles also singular * add vmss id in vmss get/list * add vmExtensionImage ids to examples * add VMExtension id to examples * add id for managed disks * Revert "add id for managed disks" This reverts commit adbeabb. * fix example name error * point managed disk to SubResourceIdNotRequired * remove instance view from virtualmachine list * update Swagger files to resolve model validations * fix examples * change "header" to "headers" in examples * fix examples. * fix LIntDiffs * add schema description * try suppressing lintDiff * revert last commit * lintdiff suppress * try * try * updated * fix * try * try * try * remove R2062 * suppress XmsResourceInPutResponse * remove x-ms-azure-resource tag from SubResource, SubResourceReadOnly and add it to objects referring to them instead. * remove x-ms-azure-resource from virtualMachineImage because it is not a tracked resource * fix generation error * mitigate track 1 generating issue --------- Co-authored-by: Theodore Chang <[email protected]>
1 parent 9c58d30 commit beb0f61

File tree

213 files changed

+719
-828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+719
-828
lines changed

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/availabilitySet.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
}
145145
},
146146
"x-ms-examples": {
147-
"AvailabilitySets_Update_MaximumSet_Gen": {
148-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Update_MaximumSet_Gen.json"
147+
"AvailabilitySet_Update_MaximumSet_Gen": {
148+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Update_MaximumSet_Gen.json"
149149
},
150-
"AvailabilitySets_Update_MinimumSet_Gen": {
151-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Update_MinimumSet_Gen.json"
150+
"AvailabilitySet_Update_MinimumSet_Gen": {
151+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Update_MinimumSet_Gen.json"
152152
}
153153
}
154154
},
@@ -195,11 +195,11 @@
195195
}
196196
},
197197
"x-ms-examples": {
198-
"AvailabilitySets_Delete_MaximumSet_Gen": {
199-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Delete_MaximumSet_Gen.json"
198+
"AvailabilitySet_Delete_MaximumSet_Gen": {
199+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Delete_MaximumSet_Gen.json"
200200
},
201-
"AvailabilitySets_Delete_MinimumSet_Gen": {
202-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Delete_MinimumSet_Gen.json"
201+
"AvailabilitySet_Delete_MinimumSet_Gen": {
202+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Delete_MinimumSet_Gen.json"
203203
}
204204
}
205205
},
@@ -246,11 +246,11 @@
246246
}
247247
},
248248
"x-ms-examples": {
249-
"AvailabilitySets_Get_MaximumSet_Gen": {
250-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Get_MaximumSet_Gen.json"
249+
"AvailabilitySet_Get_MaximumSet_Gen": {
250+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Get_MaximumSet_Gen.json"
251251
},
252-
"AvailabilitySets_Get_MinimumSet_Gen": {
253-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_Get_MinimumSet_Gen.json"
252+
"AvailabilitySet_Get_MinimumSet_Gen": {
253+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_Get_MinimumSet_Gen.json"
254254
}
255255
}
256256
}
@@ -341,11 +341,11 @@
341341
"nextLinkName": "nextLink"
342342
},
343343
"x-ms-examples": {
344-
"AvailabilitySets_List_MaximumSet_Gen": {
345-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_List_MaximumSet_Gen.json"
344+
"AvailabilitySet_List_MaximumSet_Gen": {
345+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_List_MaximumSet_Gen.json"
346346
},
347-
"AvailabilitySets_List_MinimumSet_Gen": {
348-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_List_MinimumSet_Gen.json"
347+
"AvailabilitySet_List_MinimumSet_Gen": {
348+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_List_MinimumSet_Gen.json"
349349
}
350350
}
351351
}
@@ -397,11 +397,11 @@
397397
"nextLinkName": null
398398
},
399399
"x-ms-examples": {
400-
"AvailabilitySets_ListAvailableSizes_MaximumSet_Gen": {
401-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_ListAvailableSizes_MaximumSet_Gen.json"
400+
"AvailabilitySet_ListAvailableSizes_MaximumSet_Gen": {
401+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_ListAvailableSizes_MaximumSet_Gen.json"
402402
},
403-
"AvailabilitySets_ListAvailableSizes_MinimumSet_Gen": {
404-
"$ref": "./examples/availabilitySetExamples/AvailabilitySets_ListAvailableSizes_MinimumSet_Gen.json"
403+
"AvailabilitySet_ListAvailableSizes_MinimumSet_Gen": {
404+
"$ref": "./examples/availabilitySetExamples/AvailabilitySet_ListAvailableSizes_MinimumSet_Gen.json"
405405
}
406406
}
407407
}

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/capacityReservation.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@
150150
}
151151
},
152152
"x-ms-examples": {
153-
"CapacityReservationGroups_Update_MaximumSet_Gen": {
153+
"CapacityReservationGroup_Update_MaximumSet_Gen": {
154154
"$ref": "./examples/capacityReservationExamples/CapacityReservationGroup_Update_MaximumSet_Gen.json"
155155
},
156-
"CapacityReservationGroups_Update_MinimumSet_Gen": {
156+
"CapacityReservationGroup_Update_MinimumSet_Gen": {
157157
"$ref": "./examples/capacityReservationExamples/CapacityReservationGroup_Update_MinimumSet_Gen.json"
158158
}
159159
}
@@ -201,10 +201,10 @@
201201
}
202202
},
203203
"x-ms-examples": {
204-
"CapacityReservationGroups_Delete_MaximumSet_Gen": {
204+
"CapacityReservationGroup_Delete_MaximumSet_Gen": {
205205
"$ref": "./examples/capacityReservationExamples/CapacityReservationGroup_Delete_MaximumSet_Gen.json"
206206
},
207-
"CapacityReservationGroups_Delete_MinimumSet_Gen": {
207+
"CapacityReservationGroup_Delete_MinimumSet_Gen": {
208208
"$ref": "./examples/capacityReservationExamples/CapacityReservationGroup_Delete_MinimumSet_Gen.json"
209209
}
210210
}
@@ -522,10 +522,10 @@
522522
},
523523
"x-ms-long-running-operation": true,
524524
"x-ms-examples": {
525-
"CapacityReservations_Update_MaximumSet_Gen": {
525+
"CapacityReservation_Update_MaximumSet_Gen": {
526526
"$ref": "./examples/capacityReservationExamples/CapacityReservation_Update_MaximumSet_Gen.json"
527527
},
528-
"CapacityReservations_Update_MinimumSet_Gen": {
528+
"CapacityReservation_Update_MinimumSet_Gen": {
529529
"$ref": "./examples/capacityReservationExamples/CapacityReservation_Update_MinimumSet_Gen.json"
530530
}
531531
}
@@ -584,10 +584,10 @@
584584
},
585585
"x-ms-long-running-operation": true,
586586
"x-ms-examples": {
587-
"CapacityReservations_Delete_MaximumSet_Gen": {
587+
"CapacityReservation_Delete_MaximumSet_Gen": {
588588
"$ref": "./examples/capacityReservationExamples/CapacityReservation_Delete_MaximumSet_Gen.json"
589589
},
590-
"CapacityReservations_Delete_MinimumSet_Gen": {
590+
"CapacityReservation_Delete_MinimumSet_Gen": {
591591
"$ref": "./examples/capacityReservationExamples/CapacityReservation_Delete_MinimumSet_Gen.json"
592592
}
593593
}

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/computeRPCommon.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@
362362
"$ref": "#/definitions/InstanceViewStatus",
363363
"description": "Describes colocation status of a resource in the Proximity Placement Group."
364364
}
365-
}
365+
},
366+
"x-ms-azure-resource": true
366367
},
367368
"VirtualMachineSize": {
368369
"properties": {
@@ -709,7 +710,8 @@
709710
"$ref": "../../../common-types/v1/common.json#/definitions/SubResource"
710711
}
711712
],
712-
"description": "Describes the parameter of customer managed disk encryption set resource id that can be specified for disk. <br><br> NOTE: The disk encryption set resource id can only be specified for managed disk. Please refer https://aka.ms/mdssewithcmkoverview for more details."
713+
"description": "Describes the parameter of customer managed disk encryption set resource id that can be specified for disk. <br><br> NOTE: The disk encryption set resource id can only be specified for managed disk. Please refer https://aka.ms/mdssewithcmkoverview for more details.",
714+
"x-ms-azure-resource": true
713715
},
714716
"KeyVaultKeyReference": {
715717
"properties": {
@@ -1454,7 +1456,8 @@
14541456
"$ref": "../../../common-types/v1/common.json#/definitions/SubResource"
14551457
}
14561458
],
1457-
"description": "Describes a network interface reference."
1459+
"description": "Describes a network interface reference.",
1460+
"x-ms-azure-resource": true
14581461
},
14591462
"PublicIPAddressSku": {
14601463
"properties": {

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/dedicatedHost.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@
153153
}
154154
},
155155
"x-ms-examples": {
156-
"DedicatedHostGroups_Update_MaximumSet_Gen": {
157-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_Update_MaximumSet_Gen.json"
156+
"DedicatedHostGroup_Update_MaximumSet_Gen": {
157+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Update_MaximumSet_Gen.json"
158158
},
159-
"DedicatedHostGroups_Update_MinimumSet_Gen": {
160-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_Update_MinimumSet_Gen.json"
159+
"DedicatedHostGroup_Update_MinimumSet_Gen": {
160+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Update_MinimumSet_Gen.json"
161161
}
162162
}
163163
},
@@ -204,11 +204,11 @@
204204
}
205205
},
206206
"x-ms-examples": {
207-
"DedicatedHostGroups_Delete_MaximumSet_Gen": {
208-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_Delete_MaximumSet_Gen.json"
207+
"DedicatedHostGroup_Delete_MaximumSet_Gen": {
208+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Delete_MaximumSet_Gen.json"
209209
},
210-
"DedicatedHostGroups_Delete_MinimumSet_Gen": {
211-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_Delete_MinimumSet_Gen.json"
210+
"DedicatedHostGroup_Delete_MinimumSet_Gen": {
211+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Delete_MinimumSet_Gen.json"
212212
}
213213
}
214214
},
@@ -319,11 +319,11 @@
319319
"nextLinkName": "nextLink"
320320
},
321321
"x-ms-examples": {
322-
"DedicatedHostGroups_ListByResourceGroup_MaximumSet_Gen": {
323-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_ListByResourceGroup_MaximumSet_Gen.json"
322+
"DedicatedHostGroup_ListByResourceGroup_MaximumSet_Gen": {
323+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_ListByResourceGroup_MaximumSet_Gen.json"
324324
},
325-
"DedicatedHostGroups_ListByResourceGroup_MinimumSet_Gen": {
326-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_ListByResourceGroup_MinimumSet_Gen.json"
325+
"DedicatedHostGroup_ListByResourceGroup_MinimumSet_Gen": {
326+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_ListByResourceGroup_MinimumSet_Gen.json"
327327
}
328328
}
329329
}
@@ -361,11 +361,11 @@
361361
"nextLinkName": "nextLink"
362362
},
363363
"x-ms-examples": {
364-
"DedicatedHostGroups_ListBySubscription_MaximumSet_Gen": {
365-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_ListBySubscription_MaximumSet_Gen.json"
364+
"DedicatedHostGroup_ListBySubscription_MaximumSet_Gen": {
365+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_ListBySubscription_MaximumSet_Gen.json"
366366
},
367-
"DedicatedHostGroups_ListBySubscription_MinimumSet_Gen": {
368-
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroups_ListBySubscription_MinimumSet_Gen.json"
367+
"DedicatedHostGroup_ListBySubscription_MinimumSet_Gen": {
368+
"$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_ListBySubscription_MinimumSet_Gen.json"
369369
}
370370
}
371371
}
@@ -502,11 +502,11 @@
502502
},
503503
"x-ms-long-running-operation": true,
504504
"x-ms-examples": {
505-
"DedicatedHosts_Update_MaximumSet_Gen": {
506-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_Update_MaximumSet_Gen.json"
505+
"DedicatedHost_Update_MaximumSet_Gen": {
506+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_Update_MaximumSet_Gen.json"
507507
},
508-
"DedicatedHosts_Update_MinimumSet_Gen": {
509-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_Update_MinimumSet_Gen.json"
508+
"DedicatedHost_Update_MinimumSet_Gen": {
509+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_Update_MinimumSet_Gen.json"
510510
}
511511
}
512512
},
@@ -564,11 +564,11 @@
564564
},
565565
"x-ms-long-running-operation": true,
566566
"x-ms-examples": {
567-
"DedicatedHosts_Delete_MaximumSet_Gen": {
568-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_Delete_MaximumSet_Gen.json"
567+
"DedicatedHost_Delete_MaximumSet_Gen": {
568+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_Delete_MaximumSet_Gen.json"
569569
},
570-
"DedicatedHosts_Delete_MinimumSet_Gen": {
571-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_Delete_MinimumSet_Gen.json"
570+
"DedicatedHost_Delete_MinimumSet_Gen": {
571+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_Delete_MinimumSet_Gen.json"
572572
}
573573
}
574574
},
@@ -690,11 +690,11 @@
690690
"nextLinkName": "nextLink"
691691
},
692692
"x-ms-examples": {
693-
"DedicatedHosts_ListByHostGroup_MaximumSet_Gen": {
694-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_ListByHostGroup_MaximumSet_Gen.json"
693+
"DedicatedHost_ListByHostGroup_MaximumSet_Gen": {
694+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_ListByHostGroup_MaximumSet_Gen.json"
695695
},
696-
"DedicatedHosts_ListByHostGroup_MinimumSet_Gen": {
697-
"$ref": "./examples/dedicatedHostExamples/DedicatedHosts_ListByHostGroup_MinimumSet_Gen.json"
696+
"DedicatedHost_ListByHostGroup_MinimumSet_Gen": {
697+
"$ref": "./examples/dedicatedHostExamples/DedicatedHost_ListByHostGroup_MinimumSet_Gen.json"
698698
}
699699
}
700700
}

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_Delete_MaximumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_Delete_MaximumSet_Gen.json

File renamed without changes.

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_Delete_MinimumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_Delete_MinimumSet_Gen.json

File renamed without changes.

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_Get_MaximumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_Get_MaximumSet_Gen.json

File renamed without changes.

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_Get_MinimumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_Get_MinimumSet_Gen.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"responses": {
99
"200": {
1010
"body": {
11-
"location": "westus"
11+
"location": "westus",
12+
"id": "/subscriptions/{subscription-id}/resourceGroups/rgcompute/providers/Microsoft.Compute/availabilitySets/myAvailabilitySet"
1213
}
1314
}
1415
}

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_ListAvailableSizes_MaximumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_ListAvailableSizes_MaximumSet_Gen.json

File renamed without changes.

‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySets_ListAvailableSizes_MinimumSet_Gen.json renamed to ‎specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2022-11-01/examples/availabilitySetExamples/AvailabilitySet_ListAvailableSizes_MinimumSet_Gen.json

File renamed without changes.

0 commit comments

Comments
 (0)