[AutoPR consumption/resource-manager] Introducing New Version 2018-10…

…-01 for Consumption API (#3610)

* Generated from c2821abb9e291b0035e8befe7a6f5603c4bef5a3

Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs

# Conflicts:
#	specification/consumption/resource-manager/readme.md

* Packaging update of azure-mgmt-consumption

* Generated from 63c2d0f4fa8af538b59fa39aea1905b142a9fb5f

Updated version and replace subscriptionGuids with subscription Guids in Consumption.json Per comment

* Generated from 5fb43062186b6df20d96da234bb15feda99d29f1

Updated version in Parameter

azure-mgmt-consumption/MANIFEST.in

@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py

azure-mgmt-consumption/README.rst

@@ -1,12 +1,12 @@
 Microsoft Azure SDK for Python
 ==============================
 
-This is the Microsoft Azure Consumption Management Client Library.
+This is the Microsoft Azure MyService Management Client Library.
 
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
@@ -36,8 +36,8 @@ If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
 Usage
 =====
 
-For code examples, see `Consumption Management
-<https://docs.microsoft.com/python/api/overview/azure/consumption>`__
+For code examples, see `MyService Management
+<https://docs.microsoft.com/python/api/overview/azure/>`__
 on docs.microsoft.com.
 
 

azure-mgmt-consumption/azure/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-consumption/azure/mgmt/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-consumption/azure/mgmt/consumption/consumption_management_client.py

@@ -109,7 +109,7 @@ def __init__(
         super(ConsumptionManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-08-31'
+        self.api_version = '2018-10-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

azure-mgmt-consumption/azure/mgmt/consumption/models/management_group_aggregated_cost_result.py

@@ -47,6 +47,12 @@ class ManagementGroupAggregatedCostResult(Resource):
     :param children: Children of a management group
     :type children:
      list[~azure.mgmt.consumption.models.ManagementGroupAggregatedCostResult]
+    :param included_subscriptions: List of subscription Guids included in the
+     calculation of aggregated cost
+    :type included_subscriptions: list[str]
+    :param excluded_subscriptions: List of subscription Guids excluded from
+     the calculation of aggregated cost
+    :type excluded_subscriptions: list[str]
     """
 
     _validation = {
@@ -76,6 +82,8 @@ class ManagementGroupAggregatedCostResult(Resource):
         'charges_billed_separately': {'key': 'properties.chargesBilledSeparately', 'type': 'decimal'},
         'currency': {'key': 'properties.currency', 'type': 'str'},
         'children': {'key': 'properties.children', 'type': '[ManagementGroupAggregatedCostResult]'},
+        'included_subscriptions': {'key': 'properties.includedSubscriptions', 'type': '[str]'},
+        'excluded_subscriptions': {'key': 'properties.excludedSubscriptions', 'type': '[str]'},
     }
 
     def __init__(self, **kwargs):
@@ -88,3 +96,5 @@ def __init__(self, **kwargs):
         self.charges_billed_separately = None
         self.currency = None
         self.children = kwargs.get('children', None)
+        self.included_subscriptions = kwargs.get('included_subscriptions', None)
+        self.excluded_subscriptions = kwargs.get('excluded_subscriptions', None)

azure-mgmt-consumption/azure/mgmt/consumption/models/management_group_aggregated_cost_result_py3.py

@@ -47,6 +47,12 @@ class ManagementGroupAggregatedCostResult(Resource):
     :param children: Children of a management group
     :type children:
      list[~azure.mgmt.consumption.models.ManagementGroupAggregatedCostResult]
+    :param included_subscriptions: List of subscription Guids included in the
+     calculation of aggregated cost
+    :type included_subscriptions: list[str]
+    :param excluded_subscriptions: List of subscription Guids excluded from
+     the calculation of aggregated cost
+    :type excluded_subscriptions: list[str]
     """
 
     _validation = {
@@ -76,9 +82,11 @@ class ManagementGroupAggregatedCostResult(Resource):
         'charges_billed_separately': {'key': 'properties.chargesBilledSeparately', 'type': 'decimal'},
         'currency': {'key': 'properties.currency', 'type': 'str'},
         'children': {'key': 'properties.children', 'type': '[ManagementGroupAggregatedCostResult]'},
+        'included_subscriptions': {'key': 'properties.includedSubscriptions', 'type': '[str]'},
+        'excluded_subscriptions': {'key': 'properties.excludedSubscriptions', 'type': '[str]'},
     }
 
-    def __init__(self, *, children=None, **kwargs) -> None:
+    def __init__(self, *, children=None, included_subscriptions=None, excluded_subscriptions=None, **kwargs) -> None:
         super(ManagementGroupAggregatedCostResult, self).__init__(**kwargs)
         self.billing_period_id = None
         self.usage_start = None
@@ -88,3 +96,5 @@ def __init__(self, *, children=None, **kwargs) -> None:
         self.charges_billed_separately = None
         self.currency = None
         self.children = children
+        self.included_subscriptions = included_subscriptions
+        self.excluded_subscriptions = excluded_subscriptions

azure-mgmt-consumption/azure/mgmt/consumption/operations/aggregated_cost_operations.py

@@ -22,7 +22,7 @@ class AggregatedCostOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/balances_operations.py

@@ -22,7 +22,7 @@ class BalancesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/budgets_operations.py

@@ -22,7 +22,7 @@ class BudgetsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/charges_operations.py

@@ -22,7 +22,7 @@ class ChargesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/forecasts_operations.py

@@ -22,7 +22,7 @@ class ForecastsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/marketplaces_operations.py

@@ -22,7 +22,7 @@ class MarketplacesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/operations.py

@@ -22,7 +22,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/price_sheet_operations.py

@@ -22,7 +22,7 @@ class PriceSheetOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/reservation_recommendations_operations.py

@@ -22,7 +22,7 @@ class ReservationRecommendationsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/reservations_details_operations.py

@@ -22,7 +22,7 @@ class ReservationsDetailsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/reservations_summaries_operations.py

@@ -22,7 +22,7 @@ class ReservationsSummariesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/tags_operations.py

@@ -22,7 +22,7 @@ class TagsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config
 

azure-mgmt-consumption/azure/mgmt/consumption/operations/usage_details_operations.py

@@ -22,7 +22,7 @@ class UsageDetailsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-08-31. Constant value: "2018-08-31".
+    :ivar api_version: Version of the API to be used with the client request. The current version is 2018-10-01. Constant value: "2018-10-01".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-08-31"
+        self.api_version = "2018-10-01"
 
         self.config = config