Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing S360 #19554

Merged
merged 2 commits into from
Jun 30, 2022
Merged

Fixing S360 #19554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cbc4ee
Fixing S360
gaoyp830 Jun 21, 2022
f1bbd20
Adding x-ms-enum
gaoyp830 Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...esource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"displayName": "cabri_test",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:46:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "Off",
"skuDescription": "D1 v2",
Expand Down
1 change: 1 addition & 0 deletions ...ce-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"etag": 7,
"properties": {
"displayName": "cabri",
"benefitStartTime": "2017-08-30T03:49:19.0252126Z",
"requestDateTime": "2017-08-30T03:49:19.0252126Z",
"createdDateTime": "2017-08-30T03:51:49.8083758Z",
"expiryDate": "2018-08-30",
Expand Down
1 change: 1 addition & 0 deletions ...city/preview/2019-04-01/examples/GetReservationOrderDetailsWithExpandPlanInformation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"displayName": "cabri",
"requestDateTime": "2019-08-30T03:49:19Z",
"createdDateTime": "2019-08-30T03:51:49Z",
"benefitStartTime": "2019-08-30T03:51:49Z",
"expiryDate": "2018-08-30",
"term": "P1Y",
"billingPlan": "Monthly",
Expand Down
3 changes: 3 additions & 0 deletions ...resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"displayName": "cabri",
"requestDateTime": "2017-08-29T21:20:23.8134834Z",
"createdDateTime": "2017-08-29T21:22:56.8541664Z",
"benefitStartTime": "2017-08-29T21:20:23.8134834Z",
"expiryDate": "2018-08-29",
"term": "P1Y",
"billingPlan": "Monthly",
Expand All @@ -36,6 +37,7 @@
"displayName": "cabri",
"requestDateTime": "2017-08-30T12:55:40.2799114Z",
"createdDateTime": "2017-08-30T12:58:20.526Z",
"benefitStartTime": "2017-08-30T12:58:30.526Z",
"expiryDate": "2018-08-30",
"term": "P1Y",
"billingPlan": "Monthly",
Expand All @@ -57,6 +59,7 @@
"displayName": "cabri",
"requestDateTime": "2017-08-30T03:49:19.0252126Z",
"createdDateTime": "2017-08-30T03:51:49.8083758Z",
"benefitStartTime": "2017-08-30T03:51:50.8083758Z",
"expiryDate": "2018-08-30",
"term": "P1Y",
"billingPlan": "Monthly",
Expand Down
4 changes: 4 additions & 0 deletions ...ource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T23:57:48.1891638Z",
"lastUpdatedDateTime": "2017-09-22T23:57:54.3768768Z",
"benefitStartTime": "2017-09-22T23:50:54.3768768Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -62,6 +63,7 @@
"message": "An operation is in progress on your reservation. Please wait for operation to complete before taking further action"
},
"lastUpdatedDateTime": "2017-09-22T23:57:47.488284Z",
"benefitStartTime": "2017-09-22T23:50:54.3768768Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -94,6 +96,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:00:54.3768768Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -128,6 +131,7 @@
"displayName": "cabri_test",
"effectiveDateTime": "2017-09-22T22:46:27.3313607Z",
"lastUpdatedDateTime": "2017-09-22T22:46:27.3313607Z",
"benefitStartTime": "2017-09-22T23:40:54.3768768Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down
6 changes: 6 additions & 0 deletions ...ions/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"message": "This reservation was split and is no longer active."
},
"lastUpdatedDateTime": "2017-09-22T01:00:36.3191627Z",
"benefitStartTime": "2017-09-22T00:00:36.3191627Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -72,6 +73,7 @@
"message": "This reservation was merged and is no longer active."
},
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -110,6 +112,7 @@
"message": "This reservation was merged and is no longer active."
},
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -144,6 +147,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -178,6 +182,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down Expand Up @@ -209,6 +214,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
Expand Down
1 change: 1 addition & 0 deletions ...ns/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T23:57:48.1891638Z",
"lastUpdatedDateTime": "2017-09-22T23:57:54.3768768Z",
"benefitStartTime": "2017-09-22T23:55:54.3768768Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "Off",
"skuDescription": "D1 v2",
Expand Down
10 changes: 10 additions & 0 deletions ...ion/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,11 @@
"format": "date",
"description": "This is the date when the Reservation will expire."
},
"benefitStartTime": {
"type": "string",
"format": "date-time",
"description": "This is the DateTime when the reservation benefit started."
},
"originalQuantity": {
"$ref": "#/definitions/ReservationQuantity"
},
Expand Down Expand Up @@ -1249,6 +1254,11 @@
"format": "date-time",
"description": "DateTime of the Reservation starting when this version is effective from."
},
"benefitStartTime": {
"type": "string",
"format": "date-time",
"description": "This is the DateTime when the reservation benefit started."
},
"lastUpdatedDateTime": {
"type": "string",
"format": "date-time",
Expand Down
30 changes: 25 additions & 5 deletions ...tion/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,11 @@
"Failed",
"Split",
"Merged"
]
],
"x-ms-enum": {
"name": "ProvisioningState",
"modelAsString": true
}
},
"ReservedResourceType": {
"type": "string",
Expand Down Expand Up @@ -1035,7 +1039,11 @@
"uksouth",
"westcentralus",
"ukwest"
]
],
"x-ms-enum": {
"name": "Location",
"modelAsString": true
}
},
"AvailableScopeRequest": {
"type": "object",
Expand Down Expand Up @@ -1461,7 +1469,11 @@
"Processing",
"Cancelled",
"Failed"
]
],
"x-ms-enum": {
"name": "DisplayProvisioningState",
"modelAsString": true
}
},
"UserFriendlyAppliedScopeType": {
"type": "string",
Expand All @@ -1472,7 +1484,11 @@
"Single",
"ResourceGroup",
"ManagementGroup"
]
],
"x-ms-enum": {
"name": "UserFriendlyAppliedScopeType",
"modelAsString": true
}
},
"UserFriendlyRenewState": {
"type": "string",
Expand All @@ -1483,7 +1499,11 @@
"Renewed",
"NotRenewed",
"NotApplicable"
]
],
"x-ms-enum": {
"name": "UserFriendlyRenewState",
"modelAsString": true
}
},
"ReservationTerm": {
"type": "string",
Expand Down