Skip to content

[Hub Generated] Review request for Microsoft.Consumption to add version stable/2023-11-01 #25751

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
ms-zhenhua merged 6 commits into from
Oct 10, 2023
Merged

[Hub Generated] Review request for Microsoft.Consumption to add version stable/2023-11-01 #25751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2111646
updated documents to update api contract
sumitparwal Sep 11, 2023
80e3bea
updated billingaccountname
sumitparwal Sep 12, 2023
f2941e2
updated billingAccountName to billingAccountDisplayName based on code pr
sumitparwal Sep 18, 2023
8ce6325
Update EventsGetByBillingAccount.json
sumitparwal Sep 25, 2023
034151a
Update EventsGetByBillingAccountWithFilters.json
sumitparwal Sep 25, 2023
a2a20cf
updated based on request from PM Team
sumitparwal Sep 27, 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
30 changes: 23 additions & 7 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,12 +1622,18 @@
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
},
"x-ms-examples": {
"EventsGetByBillingAccount-Primary": {
"$ref": "./examples/EventsGetByBillingAccount-Primary.json"
},
"EventsGetByBillingAccount-Contributor": {
"$ref": "./examples/EventsGetByBillingAccount-Contributor.json"
},
"EventsGetByBillingAccount": {
"$ref": "./examples/EventsGetByBillingAccount.json"
},
"EventsGetByBillingAccountWithFilters-Primary": {
"$ref": "./examples/EventsGetByBillingAccountWithFilters-Primary.json"
},
"EventsGetByBillingAccountWithFilters-Contributor.json": {
"$ref": "./examples/EventsGetByBillingAccountWithFilters-Contributor.json"
},
Expand Down Expand Up @@ -5155,6 +5161,16 @@
"readOnly": true,
"$ref": "#/definitions/amount"
},
"billingAccountId": {
"description": "Identifier of the billing account.",
"type": "string",
"readOnly": true
},
"billingAccountDisplayName": {
"description": "Name of the billing account.",
"type": "string",
"readOnly": true
},
"eventType": {
"description": "Identifies the type of the event.",
"type": "string",
Expand Down Expand Up @@ -5239,7 +5255,7 @@
"$ref": "#/definitions/AmountWithExchangeRate"
},
"closedBalanceInBillingCurrency": {
"description": "The balance in billing currency after the event.",
"description": "The balance in billing currency after the event, Note: This will not be returned for Contributor Organization Type in Multi-Entity consumption commitment",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
Expand Down Expand Up @@ -5293,7 +5309,7 @@
"description": "The lot properties.",
"properties": {
"originalAmount": {
"description": "The original amount of a lot.",
"description": "The original amount of a lot, Note: This will not be returned for Contributor Organization Type in Multi-Entity consumption commitment",
"readOnly": true,
"$ref": "#/definitions/amount"
},
Expand Down Expand Up @@ -5367,7 +5383,7 @@
"readOnly": true
},
"originalAmountInBillingCurrency": {
"description": "The original amount of a lot in billing currency.",
"description": "The original amount of a lot in billing currency, Note: This will not be returned for Contributor Organization Type in Multi-Entity consumption commitment",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
Expand All @@ -5391,7 +5407,7 @@
"type": "string",
"description": "The eTag for the resource."
},
"orgType": {
"OrganizationType": {
"description": "The organization type of the lot.",
"type": "string",
"enum": [
Expand All @@ -5400,18 +5416,18 @@
],
"readOnly": true,
"x-ms-enum": {
"name": "OrgType",
"name": "OrganizationType",
"modelAsString": true,
"values": [
{
"value": "Primary",
"description": "Primary organization type for Multi-Entity consumption commitment.",
"name": "PrimaryOrgType"
"name": "PrimaryOrganizationType"
},
{
"value": "Contributor",
"description": "Contributor organization type for Multi-Entity consumption commitment.",
"name": "ContributorOrgType"
"name": "ContributorOrganizationType"
}
]
}
Expand Down
68 changes: 68 additions & 0 deletions ...r/Microsoft.Consumption/stable/2023-11-01/examples/EventsGetByBillingAccount-Primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"parameters": {
"api-version": "2023-11-01",
"billingAccountId": "1234:5678"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1",
"name": "eventId1",
"type": "Microsoft.Consumption/events",
"properties": {
"lotSource": "ConsumptionCommitment",
"lotId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/Microsoft.Consumption/lots/G202001083926600XXXXX",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
"billingProfileDisplayName": "Contoso Operations Billing",
"transactionDate": "2019-07-01T00:00:00Z",
"description": "New MACC Added",
"billingAccountId": "1234:5678",
"billingAccountDisplayName": "TestBillingAccount",
"charges": {
"currency": "USD",
"value": 500
},
"newCredit": {
"currency": "USD",
"value": 500
},
"closedBalance": {
"currency": "USD",
"value": 500
},
"invoiceNumber": "3304",
"eventType": "NewCredit"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId2",
"name": "eventId2",
"type": "Microsoft.Consumption/events",
"properties": {
"lotSource": "AzurePrepayment",
"lotId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/Microsoft.Consumption/lots/7004bc39-974d-482e-8e45-caf91dba0870",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
"billingProfileDisplayName": "Contoso Operations Billing",
"transactionDate": "2019-07-01T00:00:00Z",
"description": "Balance after invoice 3304",
"billingAccountId": "1234:5678",
"billingAccountDisplayName": "TestBillingAccount",
"charges": {
"currency": "USD",
"value": 500
},
"closedBalance": {
"currency": "USD",
"value": 500
},
"invoiceNumber": "3304",
"eventType": "SettledCharges"
}
}
]
}
}
}
}
2 changes: 2 additions & 0 deletions ...e-manager/Microsoft.Consumption/stable/2023-11-01/examples/EventsGetByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"billingProfileDisplayName": "Contoso Operations Billing",
"transactionDate": "2019-07-01T00:00:00Z",
"description": "New MACC Added",
"billingAccountId": "1234:5678",
"billingAccountDisplayName": "TestBillingAccount",
"charges": {
"currency": "USD",
"value": 500
Expand Down
40 changes: 40 additions & 0 deletions ....Consumption/stable/2023-11-01/examples/EventsGetByBillingAccountWithFilters-Primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parameters": {
"api-version": "2023-11-01",
"billingAccountId": "1234:5678",
"$filter": "lotid eq 'G202001083926600XXXXX' AND lotsource eq 'consumptioncommitment'"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1",
"name": "eventId1",
"type": "Microsoft.Consumption/events",
"properties": {
"lotSource": "ConsumptionCommitment",
"lotId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/Microsoft.Consumption/lots/G202001083926600XXXXX",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
"billingProfileDisplayName": "Contoso Operations Billing",
"transactionDate": "2019-07-01T00:00:00Z",
"description": "MACC Canceled",
"billingAccountId": "1234:5678",
"billingAccountDisplayName": "TestBillingAccount",
"canceledCredit": {
"currency": "USD",
"value": 200
},
"closedBalance": {
"currency": "USD",
"value": 500
},
"invoiceNumber": "3304",
"eventType": "CanceledCredit"
}
}
]
}
}
}
}
2 changes: 2 additions & 0 deletions ...icrosoft.Consumption/stable/2023-11-01/examples/EventsGetByBillingAccountWithFilters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"billingProfileDisplayName": "Contoso Operations Billing",
"transactionDate": "2019-07-01T00:00:00Z",
"description": "MACC Canceled",
"billingAccountId": "1234:5678",
"billingAccountDisplayName": "TestBillingAccount",
"canceledCredit": {
"currency": "USD",
"value": 200
Expand Down
6 changes: 1 addition & 5 deletions ...icrosoft.Consumption/stable/2023-11-01/examples/LotsListByBillingAccount-Contributor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@
"name": "lot1",
"type": "Microsoft.Consumption/lots",
"properties": {
"originalAmount": {
"currency": "USD",
"value": 5000.00
},
"usedAmount": {
"currency": "USD",
"value": 550.00
},
"orgType": "Contributor",
"OrganizationType": "Contributor",
"source": "ConsumptionCommitment",
"startDate": "2019-10-01T00:00:00Z",
"expirationDate": "2019-11-01T00:00:00Z",
Expand Down
2 changes: 1 addition & 1 deletion ...er/Microsoft.Consumption/stable/2023-11-01/examples/LotsListByBillingAccount-Primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"currency": "USD",
"value": 550.00
},
"orgType": "Primary",
"OrganizationType": "Primary",
"source": "ConsumptionCommitment",
"startDate": "2019-10-01T00:00:00Z",
"expirationDate": "2019-11-01T00:00:00Z",
Expand Down
6 changes: 1 addition & 5 deletions ...nsumption/stable/2023-11-01/examples/LotsListByBillingAccountWithFilters-Contributor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@
"name": "lot1",
"type": "Microsoft.Consumption/lots",
"properties": {
"originalAmount": {
"currency": "USD",
"value": 5000.00
},
"usedAmount": {
"currency": "USD",
"value": 550.00
},
"orgType": "Contributor",
"OrganizationType": "Contributor",
"source": "ConsumptionCommitment",
"startDate": "2019-10-01T00:00:00Z",
"expirationDate": "2019-11-01T00:00:00Z",
Expand Down
2 changes: 1 addition & 1 deletion ...t.Consumption/stable/2023-11-01/examples/LotsListByBillingAccountWithFilters-Primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"currency": "USD",
"value": 550.00
},
"orgType": "Primary",
"OrganizationType": "Primary",
"source": "ConsumptionCommitment",
"startDate": "2019-10-01T00:00:00Z",
"expirationDate": "2019-11-01T00:00:00Z",
Expand Down