Skip to content

Commit 0b97c66

Browse files
karthikku-2020karthikku-2020
authored
[Hub Generated] Review request for Microsoft.Consumption to add version stable/2019-10-01 (#13402)
* Completenese for Credits,Events and Lots * Completenese for Events * Completenese for Events * Prettier updates applied. * Model Validation fix
1 parent 209a0a2 commit 0b97c66

File tree

7 files changed

+459
-26
lines changed

7 files changed

+459
-26
lines changed

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json‎

Lines changed: 173 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@
15961596
}
15971597
}
15981598
},
1599-
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/events": {
1599+
"/{scope}/providers/Microsoft.Consumption/events": {
16001600
"get": {
16011601
"tags": [
16021602
"Events"
@@ -1609,15 +1609,12 @@
16091609
"x-ms-examples": {
16101610
"EventsListByBillingProfile": {
16111611
"$ref": "./examples/EventsListByBillingProfile.json"
1612+
},
1613+
"EventsList-Modern": {
1614+
"$ref": "./examples/EventsListByCustomer.json"
16121615
}
16131616
},
16141617
"parameters": [
1615-
{
1616-
"$ref": "#/parameters/billingAccountIdParameter"
1617-
},
1618-
{
1619-
"$ref": "#/parameters/billingProfileIdParameter"
1620-
},
16211618
{
16221619
"$ref": "#/parameters/apiVersionParameter"
16231620
},
@@ -1626,6 +1623,9 @@
16261623
},
16271624
{
16281625
"$ref": "#/parameters/endDateParameter"
1626+
},
1627+
{
1628+
"$ref": "#/parameters/scopeEventsParameter"
16291629
}
16301630
],
16311631
"responses": {
@@ -1647,7 +1647,7 @@
16471647
}
16481648
}
16491649
},
1650-
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/lots": {
1650+
"/{scope}/providers/Microsoft.Consumption/lots": {
16511651
"get": {
16521652
"tags": [
16531653
"Lots"
@@ -1658,16 +1658,16 @@
16581658
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
16591659
},
16601660
"x-ms-examples": {
1661-
"EventsListByBillingProfile": {
1661+
"LotsListByBillingProfile": {
16621662
"$ref": "./examples/LotsListByBillingProfile.json"
1663+
},
1664+
"LotsList-Modern": {
1665+
"$ref": "./examples/LotsListByCustomer.json"
16631666
}
16641667
},
16651668
"parameters": [
16661669
{
1667-
"$ref": "#/parameters/billingAccountIdParameter"
1668-
},
1669-
{
1670-
"$ref": "#/parameters/billingProfileIdParameter"
1670+
"$ref": "#/parameters/scopeLotsParameter"
16711671
},
16721672
{
16731673
"$ref": "#/parameters/apiVersionParameter"
@@ -1692,7 +1692,7 @@
16921692
}
16931693
}
16941694
},
1695-
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/credits/balanceSummary": {
1695+
"/{scope}/providers/Microsoft.Consumption/credits/balanceSummary": {
16961696
"get": {
16971697
"tags": [
16981698
"Credits"
@@ -1703,19 +1703,19 @@
17031703
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
17041704
},
17051705
"x-ms-examples": {
1706-
"CreditSummaryByBillingProfile": {
1706+
"CreditsBalanceSummaryByBillingProfile": {
17071707
"$ref": "./examples/CreditSummaryByBillingProfile.json"
1708+
},
1709+
"CreditsBalanceSummary-Modern": {
1710+
"$ref": "./examples/CreditSummaryByCustomer.json"
17081711
}
17091712
},
17101713
"parameters": [
17111714
{
1712-
"$ref": "#/parameters/billingAccountIdParameter"
1713-
},
1714-
{
1715-
"$ref": "#/parameters/billingProfileIdParameter"
1715+
"$ref": "#/parameters/apiVersionParameter"
17161716
},
17171717
{
1718-
"$ref": "#/parameters/apiVersionParameter"
1718+
"$ref": "#/parameters/scopeCreditsParameter"
17191719
}
17201720
],
17211721
"responses": {
@@ -4848,6 +4848,16 @@
48484848
"EventProperties": {
48494849
"description": "The event properties.",
48504850
"properties": {
4851+
"creditCurrency": {
4852+
"description": "Credit Currency",
4853+
"type": "string",
4854+
"readOnly": true
4855+
},
4856+
"billingCurrency": {
4857+
"description": "Billing Currency.",
4858+
"type": "string",
4859+
"readOnly": true
4860+
},
48514861
"transactionDate": {
48524862
"description": "Transaction date.",
48534863
"type": "string",
@@ -4864,26 +4874,51 @@
48644874
"readOnly": true,
48654875
"$ref": "#/definitions/amount"
48664876
},
4877+
"newCreditInBillingCurrency": {
4878+
"description": "Current balance.",
4879+
"readOnly": true,
4880+
"$ref": "#/definitions/AmountWithExchangeRate"
4881+
},
48674882
"adjustments": {
48684883
"description": "Adjustments amount.",
48694884
"readOnly": true,
48704885
"$ref": "#/definitions/amount"
48714886
},
4887+
"adjustmentsInBillingCurrency": {
4888+
"description": "Current balance.",
4889+
"readOnly": true,
4890+
"$ref": "#/definitions/AmountWithExchangeRate"
4891+
},
48724892
"creditExpired": {
48734893
"description": "Credit expired.",
48744894
"readOnly": true,
48754895
"$ref": "#/definitions/amount"
48764896
},
4897+
"creditExpiredInBillingCurrency": {
4898+
"description": "Current balance.",
4899+
"readOnly": true,
4900+
"$ref": "#/definitions/AmountWithExchangeRate"
4901+
},
48774902
"charges": {
48784903
"description": "Charges amount.",
48794904
"readOnly": true,
48804905
"$ref": "#/definitions/amount"
48814906
},
4907+
"chargesInBillingCurrency": {
4908+
"description": "Current balance.",
4909+
"readOnly": true,
4910+
"$ref": "#/definitions/AmountWithExchangeRate"
4911+
},
48824912
"closedBalance": {
48834913
"description": "Closed balance.",
48844914
"readOnly": true,
48854915
"$ref": "#/definitions/amount"
48864916
},
4917+
"closedBalanceInBillingCurrency": {
4918+
"description": "Current balance.",
4919+
"readOnly": true,
4920+
"$ref": "#/definitions/AmountWithExchangeRate"
4921+
},
48874922
"eventType": {
48884923
"description": "The type of event.",
48894924
"type": "string",
@@ -4905,6 +4940,11 @@
49054940
"description": "Invoice number.",
49064941
"type": "string",
49074942
"readOnly": true
4943+
},
4944+
"reseller": {
4945+
"description": "Reseller details.",
4946+
"readOnly": true,
4947+
"$ref": "#/definitions/Reseller"
49084948
}
49094949
}
49104950
},
@@ -4945,16 +4985,36 @@
49454985
"LotProperties": {
49464986
"description": "The lot properties.",
49474987
"properties": {
4988+
"creditCurrency": {
4989+
"description": "Credit Currency",
4990+
"type": "string",
4991+
"readOnly": true
4992+
},
4993+
"billingCurrency": {
4994+
"description": "Billing Currency.",
4995+
"type": "string",
4996+
"readOnly": true
4997+
},
49484998
"originalAmount": {
49494999
"description": "Original amount.",
49505000
"readOnly": true,
49515001
"$ref": "#/definitions/amount"
49525002
},
5003+
"originalAmountInBillingCurrency": {
5004+
"description": "Current balance.",
5005+
"readOnly": true,
5006+
"$ref": "#/definitions/AmountWithExchangeRate"
5007+
},
49535008
"closedBalance": {
49545009
"description": "Closed balance.",
49555010
"readOnly": true,
49565011
"$ref": "#/definitions/amount"
49575012
},
5013+
"closedBalanceInBillingCurrency": {
5014+
"description": "Current balance.",
5015+
"readOnly": true,
5016+
"$ref": "#/definitions/AmountWithExchangeRate"
5017+
},
49585018
"source": {
49595019
"description": "Lot source.",
49605020
"type": "string",
@@ -4984,6 +5044,11 @@
49845044
"description": "PO number.",
49855045
"type": "string",
49865046
"readOnly": true
5047+
},
5048+
"reseller": {
5049+
"description": "Reseller details.",
5050+
"readOnly": true,
5051+
"$ref": "#/definitions/Reseller"
49875052
}
49885053
}
49895054
},
@@ -5007,6 +5072,16 @@
50075072
"description": "The properties of the credit summary.",
50085073
"type": "object",
50095074
"properties": {
5075+
"creditCurrency": {
5076+
"description": "Credit Currency",
5077+
"type": "string",
5078+
"readOnly": true
5079+
},
5080+
"billingCurrency": {
5081+
"description": "Billing Currency.",
5082+
"type": "string",
5083+
"readOnly": true
5084+
},
50105085
"balanceSummary": {
50115086
"description": "Summary of balances associated with this credit summary.",
50125087
"readOnly": true,
@@ -5026,6 +5101,11 @@
50265101
"description": "Pending eligible charges.",
50275102
"readOnly": true,
50285103
"$ref": "#/definitions/amount"
5104+
},
5105+
"reseller": {
5106+
"description": "Reseller details.",
5107+
"readOnly": true,
5108+
"$ref": "#/definitions/Reseller"
50295109
}
50305110
}
50315111
},
@@ -5041,6 +5121,16 @@
50415121
"description": "Current balance.",
50425122
"readOnly": true,
50435123
"$ref": "#/definitions/amount"
5124+
},
5125+
"estimatedBalanceInBillingCurrency": {
5126+
"description": "Current balance.",
5127+
"readOnly": true,
5128+
"$ref": "#/definitions/AmountWithExchangeRate"
5129+
},
5130+
"currentBalanceInBillingCurrency": {
5131+
"description": "Current balance.",
5132+
"readOnly": true,
5133+
"$ref": "#/definitions/AmountWithExchangeRate"
50445134
}
50455135
}
50465136
},
@@ -5060,6 +5150,42 @@
50605150
}
50615151
}
50625152
},
5153+
"AmountWithExchangeRate": {
5154+
"description": "Reseller details",
5155+
"allOf": [
5156+
{
5157+
"$ref": "#/definitions/amount"
5158+
}
5159+
],
5160+
"properties": {
5161+
"exchangeRate": {
5162+
"description": "Exchange Rate.",
5163+
"type": "number",
5164+
"format": "decimal",
5165+
"readOnly": true
5166+
},
5167+
"exchangeRateMonth": {
5168+
"description": "Exchange rate month.",
5169+
"type": "number",
5170+
"readOnly": true
5171+
}
5172+
}
5173+
},
5174+
"Reseller": {
5175+
"description": "Reseller details",
5176+
"properties": {
5177+
"resellerId": {
5178+
"description": "Reseller id.",
5179+
"type": "string",
5180+
"readOnly": true
5181+
},
5182+
"resellerDescription": {
5183+
"description": "Reseller Description.",
5184+
"type": "string",
5185+
"readOnly": true
5186+
}
5187+
}
5188+
},
50635189
"Resource": {
50645190
"description": "The Resource model definition.",
50655191
"properties": {
@@ -5174,6 +5300,33 @@
51745300
"x-ms-parameter-location": "method",
51755301
"x-ms-skip-url-encoding": true
51765302
},
5303+
"scopeCreditsParameter": {
5304+
"name": "scope",
5305+
"in": "path",
5306+
"required": true,
5307+
"type": "string",
5308+
"description": "The scope associated with credits operations. This includes '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for Billing Profile scope, and 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for partners.",
5309+
"x-ms-parameter-location": "method",
5310+
"x-ms-skip-url-encoding": true
5311+
},
5312+
"scopeEventsParameter": {
5313+
"name": "scope",
5314+
"in": "path",
5315+
"required": true,
5316+
"type": "string",
5317+
"description": "The scope associated with events operations. This includes '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for Billing Profile scope, and 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for partners.",
5318+
"x-ms-parameter-location": "method",
5319+
"x-ms-skip-url-encoding": true
5320+
},
5321+
"scopeLotsParameter": {
5322+
"name": "scope",
5323+
"in": "path",
5324+
"required": true,
5325+
"type": "string",
5326+
"description": "The scope associated with Lots operations. This includes '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for Billing Profile scope, and 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for partners.",
5327+
"x-ms-parameter-location": "method",
5328+
"x-ms-skip-url-encoding": true
5329+
},
51775330
"scopeUsageDetailsParameter": {
51785331
"name": "scope",
51795332
"in": "path",

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/examples/CreditSummaryByBillingProfile.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"parameters": {
33
"api-version": "2019-10-01",
4-
"billingAccountId": "1234:5678",
5-
"billingProfileId": "2468"
4+
"scope": "providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468"
65
},
76
"responses": {
87
"200": {

0 commit comments

Comments
 (0)