From 0d108898f8b9c148e86a1b749b1b196df6e244c8 Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Wed, 11 Apr 2018 22:15:39 -0700 Subject: [PATCH 01/10] This PR includes above-subscription level (Enrollment, Department, or Account) Marketplace, Usage Details, and Enrollment Level Balances. --- .../stable/2018-03-31/consumption.json | 1272 ++++++++++++++++- .../examples/BalancesByBillingAccount.json | 50 + .../MarketplacesByBillingAccountList.json | 42 + ...sByBillingAccountListForBillingPeriod.json | 44 + .../MarketplacesByDepartmentList.json | 44 + ...lacesByDepartment_ListByBillingPeriod.json | 44 + .../MarketplacesByEnrollmentAccountList.json | 44 + ...nrollmentAccounts_ListByBillingPeriod.json | 44 + .../UsageDetailsListByBillingAccount.json | 40 + .../UsageDetailsListByDepartment.json | 40 + .../UsageDetailsListByEnrollmentAccount.json | 40 + ...sListForBillingPeriodByBillingAccount.json | 39 + ...tailsListForBillingPeriodByDepartment.json | 39 + ...stForBillingPeriodByEnrollmentAccount.json | 39 + 14 files changed, 1747 insertions(+), 74 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index b4e43114095f..ab5705bf61fd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -40,7 +40,7 @@ "UsageDetails" ], "operationId": "UsageDetails_List", - "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "description": "Lists the usage details for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -57,21 +57,912 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "name": "$expand", - "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetails_ListByBillingPeriod", + "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriod.json" + }, + "UsageDetailsExpand": { + "$ref": "./examples/UsageDetailsExpand.json" + }, + "UsageDetailsListForBillingPeriodGroupByTag": { + "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByBillingAccount_List", + "description": "Lists the usage details by billingAccountId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsList": { + "$ref": "./examples/UsageDetailsListByBillingAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByBillingAccount_ListByBillingPeriod", + "description": "Lists the usage details based on billingAccountId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByBillingAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByDepartment_List", + "description": "Lists the usage details by departmentId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsList": { + "$ref": "./examples/UsageDetailsListByDepartment.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/departmentIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { +"get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByDepartment_ListByBillingPeriod", + "description": "Lists the usage details based on departmentId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByDepartment.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/departmentIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByEnrollmentAccount_List", + "description": "Lists the usage details by enrollmentAccountId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsList": { + "$ref": "./examples/UsageDetailsListByEnrollmentAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/enrollmentAccountIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { +"get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByEnrollmentAccount_ListByBillingPeriod", + "description": "Lists the usage details based on enrollmentAccountId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/enrollmentAccountIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "Marketplaces_List", + "description": "Lists the marketplaces for a scope by subscriptionId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesList": { + "$ref": "./examples/MarketplacesList.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "Marketplaces_ListByBillingPeriod", + "description": "Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesListForBillingPeriod.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "MarketplacesByBillingAccount_List", + "description": "Lists the marketplaces for a scope by billingAccountId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesList": { + "$ref": "./examples/MarketplacesByBillingAccountList.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "MarketplacesByBillingAccount_ListByBillingPeriod", + "description": "Lists the marketplaces for a scope by billing period and billingAccountId. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByBillingAccountListForBillingPeriod.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", "in": "query", "required": false, "type": "string" }, { - "name": "$filter", - "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", "in": "query", "required": false, - "type": "string" + "type": "integer", + "minimum": 1, + "maximum": 1000 }, { "name": "$skiptoken", @@ -81,35 +972,20 @@ "type": "string" }, { - "name": "$top", - "description": "May be used to limit the number of results to the most recent N usageDetails.", - "in": "query", - "required": false, - "type": "integer", - "minimum": 1, - "maximum": 1000 + "$ref": "#/parameters/apiVersionParameter" }, { - "name": "$apply", - "description": "OData apply expression to aggregatie usageDetails by tags or (tags and properties/usageStart)", - "in": "query", - "required": false, - "type": "string", - "x-ms-parameter-location": "method", - "x-ms-parameter-grouping": { - "name": "QueryOptions" - }, - "x-ms-client-name": "Apply" + "$ref": "#/parameters/billingAccountIdParameter" }, { - "$ref": "#/parameters/apiVersionParameter" + "$ref": "#/parameters/billingPeriodNameParameter" } ], "responses": { "200": { "description": "OK. The request has succeeded.", "schema": { - "$ref": "#/definitions/UsageDetailsListResult" + "$ref": "#/definitions/MarketplacesListResult" } }, "default": { @@ -124,59 +1000,104 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ - "UsageDetails" + "Marketplaces" ], - "operationId": "UsageDetails_ListByBillingPeriod", - "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "MarketplacesByDepartment_List", + "description": "Lists the marketplaces for a scope by departmentId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { - "UsageDetailsListForBillingPeriod": { - "$ref": "./examples/UsageDetailsListForBillingPeriod.json" - }, - "UsageDetailsExpand": { - "$ref": "./examples/UsageDetailsExpand.json" - }, - "UsageDetailsListForBillingPeriodGroupByTag": { - "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json" + "MarketplacesList": { + "$ref": "./examples/MarketplacesByDepartmentList.json" } }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" }, { - "$ref": "#/parameters/billingPeriodNameParameter" + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 }, { - "name": "$expand", - "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", "in": "query", "required": false, "type": "string" }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/departmentIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "MarketplacesByDepartment_ListByBillingPeriod", + "description": "Lists the marketplaces for a scope by billing period and departmentId. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByDepartment_ListByBillingPeriod.json" + } + }, + "parameters": [ { "name": "$filter", - "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", "in": "query", "required": false, "type": "string" }, { - "name": "$apply", - "description": "OData apply expression to aggregatie usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", "in": "query", "required": false, - "type": "string", - "x-ms-parameter-location": "method", - "x-ms-parameter-grouping": { - "name": "QueryOptions" - }, - "x-ms-client-name": "Apply" + "type": "integer", + "minimum": 1, + "maximum": 1000 }, { "name": "$skiptoken", @@ -186,23 +1107,20 @@ "type": "string" }, { - "name": "$top", - "description": "May be used to limit the number of results to the most recent N usageDetails.", - "in": "query", - "required": false, - "type": "integer", - "minimum": 1, - "maximum": 1000 + "$ref": "#/parameters/apiVersionParameter" }, { - "$ref": "#/parameters/apiVersionParameter" + "$ref": "#/parameters/departmentIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" } ], "responses": { "200": { "description": "OK. The request has succeeded.", "schema": { - "$ref": "#/definitions/UsageDetailsListResult" + "$ref": "#/definitions/MarketplacesListResult" } }, "default": { @@ -217,20 +1135,20 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" ], "x-ms-odata": "#/definitions/Marketplace", - "operationId": "Marketplaces_List", - "description": "Lists the marketplaces for a scope by subscriptionId. Marketplaces are available via this API only for May 1, 2014 or later.", + "operationId": "MarketplacesByEnrollmentAccounts_List", + "description": "Lists the marketplaces for a scope by enrollmentAccountId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { "MarketplacesList": { - "$ref": "./examples/MarketplacesList.json" + "$ref": "./examples/MarketplacesByEnrollmentAccountList.json" } }, "parameters": [ @@ -261,7 +1179,7 @@ "$ref": "#/parameters/apiVersionParameter" }, { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "#/parameters/enrollmentAccountIdParameter" } ], "responses": { @@ -283,20 +1201,20 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" ], "x-ms-odata": "#/definitions/Marketplace", - "operationId": "Marketplaces_ListByBillingPeriod", - "description": "Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are available via this API only for May 1, 2014 or later.", + "operationId": "MarketplacesByEnrollmentAccounts_ListByBillingPeriod", + "description": "Lists the marketplaces for a scope by billing period and enrollmentAccountId. Marketplaces are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { "MarketplacesListForBillingPeriod": { - "$ref": "./examples/MarketplacesListForBillingPeriod.json" + "$ref": "./examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json" } }, "parameters": [ @@ -327,7 +1245,7 @@ "$ref": "#/parameters/apiVersionParameter" }, { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "#/parameters/enrollmentAccountIdParameter" }, { "$ref": "#/parameters/billingPeriodNameParameter" @@ -352,7 +1270,47 @@ } } }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationSummaries": { + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/balances": { + "get": { + "tags": [ + "Balances" + ], + "x-ms-odata": "#/definitions/Balance", + "operationId": "BalancesByBillingAccount", + "description": "Gets the balances for a scope by billingAccountId. Balances are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "Balances": { + "$ref": "./examples/BalancesByBillingAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Balance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationSummaries": { "get": { "tags": [ "ReservedInstances" @@ -1511,7 +2469,152 @@ } } }, - "ReservationSummaries": { + "Balance": { + "description": "A balance resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/BalanceProperties", + "title": "Balance properties" + } + } + }, + "BalanceProperties": { + "description": "The properties of the balance.", + "type": "object", + "properties": { + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "beginningBalance": { + "description": "The beginning balance for the billing period.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "endingBalance": { + "description": "The ending balance for the billing period (for open periods this will be updated daily).", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "newPurchases": { + "description": "Total new purchase amount.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "adjustments": { + "description": "Total adjustment amount.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "utilized": { + "description": "Total Commitment usage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "serviceOverage": { + "description": "Overage for Azure services.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges Billed separately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "totalOverage": { + "description": "serviceOverage + chargesBilledSeparately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "totalUsage": { + "description": "Azure service commitment + total Overage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "azureMarketplaceServiceCharges": { + "description": "Total charges for Azure Marketplace.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "billingFrequency": { + "description": "The billing frequency.", + "type": "string", + "enum": [ + "Month", + "Quarter", + "Year" + ], + "x-ms-enum": { + "name": "BillingFrequency", + "modelAsString": true + } + }, + "priceHidden": { + "description": "Price is hidden or not.", + "type": "boolean", + "readOnly": true + }, + "newPurchasesDetails": { + "description": "List of new purchases.", + "type": "array", + "items": { + "type" : "object", + "properties" : { + "name" : { + "description": "the name of new purchase.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "the value of new purchase.", + "type": "object", + "readOnly": true + } + } + }, + "readOnly": true + }, + "adjustmentDetails": { + "description": "List of Adjustments (Promo credit, SIE credit etc.).", + "type": "array", + "items": { + "type" : "object", + "properties" : { + "name" : { + "description": "the name of new adjustment.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "the value of new adjustment.", + "type": "object", + "readOnly": true + } + } + }, + "readOnly": true + } + } + }, + "ReservationSummaries": { "description": "reservation summaries resource.", "type": "object", "allOf": [ @@ -2246,6 +3349,27 @@ "type": "string", "description": "Version of the API to be used with the client request. The current version is 2018-03-31." }, + "billingAccountIdParameter": { + "name": "billingAccountId", + "in": "path", + "description": "BillingAccount ID", + "required": true, + "type": "string" + }, + "departmentIdParameter": { + "name": "departmentId", + "in": "path", + "description": "Department ID", + "required": true, + "type": "string" + }, + "enrollmentAccountIdParameter": { + "name": "enrollmentAccountId", + "in": "path", + "description": "EnrollmentAccount ID", + "required": true, + "type": "string" + }, "subscriptionIdParameter": { "name": "subscriptionId", "in": "path", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json new file mode 100644 index 000000000000..cba1ba75a5c8 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "123456" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json new file mode 100644 index 000000000000..beb3e8551fa1 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "123456" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplaceId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan1", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json new file mode 100644 index 000000000000..0dca0d27b477 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json new file mode 100644 index 000000000000..4c04168b9846 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "departmentId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json new file mode 100644 index 000000000000..5f008357c5b0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "departmentId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json new file mode 100644 index 000000000000..be99af0b1ae3 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "enrollmentAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json new file mode 100644 index 000000000000..9319d56b8210 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "enrollmentAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json new file mode 100644 index 000000000000..6c61f9aeafc6 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": + "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": + "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json new file mode 100644 index 000000000000..434bffcd55ca --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "departmentId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": + "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": + "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json new file mode 100644 index 000000000000..7cbb24f296a8 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "enrollmentAccountId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": + "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": + "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json new file mode 100644 index 000000000000..bbacd59a10af --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json new file mode 100644 index 000000000000..7ac51c392a91 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "departmentId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json new file mode 100644 index 000000000000..b128e5038a4a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "enrollmentAccountId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file From 247831ccb7ce1ee4c8e73d662f239aef4b3aebae Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Thu, 12 Apr 2018 12:01:12 -0700 Subject: [PATCH 02/10] Updated consumption.json to fix build failure issues --- .../stable/2018-03-31/consumption.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 1ada71bd6567..48a6ea026e1a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1275,7 +1275,6 @@ "tags": [ "Balances" ], - "x-ms-odata": "#/definitions/Balance", "operationId": "BalancesByBillingAccount", "description": "Gets the balances for a scope by billingAccountId. Balances are available via this API only for May 1, 2014 or later.", "externalDocs": { @@ -3505,14 +3504,6 @@ "required": true, "type": "string" }, - "billingAccountIdParameter": { - "name": "billingAccountId", - "in": "path", - "description": "Azure Billing Account ID.", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, "resourceGroupNameParameter": { "name": "resourceGroupName", "in": "path", From a198973ea78cb1e5c2a9b508f2960ba61a61b56e Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Thu, 12 Apr 2018 16:14:08 -0700 Subject: [PATCH 03/10] Added "Get" to Operation Name 'BalancesByBillingAccount' and also replaced priceHidden boolean type with enum for more clarity --- .../stable/2018-03-31/consumption.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 48a6ea026e1a..3ba35b978a40 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1275,7 +1275,7 @@ "tags": [ "Balances" ], - "operationId": "BalancesByBillingAccount", + "operationId": "GetBalancesByBillingAccount", "description": "Gets the balances for a scope by billingAccountId. Balances are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -2659,8 +2659,15 @@ }, "priceHidden": { "description": "Price is hidden or not.", - "type": "boolean", - "readOnly": true + "type": "string", + "enum": [ + "True", + "False" + ], + "x-ms-enum": { + "name": "priceHidden", + "modelAsString": true + } }, "newPurchasesDetails": { "description": "List of new purchases.", From c70d23f20574fae4d0401dddb21e6abf57ae5a7c Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Tue, 17 Apr 2018 16:43:31 -0700 Subject: [PATCH 04/10] Added Enrollment-Level balances by BillingPeriod --- .../stable/2018-03-31/consumption.json | 42 +++++++++++++++ ...ancesByBillingAccountForBillingPeriod.json | 51 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 3ba35b978a40..057c92e4c112 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1308,6 +1308,48 @@ } } } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances": { + "get": { + "tags": [ + "Balances" + ], + "operationId": "GetBalancesByBillingAccount_ByBillingPeriod", + "description": "Gets the balances for a scope by billing period and billingAccountId. Balances are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "Balances": { + "$ref": "./examples/BalancesByBillingAccountForBillingPeriod.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Balance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } }, "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationSummaries": { "get": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json new file mode 100644 index 000000000000..c0d532964984 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } + } + ] + } + } + } +} \ No newline at end of file From f00a550a27e9e3666b45979a89d6995463e0c751 Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Tue, 17 Apr 2018 17:13:04 -0700 Subject: [PATCH 05/10] Updated BalancesByBillingAccount example files and added x-ms-parameter-location to some parameters missing that part. --- .../stable/2018-03-31/consumption.json | 9 ++- .../examples/BalancesByBillingAccount.json | 72 +++++++++---------- ...ancesByBillingAccountForBillingPeriod.json | 72 +++++++++---------- 3 files changed, 74 insertions(+), 79 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 057c92e4c112..81a38c22f447 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -3530,21 +3530,24 @@ "in": "path", "description": "BillingAccount ID", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" }, "departmentIdParameter": { "name": "departmentId", "in": "path", "description": "Department ID", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" }, "enrollmentAccountIdParameter": { "name": "enrollmentAccountId", "in": "path", "description": "EnrollmentAccount ID", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" }, "subscriptionIdParameter": { "name": "subscriptionId", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json index cba1ba75a5c8..0269d216da80 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json @@ -6,44 +6,40 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", - "name": "balanceId1", - "type": "Microsoft.Consumption/balances", - "properties": { - "currency": "USD ", - "beginningBalance": 3396469.19, - "endingBalance": 2922371.02, - "newPurchases": 0, - "adjustments": 0, - "utilized": 474098.17, - "serviceOverage": 0, - "chargesBilledSeparately": 0, - "totalOverage": 0, - "totalUsage": 474098.17, - "azureMarketplaceServiceCharges": 609.82, - "billingFrequency": "Month", - "priceHidden": false, - "newPurchasesDetails": [ - { - "name": "Promo Purchase", - "value": 1 - } - ], - "adjustmentDetails": [ - { - "name": "Promo Credit", - "value": 1.1 - }, - { - "name": "SIE Credit", - "value": 1.0 - } - ] - } - } - ] + "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } } } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json index c0d532964984..7dba7aff2ea4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json @@ -7,44 +7,40 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", - "name": "balanceId1", - "type": "Microsoft.Consumption/balances", - "properties": { - "currency": "USD ", - "beginningBalance": 3396469.19, - "endingBalance": 2922371.02, - "newPurchases": 0, - "adjustments": 0, - "utilized": 474098.17, - "serviceOverage": 0, - "chargesBilledSeparately": 0, - "totalOverage": 0, - "totalUsage": 474098.17, - "azureMarketplaceServiceCharges": 609.82, - "billingFrequency": "Month", - "priceHidden": false, - "newPurchasesDetails": [ - { - "name": "Promo Purchase", - "value": 1 - } - ], - "adjustmentDetails": [ - { - "name": "Promo Credit", - "value": 1.1 - }, - { - "name": "SIE Credit", - "value": 1.0 - } - ] - } - } - ] + "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } } } } From 876f31ad62f306411aa315b888dda6ca8a7b3d7d Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Wed, 25 Apr 2018 17:08:07 -0700 Subject: [PATCH 06/10] Replaced Microsoft.CostManagment with Microsoft.Billing --- .../stable/2018-03-31/consumption.json | 30 +++++++++---------- .../examples/BalancesByBillingAccount.json | 2 +- ...ancesByBillingAccountForBillingPeriod.json | 2 +- .../examples/CostAllocationTags.json | 2 +- .../CreateOrUpdateCostAllocationTags.json | 4 +-- .../MarketplacesByBillingAccountList.json | 4 +-- ...sByBillingAccountListForBillingPeriod.json | 4 +-- .../MarketplacesByDepartmentList.json | 4 +-- ...lacesByDepartment_ListByBillingPeriod.json | 4 +-- .../MarketplacesByEnrollmentAccountList.json | 4 +-- ...nrollmentAccounts_ListByBillingPeriod.json | 4 +-- .../UsageDetailsListByBillingAccount.json | 6 ++-- .../UsageDetailsListByDepartment.json | 6 ++-- .../UsageDetailsListByEnrollmentAccount.json | 6 ++-- ...sListForBillingPeriodByBillingAccount.json | 6 ++-- ...tailsListForBillingPeriodByDepartment.json | 6 ++-- ...stForBillingPeriodByEnrollmentAccount.json | 6 ++-- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 81a38c22f447..575fcd2271cd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -217,7 +217,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -301,7 +301,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -388,7 +388,7 @@ } } }, - "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -472,7 +472,7 @@ } } }, - "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -559,7 +559,7 @@ } } }, - "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -643,7 +643,7 @@ } } }, - "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { "get": { "tags": [ "UsageDetails" @@ -865,7 +865,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -931,7 +931,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -1000,7 +1000,7 @@ } } }, - "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -1066,7 +1066,7 @@ } } }, - "/providers/Microsoft.CostManagement/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -1135,7 +1135,7 @@ } } }, - "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -1201,7 +1201,7 @@ } } }, - "/providers/Microsoft.CostManagement/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { "get": { "tags": [ "Marketplaces" @@ -1270,7 +1270,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/balances": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/balances": { "get": { "tags": [ "Balances" @@ -1309,7 +1309,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances": { "get": { "tags": [ "Balances" @@ -2142,7 +2142,7 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/costAllocationTags": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/costAllocationTags": { "get": { "tags": [ "CostAllocationTags" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json index 0269d216da80..3b9ce105fc88 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json @@ -6,7 +6,7 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", "name": "balanceId1", "type": "Microsoft.Consumption/balances", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json index 7dba7aff2ea4..1a0efcf4dcfc 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json @@ -7,7 +7,7 @@ "responses": { "200": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", + "id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", "name": "balanceId1", "type": "Microsoft.Consumption/balances", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json index b046c2b18b13..642838e0d55f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json @@ -6,7 +6,7 @@ "responses": { "200": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", + "id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json index 1a8a1b0e68cb..2f3e754cd084 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json @@ -22,7 +22,7 @@ "responses": { "201": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", + "id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", @@ -46,7 +46,7 @@ }, "200": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", + "id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json index beb3e8551fa1..b60ba36633e1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplaceId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -16,7 +16,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json index 0dca0d27b477..8c2b63872908 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -17,7 +17,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json index 4c04168b9846..9dfa9f192e55 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -17,7 +17,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json index 5f008357c5b0..46459faae17d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -17,7 +17,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json index be99af0b1ae3..9bceabcbec8a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -17,7 +17,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json index 9319d56b8210..5007be230830 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { @@ -17,7 +17,7 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", + "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json index 6c61f9aeafc6..1b0c22032b64 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByBillingAccount.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -18,8 +18,8 @@ }, "properties": { "billingPeriodId": - "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json index 434bffcd55ca..4d8dc4eba081 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByDepartment.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -18,8 +18,8 @@ }, "properties": { "billingPeriodId": - "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json index 7cbb24f296a8..5e5d56f6b358 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListByEnrollmentAccount.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -18,8 +18,8 @@ }, "properties": { "billingPeriodId": - "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json index bbacd59a10af..fdbdd6877439 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -17,8 +17,8 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json index 7ac51c392a91..95fa8087e1c9 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -17,8 +17,8 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json index b128e5038a4a..01fbbdabc372 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -17,8 +17,8 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.CostManagement/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", From d53bf4236a18df8994cafd83ca90de902d9da353 Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Thu, 26 Apr 2018 17:00:32 -0700 Subject: [PATCH 07/10] Fixed example errors --- .../stable/2018-03-31/consumption.json | 19 +++++++------------ .../examples/BalancesByBillingAccount.json | 6 +++--- ...ancesByBillingAccountForBillingPeriod.json | 6 +++--- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 629b96f31e72..eac7453f6c4f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -2184,8 +2184,8 @@ "tags": [ "CostTags" ], - "operationId": "CostTags_CreateOrUpdate", "description": "The operation to create or update cost tags assiciated with a billing account. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", + "operationId": "CostTags_CreateOrUpdate", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -2740,15 +2740,8 @@ }, "priceHidden": { "description": "Price is hidden or not.", - "type": "string", - "enum": [ - "True", - "False" - ], - "x-ms-enum": { - "name": "priceHidden", - "modelAsString": true - } + "type": "boolean", + "readOnly": true }, "newPurchasesDetails": { "description": "List of new purchases.", @@ -2763,7 +2756,8 @@ }, "value": { "description": "the value of new purchase.", - "type": "object", + "type": "number", + "format": "decimal", "readOnly": true } } @@ -2783,7 +2777,8 @@ }, "value": { "description": "the value of new adjustment.", - "type": "object", + "type": "number", + "format": "decimal", "readOnly": true } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json index 3b9ce105fc88..1b0685536635 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccount.json @@ -33,11 +33,11 @@ { "name": "Promo Credit", "value": 1.1 - }, - { + }, + { "name": "SIE Credit", "value": 1.0 - } + } ] } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json index 1a0efcf4dcfc..17bd27db06c2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BalancesByBillingAccountForBillingPeriod.json @@ -34,11 +34,11 @@ { "name": "Promo Credit", "value": 1.1 - }, - { + }, + { "name": "SIE Credit", "value": 1.0 - } + } ] } } From 12751061e78dc5b2f8eeef917245068f094e5d14 Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Mon, 6 Aug 2018 14:12:59 -0700 Subject: [PATCH 08/10] Introducing UsageDetails and Aggregated Cost by Managment Group Scope. Also updated some existing examples to include missing "billingperiod" in "billingPeriodId" Property. --- .../stable/2018-06-30/consumption.json | 320 +++++++++++++++++- .../AggregatedCostByManagementGroup.json | 37 ++ ...ListForBillingPeriodByManagementGroup.json | 38 +++ .../examples/BalancesByBillingAccount.json | 2 +- .../MarketplacesByBillingAccountList.json | 2 +- .../MarketplacesByDepartmentList.json | 2 +- .../MarketplacesByEnrollmentAccountList.json | 2 +- .../2018-06-30/examples/MarketplacesList.json | 2 +- .../2018-06-30/examples/PriceSheet.json | 2 +- .../2018-06-30/examples/UsageDetailsList.json | 2 +- .../UsageDetailsListByBillingAccount.json | 2 +- .../UsageDetailsListByDepartment.json | 2 +- .../UsageDetailsListByEnrollmentAccount.json | 2 +- .../UsageDetailsListByManagementGroup.json | 70 ++++ .../examples/UsageDetailsListFilterByTag.json | 2 +- ...ListForBillingPeriodByManagementGroup.json | 71 ++++ 16 files changed, 545 insertions(+), 13 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListForBillingPeriodByManagementGroup.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json index eaf850133b73..4d3f2b311cf8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json @@ -2327,7 +2327,259 @@ "nextLinkName": "nextLink" } } - } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetailsByManagementGroup_List", + "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsList": { + "$ref": "./examples/UsageDetailsListByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetails_ListByForBillingPeriodByManagementGroup", + "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by specified billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Consumption/aggregatedcost": { + "get": { + "tags": [ + "AggregatedCost" + ], + "operationId": "AggregatedcostByManagementGroup", + "description": "Provides the aggregate cost of a management group and all child management groups by current billing period.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "AggregatedCostByManagementGroup": { + "$ref": "./examples/AggregatedCostByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/Microsoft.Consumption/aggregatedcost": { + "get": { + "tags": [ + "AggregatedCost" + ], + "operationId": "AggregatedcostByManagementGroup_ByBillingPeriod", + "description": "Provides the aggregate cost of a management group and all child management groups by specified billing period", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "AggregatedCostListForBillingPeriodByManagementGroup": { + "$ref": "./examples/AggregatedCostListForBillingPeriodByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } }, "definitions": { "MeterDetails": { @@ -3651,7 +3903,64 @@ } } }, - "ErrorDetails": { + "ManagementGroupAggregatedCostResult": { + "description": "A management group aggregated cost resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ManagementGroupAggregatedCostProperties", + "title": "Management Group Aggregated Cost properties" + } + } + }, + "ManagementGroupAggregatedCostProperties": { + "description": "The properties of the Management Group Aggregated Cost.", + "type": "object", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the aggregated cost belongs to.", + "type": "string", + "readOnly": true + }, + "azureCharges": { + "description": "Azure Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "marketplaceCharges": { + "description": "Marketplace Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges Billed Separately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "children": { + "description": "Children of a management group", + "type": "array", + "items": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + } + } + }, + "ErrorDetails": { "description": "The details of the error.", "properties": { "code": { @@ -3901,6 +4210,13 @@ } ] } + }, + "managementGroupIdParameter": { + "name": "managementGroupId", + "in": "path", + "description": "Azure Management Group ID.", + "required": true, + "type": "string" } } } \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostByManagementGroup.json new file mode 100644 index 000000000000..f003f87c37c8 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostByManagementGroup.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2018-06-30", + "managementGroupId": "managementGroupForTest" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Billing/billingPeriods/201808/providers/Microsoft.Consumption/aggregatedcostId1", + "name": "aggregatedcostId1", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "billingPeriodId": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Billing/billingPeriods/201808", + "azureCharges": 250.9876, + "marketplaceCharges": 150.786, + "chargesBilledSeparately": 120.345, + "currency": "USD", + "children": [ + { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Billing/billingPeriods/201808/providers/Microsoft.Consumption/aggregatedcostId2", + "name": "aggregatedcostId2", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "billingPeriodId": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Billing/billingPeriods/201808", + "azureCharges": 150.0, + "marketplaceCharges": 50.786, + "chargesBilledSeparately": 30.345, + "currency": "USD", + "children": [] + } + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json new file mode 100644 index 000000000000..655c61387cb9 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-06-30", + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201807" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Billing/billingPeriods/201807/providers/Microsoft.Consumption/aggregatedcostId1", + "name": "aggregatedcostId1", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "billingPeriodId": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Billing/billingPeriods/201807", + "azureCharges": 250.9876, + "marketplaceCharges": 150.786, + "chargesBilledSeparately": 120.345, + "currency": "USD", + "children": [ + { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Billing/billingPeriods/201807/providers/Microsoft.Consumption/aggregatedcostId2", + "name": "aggregatedcostId2", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "billingPeriodId": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Billing/billingPeriods/201807", + "azureCharges": 150.0, + "marketplaceCharges": 50.786, + "chargesBilledSeparately": 30.345, + "currency": "USD", + "children": [] + } + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccount.json index 1b0685536635..01f121467d01 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccount.json @@ -6,7 +6,7 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Consumption/balances/balanceId1", + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", "name": "balanceId1", "type": "Microsoft.Consumption/balances", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByBillingAccountList.json index b60ba36633e1..117c6a7f9c0c 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByBillingAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByBillingAccountList.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplaceId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByDepartmentList.json index 9dfa9f192e55..46459faae17d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByDepartmentList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByDepartmentList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByEnrollmentAccountList.json index 9bceabcbec8a..5007be230830 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByEnrollmentAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesByEnrollmentAccountList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", "name": "marketplacesId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesList.json index 8c10effe6f71..b627d58a4016 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/MarketplacesList.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/subscriptions/subid/providers/Microsoft.Consumption/marketPlaces/marketplaceId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketPlaces/marketplaceId1", "name": "marketplaceId1", "type": "Microsoft.Consumption/marketPlaces", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/PriceSheet.json index c1169ac1284e..9c5fbbba39d7 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/PriceSheet.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/PriceSheet.json @@ -10,7 +10,7 @@ { "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/pricesheets/default", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default", "name": "default", "type": "Microsoft.Consumption/pricesheets", "properties": diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsList.json index 539ae37fa7d4..8198c2afb307 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsList.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByBillingAccount.json index 7c375e2b794b..3bd38f978b5f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByBillingAccount.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByDepartment.json index baac9c7005bc..2ac0a760905a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByDepartment.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByEnrollmentAccount.json index 5f729293c802..941f63477bb3 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByEnrollmentAccount.json @@ -9,7 +9,7 @@ "value": [ { "id": - "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByManagementGroup.json new file mode 100644 index 000000000000..eb41c42e325f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListByManagementGroup.json @@ -0,0 +1,70 @@ +{ + "parameters": { + "api-version": "2018-06-30", + "managementGroupId": "managementGroupForTest" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "partNumber":"Part Number 1", + "resourceGuid":"00000000-0000-0000-0000-000000000000", + "offerId":"Offer Id 1", + "chargesBilledSeparately":true, + "location":"EU West" + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201808", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00120, + "billableQuantity": 0.00128, + "pretaxCost": 0.26, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "partNumber":"Part Number 1", + "resourceGuid":"11111111-1111-1111-1111-111111111111", + "offerId":"Offer Id 1", + "chargesBilledSeparately":true, + "location":"EU West" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListFilterByTag.json index 9d7000d0cc70..0bd7bbd6b398 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListFilterByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListFilterByTag.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListForBillingPeriodByManagementGroup.json new file mode 100644 index 000000000000..327bc0c3894f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/UsageDetailsListForBillingPeriodByManagementGroup.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2018-06-30", + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201807" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201807", + "usageStart": "2018-07-13T00:00:00Z", + "usageEnd": "2018-07-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "partNumber":"Part Number 1", + "resourceGuid":"00000000-0000-0000-0000-000000000000", + "offerId":"Offer Id 1", + "chargesBilledSeparately":true, + "location":"EU West" + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201807", + "usageStart": "2018-07-13T00:00:00Z", + "usageEnd": "2018-07-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00120, + "billableQuantity": 0.00128, + "pretaxCost": 0.26, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "partNumber":"Part Number 1", + "resourceGuid":"11111111-1111-1111-1111-111111111111", + "offerId":"Offer Id 1", + "chargesBilledSeparately":true, + "location":"EU West" + } + } + ] + } + } + } +} \ No newline at end of file From f7e522f1bd3b5937cf127b68da80d85c60631b2b Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Tue, 7 Aug 2018 14:42:52 -0700 Subject: [PATCH 09/10] Addressed comments from review --- .../stable/2018-06-30/consumption.json | 10 +++++----- ...gregatedCostForBillingPeriodByManagementGroup.json} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/{AggregatedCostListForBillingPeriodByManagementGroup.json => AggregatedCostForBillingPeriodByManagementGroup.json} (100%) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json index 4d3f2b311cf8..e97d0efb74cd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json @@ -2333,7 +2333,7 @@ "tags": [ "UsageDetails" ], - "operationId": "UsageDetailsByManagementGroup_List", + "operationId": "UsageDetails_ListByManagementGroup", "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -2417,7 +2417,7 @@ "tags": [ "UsageDetails" ], - "operationId": "UsageDetails_ListByForBillingPeriodByManagementGroup", + "operationId": "UsageDetails_ListForBillingPeriodByManagementGroup", "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by specified billing period. Usage details are available via this API only for May 1, 2014 or later.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -2504,7 +2504,7 @@ "tags": [ "AggregatedCost" ], - "operationId": "AggregatedcostByManagementGroup", + "operationId": "AggregatedCost_ByManagementGroup", "description": "Provides the aggregate cost of a management group and all child management groups by current billing period.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -2543,14 +2543,14 @@ "tags": [ "AggregatedCost" ], - "operationId": "AggregatedcostByManagementGroup_ByBillingPeriod", + "operationId": "AggregatedCost_ForBillingPeriodByManagementGroup", "description": "Provides the aggregate cost of a management group and all child management groups by specified billing period", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { "AggregatedCostListForBillingPeriodByManagementGroup": { - "$ref": "./examples/AggregatedCostListForBillingPeriodByManagementGroup.json" + "$ref": "./examples/AggregatedCostForBillingPeriodByManagementGroup.json" } }, "parameters": [ diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostForBillingPeriodByManagementGroup.json similarity index 100% rename from specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostListForBillingPeriodByManagementGroup.json rename to specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/AggregatedCostForBillingPeriodByManagementGroup.json From 0dc16e7f2fcf746f4c39a977d4a04c862b47dd26 Mon Sep 17 00:00:00 2001 From: Parisa Naeimi Date: Tue, 7 Aug 2018 16:06:23 -0700 Subject: [PATCH 10/10] Added location parameter to managementgroupId and also added Get To method name of AggregatedCost --- .../stable/2018-06-30/consumption.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json index e97d0efb74cd..c2ac12c035b5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json @@ -2504,7 +2504,7 @@ "tags": [ "AggregatedCost" ], - "operationId": "AggregatedCost_ByManagementGroup", + "operationId": "AggregatedCost_GetByManagementGroup", "description": "Provides the aggregate cost of a management group and all child management groups by current billing period.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -2543,7 +2543,7 @@ "tags": [ "AggregatedCost" ], - "operationId": "AggregatedCost_ForBillingPeriodByManagementGroup", + "operationId": "AggregatedCost_GetForBillingPeriodByManagementGroup", "description": "Provides the aggregate cost of a management group and all child management groups by specified billing period", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -4216,7 +4216,8 @@ "in": "path", "description": "Azure Management Group ID.", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" } } } \ No newline at end of file