CodeGen from PR 13967 in Azure/azure-rest-api-specs

Cost Management: Reservation Recommendations API: Add multiple missing properties in specs (Azure#13967)

* added totalCost, properties.resourceType, properties.subscriptionId, and eTag to various RiRec dfinitions

* moving eTag  property to right place

* remove duplicate description

Author: SDKAuto

sdk/consumption/azure-mgmt-consumption/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/consumption/azure-mgmt-consumption/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "ccdfdc5b6ef7ea03f3247626a91443d5a555e946",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/consumption/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
+  "readme": "specification/consumption/resource-manager/readme.md"
+}

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

@@ -9,10 +9,11 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .consumption_management_client import ConsumptionManagementClient
-from .version import VERSION
+from ._configuration import ConsumptionManagementClientConfiguration
+from ._consumption_management_client import ConsumptionManagementClient
+__all__ = ['ConsumptionManagementClient', 'ConsumptionManagementClientConfiguration']
 
-__all__ = ['ConsumptionManagementClient']
+from .version import VERSION
 
 __version__ = VERSION
 

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/_configuration.py

@@ -0,0 +1,48 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# 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.
+# --------------------------------------------------------------------------
+from msrestazure import AzureConfiguration
+
+from .version import VERSION
+
+
+class ConsumptionManagementClientConfiguration(AzureConfiguration):
+    """Configuration for ConsumptionManagementClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: Azure Subscription ID.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        if credentials is None:
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not base_url:
+            base_url = 'https://management.azure.com'
+
+        super(ConsumptionManagementClientConfiguration, self).__init__(base_url)
+
+        # Starting Autorest.Python 4.0.64, make connection pool activated by default
+        self.keep_alive = True
+
+        self.add_user_agent('azure-mgmt-consumption/{}'.format(VERSION))
+        self.add_user_agent('Azure-SDK-For-Python')
+
+        self.credentials = credentials
+        self.subscription_id = subscription_id

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/consumption_management_client.py renamed to sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/_consumption_management_client.py

@@ -11,54 +11,27 @@
 
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
-from msrestazure import AzureConfiguration
-from .version import VERSION
-from .operations.usage_details_operations import UsageDetailsOperations
-from .operations.marketplaces_operations import MarketplacesOperations
-from .operations.budgets_operations import BudgetsOperations
-from .operations.tags_operations import TagsOperations
-from .operations.charges_operations import ChargesOperations
-from .operations.balances_operations import BalancesOperations
-from .operations.reservations_summaries_operations import ReservationsSummariesOperations
-from .operations.reservations_details_operations import ReservationsDetailsOperations
-from .operations.reservation_recommendations_operations import ReservationRecommendationsOperations
-from .operations.price_sheet_operations import PriceSheetOperations
-from .operations.forecasts_operations import ForecastsOperations
-from .operations.operations import Operations
-from .operations.aggregated_cost_operations import AggregatedCostOperations
-from . import models
-
-
-class ConsumptionManagementClientConfiguration(AzureConfiguration):
-    """Configuration for ConsumptionManagementClient
-    Note that all parameters used to create this instance are saved as instance
-    attributes.
-
-    :param credentials: Credentials needed for the client to connect to Azure.
-    :type credentials: :mod:`A msrestazure Credentials
-     object<msrestazure.azure_active_directory>`
-    :param subscription_id: Azure Subscription ID.
-    :type subscription_id: str
-    :param str base_url: Service URL
-    """
 
-    def __init__(
-            self, credentials, subscription_id, base_url=None):
-
-        if credentials is None:
-            raise ValueError("Parameter 'credentials' must not be None.")
-        if subscription_id is None:
-            raise ValueError("Parameter 'subscription_id' must not be None.")
-        if not base_url:
-            base_url = 'https://management.azure.com'
-
-        super(ConsumptionManagementClientConfiguration, self).__init__(base_url)
-
-        self.add_user_agent('azure-mgmt-consumption/{}'.format(VERSION))
-        self.add_user_agent('Azure-SDK-For-Python')
-
-        self.credentials = credentials
-        self.subscription_id = subscription_id
+from ._configuration import ConsumptionManagementClientConfiguration
+from .operations import UsageDetailsOperations
+from .operations import MarketplacesOperations
+from .operations import BudgetsOperations
+from .operations import TagsOperations
+from .operations import ChargesOperations
+from .operations import BalancesOperations
+from .operations import ReservationsSummariesOperations
+from .operations import ReservationsDetailsOperations
+from .operations import ReservationRecommendationsOperations
+from .operations import ReservationRecommendationDetailsOperations
+from .operations import ReservationTransactionsOperations
+from .operations import PriceSheetOperations
+from .operations import ForecastsOperations
+from .operations import Operations
+from .operations import AggregatedCostOperations
+from .operations import EventsOperations
+from .operations import LotsOperations
+from .operations import CreditsOperations
+from . import models
 
 
 class ConsumptionManagementClient(SDKClient):
@@ -85,6 +58,10 @@ class ConsumptionManagementClient(SDKClient):
     :vartype reservations_details: azure.mgmt.consumption.operations.ReservationsDetailsOperations
     :ivar reservation_recommendations: ReservationRecommendations operations
     :vartype reservation_recommendations: azure.mgmt.consumption.operations.ReservationRecommendationsOperations
+    :ivar reservation_recommendation_details: ReservationRecommendationDetails operations
+    :vartype reservation_recommendation_details: azure.mgmt.consumption.operations.ReservationRecommendationDetailsOperations
+    :ivar reservation_transactions: ReservationTransactions operations
+    :vartype reservation_transactions: azure.mgmt.consumption.operations.ReservationTransactionsOperations
     :ivar price_sheet: PriceSheet operations
     :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
     :ivar forecasts: Forecasts operations
@@ -93,6 +70,12 @@ class ConsumptionManagementClient(SDKClient):
     :vartype operations: azure.mgmt.consumption.operations.Operations
     :ivar aggregated_cost: AggregatedCost operations
     :vartype aggregated_cost: azure.mgmt.consumption.operations.AggregatedCostOperations
+    :ivar events: Events operations
+    :vartype events: azure.mgmt.consumption.operations.EventsOperations
+    :ivar lots: Lots operations
+    :vartype lots: azure.mgmt.consumption.operations.LotsOperations
+    :ivar credits: Credits operations
+    :vartype credits: azure.mgmt.consumption.operations.CreditsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -109,7 +92,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 = '2019-04-01-preview'
+        self.api_version = '2019-11-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -131,6 +114,10 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.reservation_recommendations = ReservationRecommendationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.reservation_recommendation_details = ReservationRecommendationDetailsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.reservation_transactions = ReservationTransactionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.price_sheet = PriceSheetOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.forecasts = ForecastsOperations(
@@ -139,3 +126,9 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.aggregated_cost = AggregatedCostOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.events = EventsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.lots = LotsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.credits = CreditsOperations(
+            self._client, self.config, self._serialize, self._deserialize)