-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Add GetReservationOrder and GetReservation in new 2020-11-01-preview [DO NOT MERGE] #11450
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fd11cc9
GetReservation and GetReservationOrder by BillingAdmin or BillingProf…
toddm 361b37e
Merge branch 'master' into 2020preview
toddm 16bfd25
Changing to 2020-11-01-preview
toddm 7d74340
Removing other APIs so that the preview version is just the new routes
toddm f686d40
Adding operations path
toddm e384c96
Fixing an enum
toddm 46b3bd3
Updating json file name
toddm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
...er/Microsoft.Billing/preview/2020-11-01-preview/examples/ReservationByBillingAccount.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2020-11-01-preview", | ||
| "billingAccountName": "{billingAccountName}", | ||
| "reservationOrderId": "{reservationOrderId}", | ||
| "reservationId": "{reservationId}" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/reservationOrders/{reservationOrderId}/reservations/{reservationId}", | ||
| "type": "microsoft.billing/reservationOrders", | ||
| "name": "Reservation Name", | ||
| "location": "global", | ||
| "sku": { | ||
| "name": "sql_enterprise_licenses" | ||
| }, | ||
| "properties": { | ||
| "appliedScopes": null, | ||
| "appliedScopeType": "Shared", | ||
| "reservedResourceType": "SqlAzureHybridBenefit", | ||
| "quantity": 1, | ||
| "provisioningState": "Succeeded", | ||
| "expiryDate": null, | ||
| "reviewDate": null, | ||
| "provisioningSubState": null, | ||
| "displayName": "SQL_Server_Enterprise_Edition", | ||
| "userFriendlyRenewState": "NotApplicable", | ||
| "userFriendlyAppliedScopeType": "Shared", | ||
| "effectiveDateTime": "2020-07-30T18:36:50.7939106Z", | ||
| "skuDescription": null, | ||
| "term": null, | ||
| "renew": false, | ||
| "renewSource": null, | ||
| "utilization": { | ||
| "trend": null, | ||
| "aggregates": [ | ||
| { | ||
| "grain": 1.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| }, | ||
| { | ||
| "grain": 7.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| }, | ||
| { | ||
| "grain": 30.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
...er/Microsoft.Billing/preview/2020-11-01-preview/examples/ReservationByBillingProfile.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2020-11-01-preview", | ||
| "billingAccountName": "{billingAccountName}", | ||
| "billingProfileName": "{billingProfileName}", | ||
| "reservationOrderId": "{reservationOrderId}", | ||
| "reservationId": "{reservationId}" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/reservationOrders/{reservationOrderId}/reservations/{reservationId}", | ||
| "type": "microsoft.billing/reservationOrders", | ||
| "name": "Reservation Name", | ||
| "location": "global", | ||
| "sku": { | ||
| "name": "sql_enterprise_licenses" | ||
| }, | ||
| "properties": { | ||
| "appliedScopes": null, | ||
| "appliedScopeType": "Shared", | ||
| "reservedResourceType": "SqlAzureHybridBenefit", | ||
| "quantity": 1, | ||
| "provisioningState": "Succeeded", | ||
| "expiryDate": null, | ||
| "reviewDate": null, | ||
| "provisioningSubState": null, | ||
| "displayName": "SQL_Server_Enterprise_Edition", | ||
| "userFriendlyRenewState": "NotApplicable", | ||
| "userFriendlyAppliedScopeType": "Shared", | ||
| "effectiveDateTime": "2020-07-30T18:36:50.7939106Z", | ||
| "skuDescription": null, | ||
| "term": null, | ||
| "renew": false, | ||
| "renewSource": null, | ||
| "utilization": { | ||
| "trend": null, | ||
| "aggregates": [ | ||
| { | ||
| "grain": 1.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| }, | ||
| { | ||
| "grain": 7.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| }, | ||
| { | ||
| "grain": 30.0, | ||
| "grainUnit": "days", | ||
| "value": null, | ||
| "valueUnit": "percentage" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...crosoft.Billing/preview/2020-11-01-preview/examples/ReservationOrderByBillingAccount.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2020-11-01-preview", | ||
| "billingAccountName": "{billingAccountName}", | ||
| "reservationOrderId": "{reservationOrderId}" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/reservationOrders/{reservationOrderId}", | ||
| "type": "microsoft.billing/reservationOrders", | ||
| "name": "Reservation Name", | ||
| "properties": { | ||
| "productType": "AzureHybridBenefit", | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "effectiveDate": "2020-07-30T18:36:50.7939106Z", | ||
| "requestPurchaseTime": "0001-01-01T00:00:00", | ||
| "expiryDate": null, | ||
| "reviewDate": null, | ||
| "endDate": null, | ||
| "term": "None", | ||
| "reservationName": "SQL_Server_Enterprise_Edition", | ||
| "billingScope": "", | ||
| "billingPlanDetails": null, | ||
| "state": "Created", | ||
| "subState": "Active", | ||
| "reservations": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "enrollmentId": null, | ||
| "originalQuantity": 1, | ||
| "extendedErrorInformation": null, | ||
| "benefitScopeBillingAliasId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31/billingProfiles/AB12-AB12-123-ABC" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
39 changes: 39 additions & 0 deletions
39
...crosoft.Billing/preview/2020-11-01-preview/examples/ReservationOrderByBillingProfile.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2020-11-01-preview", | ||
| "billingAccountName": "{billingAccountName}", | ||
| "billingProfileName": "{billingProfileName}", | ||
| "reservationOrderId": "{reservationOrderId}" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/reservationOrders/{reservationOrderId}", | ||
| "type": "microsoft.billing/reservationOrders", | ||
| "name": "Reservation Name", | ||
| "properties": { | ||
| "productType": "AzureHybridBenefit", | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "effectiveDate": "2020-07-30T18:36:50.7939106Z", | ||
| "requestPurchaseTime": "0001-01-01T00:00:00", | ||
| "expiryDate": null, | ||
| "reviewDate": null, | ||
| "endDate": null, | ||
| "term": "None", | ||
| "reservationName": "SQL_Server_Enterprise_Edition", | ||
| "billingScope": "", | ||
| "billingPlanDetails": null, | ||
| "state": "Created", | ||
| "subState": "Active", | ||
| "reservations": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "enrollmentId": null, | ||
| "originalQuantity": 1, | ||
| "extendedErrorInformation": null, | ||
| "benefitScopeBillingAliasId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31/billingProfiles/AB12-AB12-123-ABC" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you really need to surface reservations in the response of reservationOrders? The customer can do an explicit GET to get all reservations under a reservationOrder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We did the same thing in Microsoft.Capacity for the reservationOrder.
azure-rest-api-specs/specification/reservations/resource-manager/Microsoft.Capacity/stable/2017-11-01/reservations.json
Line 737 in e0b7889