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

Patch reservations microsoft.capacity 2022 11 01 #22622

Merged
merged 7 commits into from
Mar 2, 2023
Merged

Patch reservations microsoft.capacity 2022 11 01 #22622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce77098
Add 200 responses for Return to fix SDK
chchen3 Feb 14, 2023
16a5753
Add additional non required property and extra info in description
chchen3 Feb 15, 2023
83f306d
Add p3Y, p5Y for msrp response. Fix typo
chchen3 Feb 15, 2023
308df1d
update example to use reservationOrder call
chchen3 Feb 17, 2023
ec68e17
remove instanceFlexibility which will be deprecated in the near future
chchen3 Feb 27, 2023
d88c5ba
add final state schema in long running operations field instead of in…
chchen3 Feb 27, 2023
ffdb0a2
add 200 back since azure cli and powershell currently still doesn't s…
chchen3 Mar 1, 2023
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
26 changes: 25 additions & 1 deletion ...n/reservations/resource-manager/Microsoft.Capacity/stable/2022-11-01/examples/Return.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,33 @@
}
},
"responses": {
"200": {
"body": {
"id": "/providers/microsoft.capacity/reservationOrders/50000000-aaaa-bbbb-cccc-100000000004",
"type": "Microsoft.Capacity/reservationOrders",
"name": "50000000-aaaa-bbbb-cccc-100000000004",
"etag": 7,
"properties": {
"displayName": "cabri",
"requestDateTime": "2017-08-30T03:49:19.0252126Z",
"createdDateTime": "2017-08-30T03:51:49.8083758Z",
"expiryDate": "2018-08-30",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not returning expiryDate in getOrder api I believe, can you remove this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are now adding in the response

"expiryDateTime": "2018-08-30T03:51:49.8083758Z",
"term": "P1Y",
"billingPlan": "Monthly",
"provisioningState": "Succeeded",
"reservations": [
{
"id": "/providers/microsoft.capacity/reservationOrders/50000000-aaaa-bbbb-cccc-100000000004/reservations/40000000-aaaa-bbbb-cccc-100000000000"
}
],
"originalQuantity": 7
}
}
},
"202": {
"headers": {
"Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/50000000-aaaa-bbbb-cccc-100000000004/reservations/40000000-aaaa-bbbb-cccc-100000000000?api-version=2022-11-01"
"Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/50000000-aaaa-bbbb-cccc-100000000004?api-version=2022-11-01"
},
"body": {
"id": "/providers/Microsoft.Capacity/reservationOrders/50000000-aaaa-bbbb-cccc-100000000004/reservations/40000000-aaaa-bbbb-cccc-100000000000",
Expand Down
18 changes: 17 additions & 1 deletion ...tion/reservations/resource-manager/Microsoft.Capacity/stable/2022-11-01/reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,12 @@
"Return"
],
"responses": {
"200": {
"description": "The resource has been returned",
"schema": {
"$ref": "#/definitions/ReservationOrderResponse"
}
},
"202": {
"description": "Detailed refund info of a reservation",
"headers": {
Expand Down Expand Up @@ -1586,6 +1592,16 @@
"type": "object",
"$ref": "#/definitions/Price",
"description": "Amount in pricing currency. Tax not included."
},
"p3Y": {
"type": "object",
"$ref": "#/definitions/Price",
"description": "Amount in pricing currency. Tax not included."
},
"p5Y": {
"type": "object",
"$ref": "#/definitions/Price",
"description": "Amount in pricing currency. Tax not included."
}
}
},
Expand Down Expand Up @@ -3258,7 +3274,7 @@
},
"AppliedScopes": {
"type": "array",
"description": "List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared.",
"description": "List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared. This property will be deprecated and replaced by appliedScopeProperties instead for Single AppliedScopeType.",
"items": {
"type": "string",
"minItems": 1,
Expand Down