diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json index d0df20b1593d..5f695eece262 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json @@ -15,6 +15,16 @@ "P1Y", "P3Y" ], + "msrp": { + "p1Y": { + "currencyCode": "USD", + "amount": 1907 + }, + "p3Y": { + "currencyCode": "USD", + "amount": 3960 + } + }, "billingPlans": { "P1Y": [ "Upfront", 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 e36a1cd2b6bc..2acd7899023e 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 @@ -70,6 +70,9 @@ "currencyCode": "USD", "amount": 466.0 } + }, + "swapProperties": { + "swapSource": "/providers/microsoft.capacity/reservationOrders/63037ae3-385a-4716-ad77-02f42ce93c06/reservations/5c6383f5-3f2c-4159-ae74-j72i1c1a49bc" } } } 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 645065f95057..db363a24e6f7 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 @@ -102,6 +102,9 @@ "/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" ] + }, + "swapProperties": { + "swapDestination": "/providers/microsoft.capacity/reservationOrders/afadf486-3432-4254-b297-4db8ef055f38/reservations/317efb41-b3ef-3706-8447-c2c045ab3ef5" } } }, 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 ee1a0d7acadc..4d72dffd5207 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 @@ -154,6 +154,68 @@ ] } } + }, + { + "sku": { + "name": "Standard_DS1_v2" + }, + "id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/4jf50113-3382-40da-ed79-787f823e34bc", + "type": "Microsoft.Capacity/reservationOrders/reservations", + "name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/4jf50113-3382-40da-ed79-787f823e34bc", + "etag": 2, + "location": "eastus", + "properties": { + "appliedScopes": [ + "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" + ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", + "appliedScopeType": "Single", + "quantity": 3, + "provisioningState": "Succeeded", + "expiryDate": "2018-09-22", + "displayName": "cabri_test", + "billingPlan": "Monthly", + "effectiveDateTime": "2017-09-22T22:46:32.7632798Z", + "lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z", + "reservedResourceType": "VirtualMachines", + "instanceFlexibility": "On", + "skuDescription": "D1 v2", + "swapProperties": { + "swapSource": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc" + } + } + }, + { + "sku": { + "name": "Standard_D1_v2" + }, + "id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc", + "type": "Microsoft.Capacity/reservationOrders/reservations", + "name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/5se63214-3382-40da-ed79-787f823e34bc", + "etag": 2, + "location": "eastus", + "properties": { + "appliedScopes": [ + "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3" + ], + "renew": false, + "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", + "appliedScopeType": "Single", + "quantity": 3, + "provisioningState": "Succeeded", + "expiryDate": "2018-09-22", + "displayName": "cabri_test", + "billingPlan": "Monthly", + "effectiveDateTime": "2017-09-22T22:46:32.7632798Z", + "lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z", + "reservedResourceType": "VirtualMachines", + "instanceFlexibility": "On", + "skuDescription": "D1 v2", + "swapProperties": { + "swapDestination": "/providers/microsoft.capacity/reservationOrders/63027ae3-389a-4716-ad77-04f42ce93c06/reservations/4jf50113-3382-40da-ed79-787f823e34bc" + } + } } ] } 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 c54e744d1ebe..efc429d2fb60 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 @@ -22,7 +22,7 @@ "etag": 4, "location": "eastus", "properties": { - "appliedScopeType": "Shared", + "appliedScopeType": "ManagementGroup", "renew": false, "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a", "quantity": 3, @@ -40,6 +40,11 @@ "/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" ] + }, + "appliedScopeProperties": { + "tenantId": "d432d7b4-3bc4-4hef-97f1-a6e34f37c9d3", + "managementGroupId": "/providers/Microsoft.Management/managementGroups/TestMG1", + "displayName": "TestMG1" } } } 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 05a9f02732ad..27ccc58a9bd8 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 @@ -820,6 +820,16 @@ } } }, + "msrp": { + "type": "object", + "description": "The sku's MSRP values for each term", + "additionalProperties": { + "type": "object", + "items": { + "$ref": "#/definitions/MsrpProperty" + } + } + }, "terms": { "type": "array", "readOnly": true, @@ -852,6 +862,19 @@ } } }, + "MsrpProperty": { + "type": "object", + "properties": { + "currencyCode": { + "type": "string", + "description": "Represents the currency code - 3 character ISO." + }, + "amount": { + "type": "number", + "description": "Represents the amount of money in the currency." + } + } + }, "SkuProperty": { "type": "object", "properties": { @@ -1253,6 +1276,12 @@ "mergeProperties": { "$ref": "#/definitions/ReservationMergeProperties" }, + "swapProperties": { + "$ref": "#/definitions/ReservationSwapProperties" + }, + "appliedScopeProperties": { + "$ref": "#/definitions/AppliedScopeProperties" + }, "billingScopeId": { "$ref": "#/definitions/BillingScopeId" }, @@ -1283,6 +1312,23 @@ } } }, + "AppliedScopeProperties": { + "type": "object", + "properties": { + "tenantId": { + "type": "string", + "description": "Tenant ID of the applied scope type" + }, + "managementGroupId": { + "type": "string", + "description": "Management group ID of the format /providers/Microsoft.Management/managementGroups/{managementGroupId}" + }, + "displayName": { + "type": "string", + "description": "Management group display name" + } + } + }, "ReservationSplitProperties": { "type": "object", "properties": { @@ -1315,6 +1361,19 @@ } } }, + "ReservationSwapProperties": { + "type": "object", + "properties": { + "swapSource": { + "type": "string", + "description": "Resource Id of the Source Reservation that gets swapped. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}" + }, + "swapDestination": { + "type": "string", + "description": "Reservation Resource Id that the original resource gets swapped to. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}" + } + } + }, "PurchaseRequestProperties": { "type": "object", "properties": {