From 8cbc4eeebce2453c15160c7e4a1b143edd7c3ffa Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Tue, 21 Jun 2022 16:57:03 -0700 Subject: [PATCH 1/2] Fixing S360 --- .../2019-04-01/examples/GetReservationDetails.json | 1 + .../examples/GetReservationOrderDetails.json | 1 + ...servationOrderDetailsWithExpandPlanInformation.json | 1 + .../2019-04-01/examples/GetReservationOrders.json | 3 +++ .../2019-04-01/examples/GetReservationRevisions.json | 4 ++++ .../preview/2019-04-01/examples/GetReservations.json | 6 ++++++ .../preview/2019-04-01/examples/UpdateReservation.json | 1 + .../preview/2019-04-01/reservations.json | 10 ++++++++++ 8 files changed, 27 insertions(+) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json index 2acd7899023e..8b55fa65365d 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetails.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetails.json index 7c6fe5fd45bf..6bbdd32dc573 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetails.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetails.json @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetailsWithExpandPlanInformation.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetailsWithExpandPlanInformation.json index b8c8fba5e972..bc0952382b1a 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetailsWithExpandPlanInformation.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrderDetailsWithExpandPlanInformation.json @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrders.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrders.json index 63729d2c7691..aef50d897785 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrders.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationOrders.json @@ -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", @@ -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", @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json index db363a24e6f7..65500f1e4476 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json index 4d72dffd5207..b92bd8d8f045 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json index efc429d2fb60..2c75f30b2c63 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json @@ -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", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json index 27ccc58a9bd8..a2429496a90e 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json @@ -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" }, @@ -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", From f1bbd2059fa3b0247ab822079173327bd92b66d1 Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Tue, 21 Jun 2022 17:55:27 -0700 Subject: [PATCH 2/2] Adding x-ms-enum --- .../stable/2022-03-01/reservations.json | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json index b74df9bdef0f..4016ca4df335 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json @@ -969,7 +969,11 @@ "Failed", "Split", "Merged" - ] + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } }, "ReservedResourceType": { "type": "string", @@ -1035,7 +1039,11 @@ "uksouth", "westcentralus", "ukwest" - ] + ], + "x-ms-enum": { + "name": "Location", + "modelAsString": true + } }, "AvailableScopeRequest": { "type": "object", @@ -1461,7 +1469,11 @@ "Processing", "Cancelled", "Failed" - ] + ], + "x-ms-enum": { + "name": "DisplayProvisioningState", + "modelAsString": true + } }, "UserFriendlyAppliedScopeType": { "type": "string", @@ -1472,7 +1484,11 @@ "Single", "ResourceGroup", "ManagementGroup" - ] + ], + "x-ms-enum": { + "name": "UserFriendlyAppliedScopeType", + "modelAsString": true + } }, "UserFriendlyRenewState": { "type": "string", @@ -1483,7 +1499,11 @@ "Renewed", "NotRenewed", "NotApplicable" - ] + ], + "x-ms-enum": { + "name": "UserFriendlyRenewState", + "modelAsString": true + } }, "ReservationTerm": { "type": "string",