Skip to content

Commit 8851999

Browse files
anat-gilensonanat-gilenson
committed
Resolve conflicts - merge with master
2 parents 0fada21 + 5f9965c commit 8851999

File tree

27 files changed

+1862
-28
lines changed

27 files changed

+1862
-28
lines changed

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/consumption.json‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4999,6 +4999,51 @@
49994999
"description": "Identifies the source of the lot for which the event happened. ",
50005000
"type": "string",
50015001
"readOnly": true
5002+
},
5003+
"canceledCredit": {
5004+
"description": "Amount of canceled credit.",
5005+
"readOnly": true,
5006+
"$ref": "#/definitions/amount"
5007+
},
5008+
"creditCurrency": {
5009+
"description": "The credit currency of the event.",
5010+
"type": "string",
5011+
"readOnly": true
5012+
},
5013+
"billingCurrency": {
5014+
"description": "The billing currency of the event.",
5015+
"type": "string",
5016+
"readOnly": true
5017+
},
5018+
"reseller": {
5019+
"description": "The reseller of the event.",
5020+
"readOnly": true,
5021+
"$ref": "#/definitions/Reseller"
5022+
},
5023+
"creditExpiredInBillingCurrency": {
5024+
"description": "The amount of expired credit or commitment for NewCredit or SettleCharges event in billing currency.",
5025+
"readOnly": true,
5026+
"$ref": "#/definitions/AmountWithExchangeRate"
5027+
},
5028+
"newCreditInBillingCurrency": {
5029+
"description": "The amount of new credit or commitment for NewCredit or SettleCharges event in billing currency.",
5030+
"readOnly": true,
5031+
"$ref": "#/definitions/AmountWithExchangeRate"
5032+
},
5033+
"adjustmentsInBillingCurrency": {
5034+
"description": "The amount of balance adjustment in billing currency.",
5035+
"readOnly": true,
5036+
"$ref": "#/definitions/AmountWithExchangeRate"
5037+
},
5038+
"chargesInBillingCurrency": {
5039+
"description": "The amount of charges for events of type SettleCharges and PendingEligibleCharges in billing currency.",
5040+
"readOnly": true,
5041+
"$ref": "#/definitions/AmountWithExchangeRate"
5042+
},
5043+
"closedBalanceInBillingCurrency": {
5044+
"description": "The balance in billing currency after the event.",
5045+
"readOnly": true,
5046+
"$ref": "#/definitions/AmountWithExchangeRate"
50025047
}
50035048
}
50045049
},
@@ -5089,7 +5134,44 @@
50895134
"status": {
50905135
"description": "The status of the lot.",
50915136
"type": "string",
5137+
"enum": [
5138+
"None",
5139+
"Active",
5140+
"Inactive",
5141+
"Expired",
5142+
"Complete",
5143+
"Canceled"
5144+
],
5145+
"readOnly": true,
5146+
"x-ms-enum": {
5147+
"name": "Status",
5148+
"modelAsString": true
5149+
}
5150+
},
5151+
"creditCurrency": {
5152+
"description": "The currency of the lot.",
5153+
"type": "string",
50925154
"readOnly": true
5155+
},
5156+
"billingCurrency": {
5157+
"description": "The billing currency of the lot.",
5158+
"type": "string",
5159+
"readOnly": true
5160+
},
5161+
"originalAmountInBillingCurrency": {
5162+
"description": "The original amount of a lot in billing currency.",
5163+
"readOnly": true,
5164+
"$ref": "#/definitions/AmountWithExchangeRate"
5165+
},
5166+
"closedBalanceInBillingCurrency": {
5167+
"description": "The balance as of the last invoice in billing currency.",
5168+
"readOnly": true,
5169+
"$ref": "#/definitions/AmountWithExchangeRate"
5170+
},
5171+
"reseller": {
5172+
"description": "The reseller of the lot.",
5173+
"readOnly": true,
5174+
"$ref": "#/definitions/Reseller"
50935175
}
50945176
}
50955177
},
@@ -5132,6 +5214,21 @@
51325214
"description": "Pending eligible charges.",
51335215
"readOnly": true,
51345216
"$ref": "#/definitions/amount"
5217+
},
5218+
"creditCurrency": {
5219+
"description": "The credit currency.",
5220+
"type": "string",
5221+
"readOnly": true
5222+
},
5223+
"billingCurrency": {
5224+
"description": "The billing currency.",
5225+
"type": "string",
5226+
"readOnly": true
5227+
},
5228+
"reseller": {
5229+
"description": "Credit's reseller.",
5230+
"readOnly": true,
5231+
"$ref": "#/definitions/Reseller"
51355232
}
51365233
}
51375234
},
@@ -5147,6 +5244,11 @@
51475244
"description": "Current balance.",
51485245
"readOnly": true,
51495246
"$ref": "#/definitions/amount"
5247+
},
5248+
"estimatedBalanceInBillingCurrency": {
5249+
"description": "Estimated balance in billing currency.",
5250+
"readOnly": true,
5251+
"$ref": "#/definitions/AmountWithExchangeRate"
51505252
}
51515253
}
51525254
},
@@ -5268,6 +5370,39 @@
52685370
}
52695371
},
52705372
"x-ms-azure-resource": true
5373+
},
5374+
"AmountWithExchangeRate": {
5375+
"description": "The amount with exchange rate.",
5376+
"properties": {
5377+
"exchangeRate": {
5378+
"description": "The exchange rate.",
5379+
"type": "number",
5380+
"format": "decimal",
5381+
"readOnly": true
5382+
},
5383+
"exchangeRateMonth": {
5384+
"description": "The exchange rate month.",
5385+
"type": "integer",
5386+
"format": "int32",
5387+
"readOnly": true
5388+
}
5389+
}
5390+
},
5391+
"Reseller": {
5392+
"description": "The reseller properties.",
5393+
"type": "object",
5394+
"properties": {
5395+
"resellerId": {
5396+
"description": "The reseller property ID.",
5397+
"type": "string",
5398+
"readOnly": true
5399+
},
5400+
"resellerDescription": {
5401+
"description": "The reseller property description.",
5402+
"type": "string",
5403+
"readOnly": true
5404+
}
5405+
}
52715406
}
52725407
},
52735408
"parameters": {

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/CreditSummaryByBillingProfile.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"name": "balanceSummary1",
1212
"type": "Microsoft.Consumption/credits/balanceSummary",
1313
"properties": {
14+
"creditCurrency": "USD",
15+
"billingCurrency": "USD",
1416
"balanceSummary": {
1517
"estimatedBalance": {
1618
"currency": "USD",
@@ -32,6 +34,10 @@
3234
"pendingEligibleCharges": {
3335
"currency": "USD",
3436
"value": 0.00
37+
},
38+
"reseller": {
39+
"resellerId": "/providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468/providers/Microsoft.Consumption/reseller/reseller1",
40+
"resellerDescription": "Reseller information."
3541
}
3642
}
3743
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccount.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,21 @@
1717
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
1818
"billingProfileDisplayName": "Contoso Operations Billing",
1919
"transactionDate": "2019-07-01T00:00:00Z",
20-
"description": "Settled invoice #312033",
20+
"description": "New MACC Added",
2121
"charges": {
2222
"currency": "USD",
2323
"value": 500
2424
},
25+
"newCredit": {
26+
"currency": "USD",
27+
"value": 500
28+
},
2529
"closedBalance": {
2630
"currency": "USD",
2731
"value": 500
2832
},
29-
"invoiceNumber": "3304"
33+
"invoiceNumber": "3304",
34+
"eventType": "NewCredit"
3035
}
3136
},
3237
{
@@ -39,7 +44,7 @@
3944
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
4045
"billingProfileDisplayName": "Contoso Operations Billing",
4146
"transactionDate": "2019-07-01T00:00:00Z",
42-
"description": "Settled invoice #312033",
47+
"description": "Balance after invoice 3304",
4348
"charges": {
4449
"currency": "USD",
4550
"value": 500
@@ -48,7 +53,8 @@
4853
"currency": "USD",
4954
"value": 500
5055
},
51-
"invoiceNumber": "3304"
56+
"invoiceNumber": "3304",
57+
"eventType": "SettledCharges"
5258
}
5359
}
5460
]

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-05-01/examples/EventsGetByBillingAccountWithFilters.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/X3TD-KVTT-BG7-TGB",
1919
"billingProfileDisplayName": "Contoso Operations Billing",
2020
"transactionDate": "2019-07-01T00:00:00Z",
21-
"description": "Settled invoice #312033",
22-
"charges": {
21+
"description": "MACC Canceled",
22+
"canceledCredit": {
2323
"currency": "USD",
24-
"value": 500
24+
"value": 200
2525
},
2626
"closedBalance": {
2727
"currency": "USD",
2828
"value": 500
2929
},
30-
"invoiceNumber": "3304"
30+
"invoiceNumber": "3304",
31+
"eventType": "CanceledCredit"
3132
}
3233
}
3334
]

0 commit comments

Comments
 (0)