Skip to content

[Hub Generated] Review request for Microsoft.Capacity to add version preview/2018-06-01 #6368

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

Merged
michaeljqzq merged 9 commits into from
Jun 21, 2019
Merged

[Hub Generated] Review request for Microsoft.Capacity to add version preview/2018-06-01 #6368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
63109f0
Task 4669505: RI renewal: ARM swagger update.
Jun 17, 2019
08d2cda
FW: Fixed unnecessary required field on renew property
Jun 17, 2019
d3babcc
FW: Fixes based on comments
Jun 19, 2019
bb1faa1
FW: Fixes based on comments
Jun 19, 2019
8049b0c
FW: Fix for the validator
Jun 19, 2019
77765b7
FW: Fixed validator issue
Jun 19, 2019
e80890e
FW: Update on RI-auto renewal
Jun 20, 2019
f3fae7a
Fixed for 2 space indentation
Jun 20, 2019
c299bd0
FW: Merge from remote master to local fork and resolved conflicts
Jun 20, 2019
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
27 changes: 26 additions & 1 deletion ...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 @@ -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": {
Expand All @@ -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",
Expand All @@ -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
}
}
}
}
}
Expand Down
8 changes: 8 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 @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions ...ns/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"appliedScopeType": "Shared",
"reservedResourceProperties": {
"instanceFlexibility": "On"
}
},
"renew": false
}
}
},
Expand Down
6 changes: 6 additions & 0 deletions ...ons/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 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 @@ -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",
Expand Down
69 changes: 68 additions & 1 deletion ...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 @@ -421,10 +421,13 @@
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/ExpandRenewPropertiesParameter"
}
],
"tags": [
"Reservation"
"Reservation"
],
"responses": {
"200": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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.",
Expand All @@ -1046,6 +1089,17 @@
"name": {
"type": "string",
"description": "Name of the Reservation"
},
"renew": {
"$ref": "#/definitions/Renew"
},
"renewProperties": {
"type": "object",
"properties": {
"purchaseProperties": {
"$ref": "#/definitions/PurchaseRequest"
}
}
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down