Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.Consumption to add versi…
Browse files Browse the repository at this point in the history 
…on stable/2019-10-01 (Azure#13402)

* Completenese for Credits,Events and Lots

* Completenese for Events

* Completenese for Events

* Prettier updates applied.

* Model Validation fix
  • Loading branch information
@karthikku-2020 @mkarmark
karthikku-2020 authored and mkarmark committed Jul 20, 2021
1 parent 2715844 commit 7d3d84f
Show file tree
Hide file tree
Showing 7 changed files with 459 additions and 26 deletions.
193 changes: 173 additions & 20 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/events": {
"/{scope}/providers/Microsoft.Consumption/events": {
"get": {
"tags": [
"Events"
Expand All @@ -1609,15 +1609,12 @@
"x-ms-examples": {
"EventsListByBillingProfile": {
"$ref": "./examples/EventsListByBillingProfile.json"
},
"EventsList-Modern": {
"$ref": "./examples/EventsListByCustomer.json"
}
},
"parameters": [
{
"$ref": "#/parameters/billingAccountIdParameter"
},
{
"$ref": "#/parameters/billingProfileIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
},
Expand All @@ -1626,6 +1623,9 @@
},
{
"$ref": "#/parameters/endDateParameter"
},
{
"$ref": "#/parameters/scopeEventsParameter"
}
],
"responses": {
Expand All @@ -1647,7 +1647,7 @@
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/lots": {
"/{scope}/providers/Microsoft.Consumption/lots": {
"get": {
"tags": [
"Lots"
Expand All @@ -1658,16 +1658,16 @@
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
},
"x-ms-examples": {
"EventsListByBillingProfile": {
"LotsListByBillingProfile": {
"$ref": "./examples/LotsListByBillingProfile.json"
},
"LotsList-Modern": {
"$ref": "./examples/LotsListByCustomer.json"
}
},
"parameters": [
{
"$ref": "#/parameters/billingAccountIdParameter"
},
{
"$ref": "#/parameters/billingProfileIdParameter"
"$ref": "#/parameters/scopeLotsParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
Expand All @@ -1692,7 +1692,7 @@
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/credits/balanceSummary": {
"/{scope}/providers/Microsoft.Consumption/credits/balanceSummary": {
"get": {
"tags": [
"Credits"
Expand All @@ -1703,19 +1703,19 @@
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
},
"x-ms-examples": {
"CreditSummaryByBillingProfile": {
"CreditsBalanceSummaryByBillingProfile": {
"$ref": "./examples/CreditSummaryByBillingProfile.json"
},
"CreditsBalanceSummary-Modern": {
"$ref": "./examples/CreditSummaryByCustomer.json"
}
},
"parameters": [
{
"$ref": "#/parameters/billingAccountIdParameter"
},
{
"$ref": "#/parameters/billingProfileIdParameter"
"$ref": "#/parameters/apiVersionParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
"$ref": "#/parameters/scopeCreditsParameter"
}
],
"responses": {
Expand Down Expand Up @@ -4848,6 +4848,16 @@
"EventProperties": {
"description": "The event properties.",
"properties": {
"creditCurrency": {
"description": "Credit Currency",
"type": "string",
"readOnly": true
},
"billingCurrency": {
"description": "Billing Currency.",
"type": "string",
"readOnly": true
},
"transactionDate": {
"description": "Transaction date.",
"type": "string",
Expand All @@ -4864,26 +4874,51 @@
"readOnly": true,
"$ref": "#/definitions/amount"
},
"newCreditInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"adjustments": {
"description": "Adjustments amount.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"adjustmentsInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"creditExpired": {
"description": "Credit expired.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"creditExpiredInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"charges": {
"description": "Charges amount.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"chargesInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"closedBalance": {
"description": "Closed balance.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"closedBalanceInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"eventType": {
"description": "The type of event.",
"type": "string",
Expand All @@ -4905,6 +4940,11 @@
"description": "Invoice number.",
"type": "string",
"readOnly": true
},
"reseller": {
"description": "Reseller details.",
"readOnly": true,
"$ref": "#/definitions/Reseller"
}
}
},
Expand Down Expand Up @@ -4945,16 +4985,36 @@
"LotProperties": {
"description": "The lot properties.",
"properties": {
"creditCurrency": {
"description": "Credit Currency",
"type": "string",
"readOnly": true
},
"billingCurrency": {
"description": "Billing Currency.",
"type": "string",
"readOnly": true
},
"originalAmount": {
"description": "Original amount.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"originalAmountInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"closedBalance": {
"description": "Closed balance.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"closedBalanceInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"source": {
"description": "Lot source.",
"type": "string",
Expand Down Expand Up @@ -4984,6 +5044,11 @@
"description": "PO number.",
"type": "string",
"readOnly": true
},
"reseller": {
"description": "Reseller details.",
"readOnly": true,
"$ref": "#/definitions/Reseller"
}
}
},
Expand All @@ -5007,6 +5072,16 @@
"description": "The properties of the credit summary.",
"type": "object",
"properties": {
"creditCurrency": {
"description": "Credit Currency",
"type": "string",
"readOnly": true
},
"billingCurrency": {
"description": "Billing Currency.",
"type": "string",
"readOnly": true
},
"balanceSummary": {
"description": "Summary of balances associated with this credit summary.",
"readOnly": true,
Expand All @@ -5026,6 +5101,11 @@
"description": "Pending eligible charges.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"reseller": {
"description": "Reseller details.",
"readOnly": true,
"$ref": "#/definitions/Reseller"
}
}
},
Expand All @@ -5041,6 +5121,16 @@
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/amount"
},
"estimatedBalanceInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
},
"currentBalanceInBillingCurrency": {
"description": "Current balance.",
"readOnly": true,
"$ref": "#/definitions/AmountWithExchangeRate"
}
}
},
Expand All @@ -5060,6 +5150,42 @@
}
}
},
"AmountWithExchangeRate": {
"description": "Reseller details",
"allOf": [
{
"$ref": "#/definitions/amount"
}
],
"properties": {
"exchangeRate": {
"description": "Exchange Rate.",
"type": "number",
"format": "decimal",
"readOnly": true
},
"exchangeRateMonth": {
"description": "Exchange rate month.",
"type": "number",
"readOnly": true
}
}
},
"Reseller": {
"description": "Reseller details",
"properties": {
"resellerId": {
"description": "Reseller id.",
"type": "string",
"readOnly": true
},
"resellerDescription": {
"description": "Reseller Description.",
"type": "string",
"readOnly": true
}
}
},
"Resource": {
"description": "The Resource model definition.",
"properties": {
Expand Down Expand Up @@ -5174,6 +5300,33 @@
"x-ms-parameter-location": "method",
"x-ms-skip-url-encoding": true
},
"scopeCreditsParameter": {
"name": "scope",
"in": "path",
"required": true,
"type": "string",
"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.",
"x-ms-parameter-location": "method",
"x-ms-skip-url-encoding": true
},
"scopeEventsParameter": {
"name": "scope",
"in": "path",
"required": true,
"type": "string",
"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.",
"x-ms-parameter-location": "method",
"x-ms-skip-url-encoding": true
},
"scopeLotsParameter": {
"name": "scope",
"in": "path",
"required": true,
"type": "string",
"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.",
"x-ms-parameter-location": "method",
"x-ms-skip-url-encoding": true
},
"scopeUsageDetailsParameter": {
"name": "scope",
"in": "path",
Expand Down
3 changes: 1 addition & 2 deletions ...nager/Microsoft.Consumption/stable/2019-10-01/examples/CreditSummaryByBillingProfile.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"parameters": {
"api-version": "2019-10-01",
"billingAccountId": "1234:5678",
"billingProfileId": "2468"
"scope": "providers/Microsoft.Billing/billingAccounts/1234:5678/billingProfiles/2468"
},
"responses": {
"200": {
Expand Down
Loading

0 comments on commit 7d3d84f

Please sign in to comment.