From 4afe5f46b5247f0baa64a9bff84e380055323945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Fri, 7 May 2021 14:58:45 -0500 Subject: [PATCH 1/6] Documentation updated for Lots, Events and Credits --- .../stable/2021-05-01/consumption.json | 120 ++++++++++++++++++ .../CreditSummaryByBillingProfile.json | 6 + .../examples/EventsGetByBillingAccount.json | 82 +++++++++++- .../EventsGetByBillingAccountWithFilters.json | 41 +++++- .../examples/EventsListByBillingProfile.json | 112 +++++++++++++++- .../examples/LotsListByBillingAccount.json | 30 +++++ .../LotsListByBillingAccountWithFilters.json | 15 +++ .../examples/LotsListByBillingProfile.json | 36 +++++- 8 files changed, 433 insertions(+), 9 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json index a4be3db6b309..8d931b588264 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json @@ -4933,16 +4933,41 @@ "type": "string", "readOnly": true }, + "creditCurrency": { + "description": "The credit currency of the event.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency of the event.", + "type": "string", + "readOnly": true + }, + "reseller": { + "description": "The reseller of the event.", + "readOnly": true, + "$ref": "#/definitions/Reseller" + }, "newCredit": { "description": "The amount of new credit or commitment for NewCredit or SettleCharges event.", "readOnly": true, "$ref": "#/definitions/amount" }, + "newCreditInBillingCurrency": { + "description": "The amount of new credit or commitment for NewCredit or SettleCharges event in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "adjustments": { "description": "The amount of balance adjustment. The property is not available for ConsumptionCommitment lots.", "readOnly": true, "$ref": "#/definitions/amount" }, + "adjustmentsInBillingCurrency": { + "description": "The amount of balance adjustment in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "creditExpired": { "description": "The amount of expired credit or commitment for NewCredit or SettleCharges event.", "readOnly": true, @@ -4953,11 +4978,21 @@ "readOnly": true, "$ref": "#/definitions/amount" }, + "chargesInBillingCurrency": { + "description": "The amount of charges for events of type SettleCharges and PendingEligibleCharges in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "closedBalance": { "description": "The balance after the event. ", "readOnly": true, "$ref": "#/definitions/amount" }, + "closedBalanceInBillingCurrency": { + "description": "The balance in billing currency after the event.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "eventType": { "description": "Identifies the type of the event.", "type": "string", @@ -4999,6 +5034,11 @@ "description": "Identifies the source of the lot for which the event happened. ", "type": "string", "readOnly": true + }, + "canceledCredit": { + "description": "Amount of canceled credit.", + "readOnly": true, + "$ref": "#/definitions/Amount" } } }, @@ -5039,16 +5079,41 @@ "LotProperties": { "description": "The lot properties.", "properties": { + "creditCurrency": { + "description": "The currency of the lot.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency of the lot.", + "type": "string", + "readOnly": true + }, "originalAmount": { "description": "The original amount of a lot.", "readOnly": true, "$ref": "#/definitions/amount" }, + "originalAmountInBillingCurrency": { + "description": "The original amount of a lot in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "closedBalance": { "description": "The balance as of the last invoice.", "readOnly": true, "$ref": "#/definitions/amount" }, + "closedBalanceInBillingCurrency": { + "description": "The balance as of the last invoice in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "reseller": { + "description": "The reseller of the lot.", + "readOnly": true, + "$ref": "#/definitions/Reseller" + }, "source": { "description": "The source of the lot.", "type": "string", @@ -5089,6 +5154,14 @@ "status": { "description": "The status of the lot.", "type": "string", + "enum": [ + "None", + "Active", + "Inactive", + "Expired", + "Complete", + "Canceled" + ], "readOnly": true } } @@ -5113,6 +5186,16 @@ "description": "The properties of the credit summary.", "type": "object", "properties": { + "creditCurrency": { + "description": "The credit currency.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency.", + "type": "string", + "readOnly": true + }, "balanceSummary": { "description": "Summary of balances associated with this credit summary.", "readOnly": true, @@ -5132,6 +5215,11 @@ "description": "Pending eligible charges.", "readOnly": true, "$ref": "#/definitions/amount" + }, + "reseller": { + "description": "Reseller.", + "readOnly": true, + "$ref": "#/definitions/Reseller" } } }, @@ -5166,6 +5254,38 @@ } } }, + "AmountWithExchangeRate": { + "description": "The amount with exchange rate.", + "type": "object", + "properties": { + "exchangeRate": { + "description": "The exchange rate.", + "type": "decimal", + "readOnly": true + }, + "exchangeRateMonth": { + "description": "The exchange rate month.", + "type": "int", + "readOnly": true + } + } + }, + "Reseller": { + "description": "The reseller properties.", + "type": "object", + "properties": { + "resellerId": { + "description": "The reseller property ID.", + "type": "string", + "readOnly": true + }, + "resellerDescription": { + "description": "The reseller property description.", + "type": "string", + "readOnly": true + } + } + }, "Resource": { "description": "The Resource model definition.", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json index 14fe28c08646..dcce67cb3c1e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json @@ -11,6 +11,8 @@ "name": "balanceSummary1", "type": "Microsoft.Consumption/credits/balanceSummary", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "balanceSummary": { "estimatedBalance": { "currency": "USD", @@ -32,6 +34,10 @@ "pendingEligibleCharges": { "currency": "USD", "value": 0.00 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 } } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json index f35e79cd5742..e10a3e3e4a80 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json @@ -12,6 +12,32 @@ "name": "eventId1", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCredit": { + "currency": "USD", + "value": 500 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustments": { + "currency": "USD", + "value": 100 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "creditExpired": { + "currency": "USD", + "value": 200 + }, "lotSource": "ConsumptionCommitment", "lotId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/Microsoft.Consumption/lots/G202001083926600XXXXX", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB", @@ -22,11 +48,24 @@ "currency": "USD", "value": 500 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "eventType": "PendingCharges", + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } }, { @@ -34,6 +73,32 @@ "name": "eventId2", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCredit": { + "currency": "USD", + "value": 500 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustments": { + "currency": "USD", + "value": 100 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "creditExpired": { + "currency": "USD", + "value": 200 + }, "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", @@ -44,11 +109,24 @@ "currency": "USD", "value": 500 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "eventType": "PendingCharges", + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json index eba73c41a66c..2ba641e1c726 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json @@ -13,6 +13,32 @@ "name": "eventId1", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCredit": { + "currency": "USD", + "value": 500 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustments": { + "currency": "USD", + "value": 100 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "creditExpired": { + "currency": "USD", + "value": 200 + }, "lotSource": "ConsumptionCommitment", "lotId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/Microsoft.Consumption/lots/G202001083926600XXXXX", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB", @@ -23,11 +49,24 @@ "currency": "USD", "value": 500 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "eventType": "PendingCharges", + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json index 5a0bbe735938..afa3a2d644bf 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json @@ -15,6 +15,20 @@ "name": "event1", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "transactionDate": "2019-07-01T00:00:00Z", "description": "Settled invoice #312033", "newCredit": { @@ -33,12 +47,24 @@ "currency": "USD", "value": 500.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 500.00 }, "eventType": "SettledCharges", - "invoiceNumber": "3301" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } }, { @@ -46,6 +72,20 @@ "name": "event2", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "transactionDate": "2019-08-01T00:00:00Z", "description": "New credits added", "newCredit": { @@ -64,12 +104,24 @@ "currency": "USD", "value": 0.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 900.00 }, "eventType": "NewCredit", - "invoiceNumber": "3302" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } }, { @@ -77,6 +129,20 @@ "name": "event3", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "transactionDate": "2019-09-01T00:00:00Z", "description": "Credits Expired", "newCredit": { @@ -95,12 +161,24 @@ "currency": "USD", "value": 0.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 600.00 }, "eventType": "ExpiredCredit", - "invoiceNumber": "" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } }, { @@ -108,6 +186,20 @@ "name": "event4", "type": "Microsoft.Consumption/events", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "transactionDate": "2021-05-01T00:00:00Z", "description": "Settled invoice #212033", "newCredit": { @@ -126,12 +218,24 @@ "currency": "USD", "value": 300.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 700.00 }, "eventType": "SettledCharges", - "invoiceNumber": "3303" + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "invoiceNumber": "3304", + "canceledCredit": { + "currency": "USD", + "value": 5000 + } } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json index 46577725a184..94e99f8c89d4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json @@ -12,17 +12,32 @@ "name": "lot1", "type": "Microsoft.Consumption/lots", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 5000.00 }, + "originalAmountInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 60.90 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, "source": "ConsumptionCommitment", "startDate": "2019-10-01T00:00:00Z", "expirationDate": "2019-11-01T00:00:00Z", + "poNumber": "3524", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Active" } @@ -32,17 +47,32 @@ "name": "lot2", "type": "Microsoft.Consumption/lots", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 6000.00 }, + "originalAmountInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 80.90 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller2", + "resellerDescription": 2 + }, "source": "ConsumptionCommitment", "startDate": "2019-11-01T00:00:00Z", "expirationDate": "2019-12-31T00:00:00Z", + "poNumber": "3525", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Expired" } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json index bdc9acf1bd18..70b3fa6a7240 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json @@ -13,17 +13,32 @@ "name": "lot1", "type": "Microsoft.Consumption/lots", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 5000.00 }, + "originalAmountInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 60.90 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, "source": "ConsumptionCommitment", "startDate": "2019-10-01T00:00:00Z", "expirationDate": "2019-11-01T00:00:00Z", + "poNumber": "3524", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Active" } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json index ae8f827faffb..d015555bab3a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json @@ -13,18 +13,34 @@ "name": "lot1", "type": "Microsoft.Consumption/lots", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 5000.00 }, + "originalAmountInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 60.90 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z", "expirationDate": "2021-05-01T00:00:00Z", - "poNumber": "3524" + "poNumber": "3524", + "purchaseDate": "2019-09-01T00:00:00Z", + "status": "Active" } }, { @@ -32,18 +48,34 @@ "name": "lot2", "type": "Microsoft.Consumption/lots", "properties": { + "creditCurrency": "USD", + "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 6000.00 }, + "originalAmountInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 80.90 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller2", + "resellerDescription": 2 + }, "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z", "expirationDate": "2019-12-31T00:00:00Z", - "poNumber": "31224" + "poNumber": "31224", + "purchaseDate": "2019-09-01T00:00:00Z", + "status": "Expired" } } ] From ee274720906a3e72932eeb6ca3b12945b10d6f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Fri, 7 May 2021 18:50:56 -0500 Subject: [PATCH 2/6] Fixing PR comments --- .../stable/2021-05-01/consumption.json | 18 ++- .../examples/EventsGetByBillingAccount.json | 66 +-------- .../EventsGetByBillingAccountWithFilters.json | 33 +---- .../examples/EventsListByBillingProfile.json | 128 +++--------------- .../examples/LotsListByBillingAccount.json | 30 ---- .../LotsListByBillingAccountWithFilters.json | 15 -- .../examples/LotsListByBillingProfile.json | 8 +- 7 files changed, 39 insertions(+), 259 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json index 8d931b588264..f17568c43e99 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json @@ -5162,7 +5162,11 @@ "Complete", "Canceled" ], - "readOnly": true + "readOnly": true, + "x-ms-enum": { + "name": "Status", + "modelAsString": true + } } } }, @@ -5231,6 +5235,11 @@ "readOnly": true, "$ref": "#/definitions/amount" }, + "estimatedBalanceInBillingCurrency": { + "description": "Estimated balance in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "currentBalance": { "description": "Current balance.", "readOnly": true, @@ -5256,16 +5265,17 @@ }, "AmountWithExchangeRate": { "description": "The amount with exchange rate.", - "type": "object", "properties": { "exchangeRate": { "description": "The exchange rate.", - "type": "decimal", + "type": "number", + "format": "decimal", "readOnly": true }, "exchangeRateMonth": { "description": "The exchange rate month.", - "type": "int", + "type": "integer", + "format": "int32", "readOnly": true } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json index e10a3e3e4a80..0982837b2485 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json @@ -12,28 +12,10 @@ "name": "eventId1", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, "newCredit": { "currency": "USD", "value": 500 }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustments": { - "currency": "USD", - "value": 100 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "creditExpired": { "currency": "USD", "value": 200 @@ -48,24 +30,11 @@ "currency": "USD", "value": 500 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 500 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "eventType": "PendingCharges", - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3304" } }, { @@ -73,28 +42,10 @@ "name": "eventId2", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, "newCredit": { "currency": "USD", "value": 500 }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustments": { - "currency": "USD", - "value": 100 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "creditExpired": { "currency": "USD", "value": 200 @@ -109,24 +60,11 @@ "currency": "USD", "value": 500 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 500 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "eventType": "PendingCharges", - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3304" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json index 2ba641e1c726..ea3e60b52c5c 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json @@ -13,28 +13,10 @@ "name": "eventId1", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, "newCredit": { "currency": "USD", "value": 500 }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustments": { - "currency": "USD", - "value": 100 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "creditExpired": { "currency": "USD", "value": 200 @@ -49,24 +31,11 @@ "currency": "USD", "value": 500 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 500 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "eventType": "PendingCharges", - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3304" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json index afa3a2d644bf..c83bf7696763 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json @@ -15,26 +15,16 @@ "name": "event1", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "transactionDate": "2019-07-01T00:00:00Z", "description": "Settled invoice #312033", "newCredit": { "currency": "USD", "value": 0.00 }, + "canceledCredit": { + "currency": "USD", + "value": 5000 + }, "adjustments": { "currency": "USD", "value": 0.00 @@ -47,24 +37,12 @@ "currency": "USD", "value": 500.00 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 500.00 }, "eventType": "SettledCharges", - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3301" } }, { @@ -72,26 +50,16 @@ "name": "event2", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "transactionDate": "2019-08-01T00:00:00Z", "description": "New credits added", "newCredit": { "currency": "USD", "value": 400.00 }, + "canceledCredit": { + "currency": "USD", + "value": 5000 + }, "adjustments": { "currency": "USD", "value": 0.00 @@ -104,24 +72,12 @@ "currency": "USD", "value": 0.00 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 900.00 }, "eventType": "NewCredit", - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3302" } }, { @@ -129,26 +85,16 @@ "name": "event3", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "transactionDate": "2019-09-01T00:00:00Z", "description": "Credits Expired", "newCredit": { "currency": "USD", "value": 0.00 }, + "canceledCredit": { + "currency": "USD", + "value": 5000 + }, "adjustments": { "currency": "USD", "value": 0.00 @@ -161,24 +107,12 @@ "currency": "USD", "value": 0.00 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 600.00 }, "eventType": "ExpiredCredit", - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "" } }, { @@ -186,26 +120,16 @@ "name": "event4", "type": "Microsoft.Consumption/events", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, - "newCreditInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "adjustmentsInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "transactionDate": "2021-05-01T00:00:00Z", "description": "Settled invoice #212033", "newCredit": { "currency": "USD", "value": 300.00 }, + "canceledCredit": { + "currency": "USD", + "value": 5000 + }, "adjustments": { "currency": "USD", "value": -200.00 @@ -218,24 +142,12 @@ "currency": "USD", "value": 300.00 }, - "chargesInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 700.00 }, "eventType": "SettledCharges", - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "invoiceNumber": "3304", - "canceledCredit": { - "currency": "USD", - "value": 5000 - } + "invoiceNumber": "3303" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json index 94e99f8c89d4..46577725a184 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccount.json @@ -12,32 +12,17 @@ "name": "lot1", "type": "Microsoft.Consumption/lots", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 5000.00 }, - "originalAmountInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 60.90 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, "source": "ConsumptionCommitment", "startDate": "2019-10-01T00:00:00Z", "expirationDate": "2019-11-01T00:00:00Z", - "poNumber": "3524", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Active" } @@ -47,32 +32,17 @@ "name": "lot2", "type": "Microsoft.Consumption/lots", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 6000.00 }, - "originalAmountInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 80.90 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller2", - "resellerDescription": 2 - }, "source": "ConsumptionCommitment", "startDate": "2019-11-01T00:00:00Z", "expirationDate": "2019-12-31T00:00:00Z", - "poNumber": "3525", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Expired" } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json index 70b3fa6a7240..bdc9acf1bd18 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingAccountWithFilters.json @@ -13,32 +13,17 @@ "name": "lot1", "type": "Microsoft.Consumption/lots", "properties": { - "creditCurrency": "USD", - "billingCurrency": "USD", "originalAmount": { "currency": "USD", "value": 5000.00 }, - "originalAmountInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, "closedBalance": { "currency": "USD", "value": 60.90 }, - "closedBalanceInBillingCurrency": { - "exchangeRate": 5000.00, - "exchangeRateMonth": 1 - }, - "reseller": { - "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 - }, "source": "ConsumptionCommitment", "startDate": "2019-10-01T00:00:00Z", "expirationDate": "2019-11-01T00:00:00Z", - "poNumber": "3524", "purchaseDate": "2019-09-01T00:00:00Z", "status": "Active" } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json index d015555bab3a..08dc26b8ce3a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json @@ -38,9 +38,7 @@ "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z", "expirationDate": "2021-05-01T00:00:00Z", - "poNumber": "3524", - "purchaseDate": "2019-09-01T00:00:00Z", - "status": "Active" + "poNumber": "3524" } }, { @@ -73,9 +71,7 @@ "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z", "expirationDate": "2019-12-31T00:00:00Z", - "poNumber": "31224", - "purchaseDate": "2019-09-01T00:00:00Z", - "status": "Expired" + "poNumber": "31224" } } ] From 54b781df8f04b9ae4ab6844fe945e713cd7353a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Mon, 10 May 2021 12:49:27 -0500 Subject: [PATCH 3/6] Fixed PR comments. --- .../stable/2021-05-01/consumption.json | 216 +++++++++--------- .../examples/EventsGetByBillingAccount.json | 4 +- .../EventsGetByBillingAccountWithFilters.json | 2 +- .../examples/EventsListByBillingProfile.json | 105 ++++++++- 4 files changed, 213 insertions(+), 114 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json index f17568c43e99..41c2c14e2abd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json @@ -4933,41 +4933,16 @@ "type": "string", "readOnly": true }, - "creditCurrency": { - "description": "The credit currency of the event.", - "type": "string", - "readOnly": true - }, - "billingCurrency": { - "description": "The billing currency of the event.", - "type": "string", - "readOnly": true - }, - "reseller": { - "description": "The reseller of the event.", - "readOnly": true, - "$ref": "#/definitions/Reseller" - }, "newCredit": { "description": "The amount of new credit or commitment for NewCredit or SettleCharges event.", "readOnly": true, "$ref": "#/definitions/amount" }, - "newCreditInBillingCurrency": { - "description": "The amount of new credit or commitment for NewCredit or SettleCharges event in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "adjustments": { "description": "The amount of balance adjustment. The property is not available for ConsumptionCommitment lots.", "readOnly": true, "$ref": "#/definitions/amount" }, - "adjustmentsInBillingCurrency": { - "description": "The amount of balance adjustment in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "creditExpired": { "description": "The amount of expired credit or commitment for NewCredit or SettleCharges event.", "readOnly": true, @@ -4978,21 +4953,11 @@ "readOnly": true, "$ref": "#/definitions/amount" }, - "chargesInBillingCurrency": { - "description": "The amount of charges for events of type SettleCharges and PendingEligibleCharges in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "closedBalance": { "description": "The balance after the event. ", "readOnly": true, "$ref": "#/definitions/amount" }, - "closedBalanceInBillingCurrency": { - "description": "The balance in billing currency after the event.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "eventType": { "description": "Identifies the type of the event.", "type": "string", @@ -5039,6 +5004,41 @@ "description": "Amount of canceled credit.", "readOnly": true, "$ref": "#/definitions/Amount" + }, + "creditCurrency": { + "description": "The credit currency of the event.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency of the event.", + "type": "string", + "readOnly": true + }, + "reseller": { + "description": "The reseller of the event.", + "readOnly": true, + "$ref": "#/definitions/Reseller" + }, + "newCreditInBillingCurrency": { + "description": "The amount of new credit or commitment for NewCredit or SettleCharges event in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "adjustmentsInBillingCurrency": { + "description": "The amount of balance adjustment in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "chargesInBillingCurrency": { + "description": "The amount of charges for events of type SettleCharges and PendingEligibleCharges in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "closedBalanceInBillingCurrency": { + "description": "The balance in billing currency after the event.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" } } }, @@ -5079,41 +5079,16 @@ "LotProperties": { "description": "The lot properties.", "properties": { - "creditCurrency": { - "description": "The currency of the lot.", - "type": "string", - "readOnly": true - }, - "billingCurrency": { - "description": "The billing currency of the lot.", - "type": "string", - "readOnly": true - }, "originalAmount": { "description": "The original amount of a lot.", "readOnly": true, "$ref": "#/definitions/amount" }, - "originalAmountInBillingCurrency": { - "description": "The original amount of a lot in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "closedBalance": { "description": "The balance as of the last invoice.", "readOnly": true, "$ref": "#/definitions/amount" }, - "closedBalanceInBillingCurrency": { - "description": "The balance as of the last invoice in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, - "reseller": { - "description": "The reseller of the lot.", - "readOnly": true, - "$ref": "#/definitions/Reseller" - }, "source": { "description": "The source of the lot.", "type": "string", @@ -5167,6 +5142,31 @@ "name": "Status", "modelAsString": true } + }, + "creditCurrency": { + "description": "The currency of the lot.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency of the lot.", + "type": "string", + "readOnly": true + }, + "originalAmountInBillingCurrency": { + "description": "The original amount of a lot in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "closedBalanceInBillingCurrency": { + "description": "The balance as of the last invoice in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, + "reseller": { + "description": "The reseller of the lot.", + "readOnly": true, + "$ref": "#/definitions/Reseller" } } }, @@ -5190,16 +5190,6 @@ "description": "The properties of the credit summary.", "type": "object", "properties": { - "creditCurrency": { - "description": "The credit currency.", - "type": "string", - "readOnly": true - }, - "billingCurrency": { - "description": "The billing currency.", - "type": "string", - "readOnly": true - }, "balanceSummary": { "description": "Summary of balances associated with this credit summary.", "readOnly": true, @@ -5220,6 +5210,16 @@ "readOnly": true, "$ref": "#/definitions/amount" }, + "creditCurrency": { + "description": "The credit currency.", + "type": "string", + "readOnly": true + }, + "billingCurrency": { + "description": "The billing currency.", + "type": "string", + "readOnly": true + }, "reseller": { "description": "Reseller.", "readOnly": true, @@ -5235,15 +5235,15 @@ "readOnly": true, "$ref": "#/definitions/amount" }, - "estimatedBalanceInBillingCurrency": { - "description": "Estimated balance in billing currency.", - "readOnly": true, - "$ref": "#/definitions/AmountWithExchangeRate" - }, "currentBalance": { "description": "Current balance.", "readOnly": true, "$ref": "#/definitions/amount" + }, + "estimatedBalanceInBillingCurrency": { + "description": "Estimated balance in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" } } }, @@ -5263,39 +5263,6 @@ } } }, - "AmountWithExchangeRate": { - "description": "The amount with exchange rate.", - "properties": { - "exchangeRate": { - "description": "The exchange rate.", - "type": "number", - "format": "decimal", - "readOnly": true - }, - "exchangeRateMonth": { - "description": "The exchange rate month.", - "type": "integer", - "format": "int32", - "readOnly": true - } - } - }, - "Reseller": { - "description": "The reseller properties.", - "type": "object", - "properties": { - "resellerId": { - "description": "The reseller property ID.", - "type": "string", - "readOnly": true - }, - "resellerDescription": { - "description": "The reseller property description.", - "type": "string", - "readOnly": true - } - } - }, "Resource": { "description": "The Resource model definition.", "properties": { @@ -5398,6 +5365,39 @@ } }, "x-ms-azure-resource": true + }, + "AmountWithExchangeRate": { + "description": "The amount with exchange rate.", + "properties": { + "exchangeRate": { + "description": "The exchange rate.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "exchangeRateMonth": { + "description": "The exchange rate month.", + "type": "integer", + "format": "int32", + "readOnly": true + } + } + }, + "Reseller": { + "description": "The reseller properties.", + "type": "object", + "properties": { + "resellerId": { + "description": "The reseller property ID.", + "type": "string", + "readOnly": true + }, + "resellerDescription": { + "description": "The reseller property description.", + "type": "string", + "readOnly": true + } + } } }, "parameters": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json index 0982837b2485..a55128aa0886 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json @@ -16,7 +16,7 @@ "currency": "USD", "value": 500 }, - "creditExpired": { + "canceledCredit": { "currency": "USD", "value": 200 }, @@ -46,7 +46,7 @@ "currency": "USD", "value": 500 }, - "creditExpired": { + "canceledCredit": { "currency": "USD", "value": 200 }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json index ea3e60b52c5c..c2c4a5a22afd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json @@ -17,7 +17,7 @@ "currency": "USD", "value": 500 }, - "creditExpired": { + "canceledCredit": { "currency": "USD", "value": 200 }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json index c83bf7696763..898152e63b02 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json @@ -17,30 +17,52 @@ "properties": { "transactionDate": "2019-07-01T00:00:00Z", "description": "Settled invoice #312033", + "creditCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "billingCurrency": "USD", "newCredit": { "currency": "USD", "value": 0.00 }, - "canceledCredit": { - "currency": "USD", - "value": 5000 + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 }, "adjustments": { "currency": "USD", "value": 0.00 }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "creditExpired": { "currency": "USD", "value": 0.00 }, + "creditExpiredInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "charges": { "currency": "USD", "value": 500.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 500.00 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "eventType": "SettledCharges", "invoiceNumber": "3301" } @@ -52,10 +74,20 @@ "properties": { "transactionDate": "2019-08-01T00:00:00Z", "description": "New credits added", + "creditCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "billingCurrency": "USD", "newCredit": { "currency": "USD", "value": 400.00 }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "canceledCredit": { "currency": "USD", "value": 5000 @@ -64,18 +96,33 @@ "currency": "USD", "value": 0.00 }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "creditExpired": { "currency": "USD", "value": 0.00 + },"creditExpiredInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 }, "charges": { "currency": "USD", "value": 0.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 900.00 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "eventType": "NewCredit", "invoiceNumber": "3302" } @@ -87,10 +134,20 @@ "properties": { "transactionDate": "2019-09-01T00:00:00Z", "description": "Credits Expired", + "creditCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "billingCurrency": "USD", "newCredit": { "currency": "USD", "value": 0.00 }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "canceledCredit": { "currency": "USD", "value": 5000 @@ -99,18 +156,34 @@ "currency": "USD", "value": 0.00 }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "creditExpired": { "currency": "USD", "value": 300.00 }, + "creditExpiredInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "charges": { "currency": "USD", "value": 0.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 600.00 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "eventType": "ExpiredCredit", "invoiceNumber": "" } @@ -122,10 +195,20 @@ "properties": { "transactionDate": "2021-05-01T00:00:00Z", "description": "Settled invoice #212033", + "creditCurrency": "USD", + "reseller": { + "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", + "resellerDescription": 1 + }, + "billingCurrency": "USD", "newCredit": { "currency": "USD", "value": 300.00 }, + "newCreditInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "canceledCredit": { "currency": "USD", "value": 5000 @@ -134,18 +217,34 @@ "currency": "USD", "value": -200.00 }, + "adjustmentsInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "creditExpired": { "currency": "USD", "value": 100.00 }, + "creditExpiredInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "charges": { "currency": "USD", "value": 300.00 }, + "chargesInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "closedBalance": { "currency": "USD", "value": 700.00 }, + "closedBalanceInBillingCurrency": { + "exchangeRate": 5000.00, + "exchangeRateMonth": 1 + }, "eventType": "SettledCharges", "invoiceNumber": "3303" } From f25bae7ef61e61bfe40546328dae283f3badfb8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Tue, 11 May 2021 11:35:49 -0500 Subject: [PATCH 4/6] Fixed Events examples --- .../examples/EventsGetByBillingAccount.json | 36 +++++++------------ .../EventsGetByBillingAccountWithFilters.json | 21 ++++------- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json index a55128aa0886..73f05df671ee 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json @@ -11,51 +11,40 @@ "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1", "name": "eventId1", "type": "Microsoft.Consumption/events", - "properties": { - "newCredit": { - "currency": "USD", - "value": 500 - }, - "canceledCredit": { - "currency": "USD", - "value": 200 - }, + "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": "Settled invoice #312033", + "description": "New MACC Added", "charges": { "currency": "USD", "value": 500 + }, + "newCredit": { + "currency": "USD", + "value": 500 }, "closedBalance": { "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "invoiceNumber": "3304", + "eventType":"NewCredit" } }, { "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId2", "name": "eventId2", "type": "Microsoft.Consumption/events", - "properties": { - "newCredit": { - "currency": "USD", - "value": 500 - }, - "canceledCredit": { - "currency": "USD", - "value": 200 - }, + "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": "Settled invoice #312033", + "description": "Balance after invoice 3304", "charges": { "currency": "USD", "value": 500 @@ -64,11 +53,12 @@ "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "invoiceNumber": "3304", + "eventType":"SettledCharges" } } ] } } } -} +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json index c2c4a5a22afd..dc6481cea11c 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json @@ -12,34 +12,27 @@ "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1", "name": "eventId1", "type": "Microsoft.Consumption/events", - "properties": { - "newCredit": { - "currency": "USD", - "value": 500 - }, - "canceledCredit": { - "currency": "USD", - "value": 200 - }, + "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": "Settled invoice #312033", - "charges": { + "description": "MACC Canceled", + "canceledCredit": { "currency": "USD", - "value": 500 + "value": 200 }, "closedBalance": { "currency": "USD", "value": 500 }, - "invoiceNumber": "3304" + "invoiceNumber": "3304", + "eventType":"CanceledCredit" } } ] } } } -} +} \ No newline at end of file From 11fe79c0000ed1873d3ee480923e977cdd5857d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Mon, 24 May 2021 16:29:07 -0500 Subject: [PATCH 5/6] Fixing pipeline --- .../Microsoft.Consumption/stable/2021-05-01/consumption.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json index 41c2c14e2abd..76730e3dc1a2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json @@ -5003,7 +5003,7 @@ "canceledCredit": { "description": "Amount of canceled credit.", "readOnly": true, - "$ref": "#/definitions/Amount" + "$ref": "#/definitions/amount" }, "creditCurrency": { "description": "The credit currency of the event.", @@ -5221,7 +5221,7 @@ "readOnly": true }, "reseller": { - "description": "Reseller.", + "description": "Credit's reseller.", "readOnly": true, "$ref": "#/definitions/Reseller" } From 505447c64ca9d73481c3c86c45a77f545e29e60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20V=C3=A1zquez?= Date: Mon, 24 May 2021 16:56:49 -0500 Subject: [PATCH 6/6] Fixing pipeline --- .../stable/2021-05-01/consumption.json | 7 ++++++- .../examples/CreditSummaryByBillingProfile.json | 2 +- .../examples/EventsGetByBillingAccount.json | 12 ++++++------ .../EventsGetByBillingAccountWithFilters.json | 6 +++--- .../examples/EventsListByBillingProfile.json | 11 ++++++----- .../examples/LotsListByBillingProfile.json | 4 ++-- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json index 76730e3dc1a2..5c1741141c2a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json @@ -5020,6 +5020,11 @@ "readOnly": true, "$ref": "#/definitions/Reseller" }, + "creditExpiredInBillingCurrency": { + "description": "The amount of expired credit or commitment for NewCredit or SettleCharges event in billing currency.", + "readOnly": true, + "$ref": "#/definitions/AmountWithExchangeRate" + }, "newCreditInBillingCurrency": { "description": "The amount of new credit or commitment for NewCredit or SettleCharges event in billing currency.", "readOnly": true, @@ -5141,7 +5146,7 @@ "x-ms-enum": { "name": "Status", "modelAsString": true - } + } }, "creditCurrency": { "description": "The currency of the lot.", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json index dcce67cb3c1e..1fb696218838 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json @@ -37,7 +37,7 @@ }, "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information." } } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json index 73f05df671ee..3bd360a4972e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json @@ -11,7 +11,7 @@ "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1", "name": "eventId1", "type": "Microsoft.Consumption/events", - "properties": { + "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", @@ -22,7 +22,7 @@ "currency": "USD", "value": 500 }, - "newCredit": { + "newCredit": { "currency": "USD", "value": 500 }, @@ -31,14 +31,14 @@ "value": 500 }, "invoiceNumber": "3304", - "eventType":"NewCredit" + "eventType": "NewCredit" } }, { "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId2", "name": "eventId2", "type": "Microsoft.Consumption/events", - "properties": { + "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", @@ -54,11 +54,11 @@ "value": 500 }, "invoiceNumber": "3304", - "eventType":"SettledCharges" + "eventType": "SettledCharges" } } ] } } } -} \ No newline at end of file +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json index dc6481cea11c..9f3abbc8588b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json @@ -12,7 +12,7 @@ "id": "/providers/Microsoft.Billing/billingAccounts/1234:56789/providers/Microsoft.Consumption/events/eventId1", "name": "eventId1", "type": "Microsoft.Consumption/events", - "properties": { + "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", @@ -28,11 +28,11 @@ "value": 500 }, "invoiceNumber": "3304", - "eventType":"CanceledCredit" + "eventType": "CanceledCredit" } } ] } } } -} \ No newline at end of file +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json index 898152e63b02..737140b05560 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsListByBillingProfile.json @@ -20,7 +20,7 @@ "creditCurrency": "USD", "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information" }, "billingCurrency": "USD", "newCredit": { @@ -77,7 +77,7 @@ "creditCurrency": "USD", "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information" }, "billingCurrency": "USD", "newCredit": { @@ -103,7 +103,8 @@ "creditExpired": { "currency": "USD", "value": 0.00 - },"creditExpiredInBillingCurrency": { + }, + "creditExpiredInBillingCurrency": { "exchangeRate": 5000.00, "exchangeRateMonth": 1 }, @@ -137,7 +138,7 @@ "creditCurrency": "USD", "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information" }, "billingCurrency": "USD", "newCredit": { @@ -198,7 +199,7 @@ "creditCurrency": "USD", "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information" }, "billingCurrency": "USD", "newCredit": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json index 08dc26b8ce3a..9d7a66b8aa02 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/LotsListByBillingProfile.json @@ -33,7 +33,7 @@ }, "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1", - "resellerDescription": 1 + "resellerDescription": "Reseller information." }, "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z", @@ -66,7 +66,7 @@ }, "reseller": { "resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller2", - "resellerDescription": 2 + "resellerDescription": "Reseller information." }, "source": "PurchasedCredit", "startDate": "2021-05-01T00:00:00Z",