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 52d4ce3be960..595ff8bff4b5 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 @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-04-01", "reservationOrderId": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da", - "reservationId": "6ef59113-3482-40da-8d79-787f823e34bc" + "reservationId": "6ef59113-3482-40da-8d79-787f823e34bc", + "expand": "renewProperties" }, "responses": { "200": { @@ -19,6 +20,10 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "renewSource": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7", + "renewDestination": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7", + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 3, "provisioningState": "Succeeded", @@ -34,6 +39,26 @@ "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7", "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/e0e4b4f5-77ea-4984-9ee4-6bf9850ee6de" ] + }, + "renewProperties": { + "purchaseProperties": { + "sku": { + "name": "Standard_D1" + }, + "location": "westus", + "properties": { + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", + "term": "P1Y", + "quantity": 2, + "displayName": "Renew_Test_0618", + "appliedScopeType": "Shared", + "reservedResourceType": "VirtualMachines", + "reservedResourceProperties": { + "instanceFlexibility": "On" + }, + "renew": false + } + } } } } 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 5745858df555..7d4e8a335f80 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 @@ -20,6 +20,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 3, "provisioningState": "Cancelled", @@ -55,6 +57,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 1, "provisioningState": "Cancelled", @@ -90,6 +94,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 2, "provisioningState": "Cancelled", @@ -125,6 +131,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 3, "provisioningState": "Succeeded", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json index ea78ed11b968..80f863f7311b 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json @@ -27,6 +27,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 1, "provisioningState": "Cancelled", @@ -62,6 +64,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 2, "provisioningState": "Cancelled", @@ -97,6 +101,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 3, "provisioningState": "Succeeded", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json index c13d39b127c2..7ca424b72af8 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json @@ -17,7 +17,8 @@ "appliedScopeType": "Shared", "reservedResourceProperties": { "instanceFlexibility": "On" - } + }, + "renew": false } } }, diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json index 281a964f20fe..84d3c0db51ae 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json @@ -28,6 +28,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 1, "provisioningState": "Succeeded", @@ -56,6 +58,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 2, "provisioningState": "Succeeded", @@ -84,6 +88,8 @@ "appliedScopes": [ "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "appliedScopeType": "Single", "quantity": 3, "provisioningState": "Cancelled", 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 5e6625876ed0..4a9084369241 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 @@ -23,6 +23,8 @@ "location": "eastus", "properties": { "appliedScopeType": "Shared", + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "quantity": 3, "provisioningState": "Succeeded", "expiryDate": "2018-09-22", 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 e4e14bdfd8c3..29e1fe8faed0 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 @@ -421,10 +421,13 @@ }, { "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ExpandRenewPropertiesParameter" } ], "tags": [ - "Reservation" + "Reservation" ], "responses": { "200": { @@ -853,6 +856,26 @@ } } }, + "RenewPropertiesResponse": { + "type": "object", + "properties": { + "purchaseProperties": { + "$ref": "#/definitions/PurchaseRequest" + }, + "lockedPriceTotal": { + "type": "object", + "description": "Locked currency & amount for new reservation purchase at the time of renewal. Price is locked 30 days before expiry date time if renew is true.", + "properties": { + "currencyCode": { + "type": "string" + }, + "amount": { + "type": "string" + } + } + } + } + }, "CalculatePriceResponse": { "type": "object", "properties": { @@ -960,6 +983,23 @@ }, "mergeProperties": { "$ref": "#/definitions/ReservationMergeProperties" + }, + "billingScopeId": { + "$ref": "#/definitions/BillingScopeId" + }, + "renew": { + "$ref": "#/definitions/Renew" + }, + "renewSource": { + "type": "string", + "description": "Reservation Id of the reservation from which this reservation is renewed. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}." + }, + "renewDestination": { + "type": "string", + "description": "Reservation Id of the reservation which is purchased because of renew. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}." + }, + "renewProperties": { + "$ref": "#/definitions/RenewPropertiesResponse" } } }, @@ -1020,6 +1060,9 @@ "appliedScopes": { "$ref": "#/definitions/AppliedScopes" }, + "renew": { + "$ref": "#/definitions/Renew" + }, "reservedResourceProperties": { "type": "object", "description": "Properties specific to each reserved resource type. Not required if not applicable.", @@ -1046,6 +1089,17 @@ "name": { "type": "string", "description": "Name of the Reservation" + }, + "renew": { + "$ref": "#/definitions/Renew" + }, + "renewProperties": { + "type": "object", + "properties": { + "purchaseProperties": { + "$ref": "#/definitions/PurchaseRequest" + } + } } } }, @@ -1314,6 +1368,11 @@ "type": "string", "description": "Subscription that will be charged for purchasing Reservation" }, + "Renew": { + "type": "boolean", + "default": false, + "description": "Setting this to true will automatically purchase a new reservation on the expiration date time." + }, "ReservationQuantity": { "type": "integer", "format": "int32", @@ -1390,6 +1449,14 @@ "required": true, "type": "string" }, + "ExpandRenewPropertiesParameter": { + "name": "expand", + "x-ms-parameter-location": "method", + "in": "query", + "description": "Supported value of this query is renewProperties", + "required": false, + "type": "string" + }, "SubscriptionIdParameter": { "name": "subscriptionId", "x-ms-parameter-location": "method",