Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

[AutoPR] consumption/resource-manager #3319

Merged
4 commits merged into from
Aug 30, 2018
Merged

[AutoPR] consumption/resource-manager #3319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
750527a
[AutoPR consumption/resource-manager] Introducing UsageDetails and Ag…
AutorestCI Aug 9, 2018
ab45033
Merge branch 'master' into restapi_auto_consumption/resource-manager
Aug 29, 2018
3b146b2
Regenerate azure-arm-consumption
Aug 29, 2018
e3de74c
Update azure-arm-consumption to 5.1.0
Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/services/consumptionManagement/lib/consumptionManagementClient.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export default class ConsumptionManagementClient extends AzureServiceClient {
tags: operations.Tags;
forecasts: operations.Forecasts;
operations: operations.Operations;
aggregatedCost: operations.AggregatedCost;
}

export { ConsumptionManagementClient, models as ConsumptionManagementModels };
1 change: 1 addition & 0 deletions lib/services/consumptionManagement/lib/consumptionManagementClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class ConsumptionManagementClient extends ServiceClient {
this.tags = new operations.Tags(this);
this.forecasts = new operations.Forecasts(this);
this.operations = new operations.Operations(this);
this.aggregatedCost = new operations.AggregatedCost(this);
this.models = models;
msRest.addSerializationMixin(this);
}
Expand Down
2 changes: 0 additions & 2 deletions lib/services/consumptionManagement/lib/models/errorResponse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

'use strict';

const models = require('./index');

/**
* Error response indicates that the service is not able to process the
* incoming request. The reason is provided in the error message.
Expand Down
24 changes: 24 additions & 0 deletions lib/services/consumptionManagement/lib/models/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,30 @@ export interface Forecast extends Resource {
readonly confidenceLevels?: ForecastPropertiesConfidenceLevelsItem[];
}

/**
* @class
* Initializes a new instance of the ManagementGroupAggregatedCostResult class.
* @constructor
* A management group aggregated cost resource.
*
* @member {string} [billingPeriodId] The id of the billing period resource
* that the aggregated cost belongs to.
* @member {number} [azureCharges] Azure Charges.
* @member {number} [marketplaceCharges] Marketplace Charges.
* @member {number} [chargesBilledSeparately] Charges Billed Separately.
* @member {string} [currency] The ISO currency in which the meter is charged,
* for example, USD.
* @member {array} [children] Children of a management group
*/
export interface ManagementGroupAggregatedCostResult extends Resource {
readonly billingPeriodId?: string;
readonly azureCharges?: number;
readonly marketplaceCharges?: number;
readonly chargesBilledSeparately?: number;
readonly currency?: string;
children?: ManagementGroupAggregatedCostResult[];
}

/**
* @class
* Initializes a new instance of the ErrorDetails class.
Expand Down
1 change: 1 addition & 0 deletions lib/services/consumptionManagement/lib/models/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ exports.PriceSheetProperties = require('./priceSheetProperties');
exports.PriceSheetResult = require('./priceSheetResult');
exports.ForecastPropertiesConfidenceLevelsItem = require('./forecastPropertiesConfidenceLevelsItem');
exports.Forecast = require('./forecast');
exports.ManagementGroupAggregatedCostResult = require('./managementGroupAggregatedCostResult');
exports.ErrorDetails = require('./errorDetails');
exports.ErrorResponse = require('./errorResponse');
exports.OperationDisplay = require('./operationDisplay');
Expand Down
150 changes: 150 additions & 0 deletions lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
*/

'use strict';

const models = require('./index');

/**
* A management group aggregated cost resource.
*
* @extends models['Resource']
*/
class ManagementGroupAggregatedCostResult extends models['Resource'] {
/**
* Create a ManagementGroupAggregatedCostResult.
* @member {string} [billingPeriodId] The id of the billing period resource
* that the aggregated cost belongs to.
* @member {number} [azureCharges] Azure Charges.
* @member {number} [marketplaceCharges] Marketplace Charges.
* @member {number} [chargesBilledSeparately] Charges Billed Separately.
* @member {string} [currency] The ISO currency in which the meter is
* charged, for example, USD.
* @member {array} [children] Children of a management group
*/
constructor() {
super();
}

/**
* Defines the metadata of ManagementGroupAggregatedCostResult
*
* @returns {object} metadata of ManagementGroupAggregatedCostResult
*
*/
mapper() {
return {
required: false,
serializedName: 'ManagementGroupAggregatedCostResult',
type: {
name: 'Composite',
className: 'ManagementGroupAggregatedCostResult',
modelProperties: {
id: {
required: false,
readOnly: true,
serializedName: 'id',
type: {
name: 'String'
}
},
name: {
required: false,
readOnly: true,
serializedName: 'name',
type: {
name: 'String'
}
},
type: {
required: false,
readOnly: true,
serializedName: 'type',
type: {
name: 'String'
}
},
tags: {
required: false,
readOnly: true,
serializedName: 'tags',
type: {
name: 'Dictionary',
value: {
required: false,
serializedName: 'StringElementType',
type: {
name: 'String'
}
}
}
},
billingPeriodId: {
required: false,
readOnly: true,
serializedName: 'properties.billingPeriodId',
type: {
name: 'String'
}
},
azureCharges: {
required: false,
readOnly: true,
serializedName: 'properties.azureCharges',
type: {
name: 'Number'
}
},
marketplaceCharges: {
required: false,
readOnly: true,
serializedName: 'properties.marketplaceCharges',
type: {
name: 'Number'
}
},
chargesBilledSeparately: {
required: false,
readOnly: true,
serializedName: 'properties.chargesBilledSeparately',
type: {
name: 'Number'
}
},
currency: {
required: false,
readOnly: true,
serializedName: 'properties.currency',
type: {
name: 'String'
}
},
children: {
required: false,
serializedName: 'properties.children',
type: {
name: 'Sequence',
element: {
required: false,
serializedName: 'ManagementGroupAggregatedCostResultElementType',
type: {
name: 'Composite',
className: 'ManagementGroupAggregatedCostResult'
}
}
}
}
}
}
};
}
}

module.exports = ManagementGroupAggregatedCostResult;
2 changes: 0 additions & 2 deletions lib/services/consumptionManagement/lib/models/operation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

'use strict';

const models = require('./index');

/**
* A Consumption REST API operation.
*
Expand Down
2 changes: 0 additions & 2 deletions lib/services/consumptionManagement/lib/models/priceSheetProperties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

'use strict';

const models = require('./index');

/**
* The properties of the price sheet.
*
Expand Down
Loading