code and test (Azure#24097)

Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>

sdk/reservations/azure-mgmt-reservations/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Release History
 
+## 2.0.0 (2022-04-20)
+
+**Features**
+
+  - Added operation ReservationOperations.list_all
+  - Added operation ReservationOrderOperations.change_directory
+  - Model CalculatePriceResponseProperties has a new parameter grand_total
+  - Model CalculatePriceResponseProperties has a new parameter is_tax_included
+  - Model CalculatePriceResponseProperties has a new parameter net_total
+  - Model CalculatePriceResponseProperties has a new parameter tax_total
+  - Model Catalog has a new parameter capabilities
+  - Model Catalog has a new parameter msrp
+  - Model Catalog has a new parameter size
+  - Model Catalog has a new parameter tier
+  - Model CurrentQuotaLimit has a new parameter id
+  - Model CurrentQuotaLimit has a new parameter name
+  - Model CurrentQuotaLimit has a new parameter type
+  - Model CurrentQuotaLimitBase has a new parameter id
+  - Model CurrentQuotaLimitBase has a new parameter name
+  - Model CurrentQuotaLimitBase has a new parameter type
+  - Model OperationResponse has a new parameter is_data_action
+  - Model OperationResponse has a new parameter properties
+  - Model QuotaRequestOneResourceSubmitResponse has a new parameter id_properties_id
+  - Model QuotaRequestOneResourceSubmitResponse has a new parameter name_properties_name
+  - Model QuotaRequestOneResourceSubmitResponse has a new parameter type_properties_type
+  - Model ReservationOrderResponse has a new parameter benefit_start_time
+  - Model ReservationOrderResponse has a new parameter system_data
+  - Model ReservationResponse has a new parameter kind
+  - Model ReservationResponse has a new parameter system_data
+
+**Breaking changes**
+
+  - Operation AzureReservationAPIOperationsMixin.get_catalog has a new parameter offer_id
+  - Operation AzureReservationAPIOperationsMixin.get_catalog has a new parameter plan_id
+  - Operation AzureReservationAPIOperationsMixin.get_catalog has a new parameter publisher_id
+
 ## 1.0.0 (2021-05-20)
 
 **Features**

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

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.4.2",
+  "autorest": "3.7.2",
   "use": [
-    "@autorest/python@5.8.0",
-    "@autorest/[email protected].1"
+    "@autorest/python@5.13.0",
+    "@autorest/[email protected].3"
   ],
-  "commit": "aac59eea2fb1c142fd371c9c1886f33713e494a2",
+  "commit": "b1bbbab2f04c23e279c717f955d9a86bc4757946",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/reservations/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/[email protected].1 --version=3.4.2",
+  "autorest_command": "autorest specification/reservations/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/[email protected].3 --version=3.7.2",
   "readme": "specification/reservations/resource-manager/readme.md"
 }

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

@@ -12,8 +12,7 @@
 __version__ = VERSION
 __all__ = ['AzureReservationAPI']
 
-try:
-    from ._patch import patch_sdk  # type: ignore
-    patch_sdk()
-except ImportError:
-    pass
+# `._patch.py` is used for handwritten extensions to the generated code
+# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+from ._patch import patch_sdk
+patch_sdk()

sdk/reservations/azure-mgmt-reservations/azure/mgmt/reservations/_azure_reservation_api.py

@@ -6,31 +6,23 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from copy import deepcopy
+from typing import Any, TYPE_CHECKING
 
-from azure.mgmt.core import ARMPipelineClient
 from msrest import Deserializer, Serializer
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
-    from azure.core.credentials import TokenCredential
-    from azure.core.pipeline.transport import HttpRequest, HttpResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.mgmt.core import ARMPipelineClient
 
-from ._configuration import AzureReservationAPIConfiguration
-from .operations import ReservationOperations
-from .operations import AzureReservationAPIOperationsMixin
-from .operations import ReservationOrderOperations
-from .operations import OperationOperations
-from .operations import CalculateExchangeOperations
-from .operations import ExchangeOperations
-from .operations import QuotaOperations
-from .operations import QuotaRequestStatusOperations
 from . import models
+from ._configuration import AzureReservationAPIConfiguration
+from .operations import AzureReservationAPIOperationsMixin, CalculateExchangeOperations, ExchangeOperations, OperationOperations, QuotaOperations, QuotaRequestStatusOperations, ReservationOperations, ReservationOrderOperations
 
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from azure.core.credentials import TokenCredential
 
-class AzureReservationAPI(AzureReservationAPIOperationsMixin):
+class AzureReservationAPI(AzureReservationAPIOperationsMixin):    # pylint: disable=too-many-instance-attributes
     """This API describe Azure Reservation.
 
     :ivar reservation: ReservationOperations operations
@@ -49,56 +41,59 @@ class AzureReservationAPI(AzureReservationAPIOperationsMixin):
     :vartype quota_request_status: azure.mgmt.reservations.operations.QuotaRequestStatusOperations
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param str base_url: Service URL
-    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
+    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        base_url=None,  # type: Optional[str]
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        if not base_url:
-            base_url = 'https://management.azure.com'
-        self._config = AzureReservationAPIConfiguration(credential, **kwargs)
+        credential: "TokenCredential",
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = AzureReservationAPIConfiguration(credential=credential, **kwargs)
         self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.reservation = ReservationOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.reservation_order = ReservationOrderOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.operation = OperationOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.calculate_exchange = CalculateExchangeOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.exchange = ExchangeOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.quota = QuotaOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.quota_request_status = QuotaRequestStatusOperations(self._client, self._config, self._serialize, self._deserialize)
+
 
-        self.reservation = ReservationOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.reservation_order = ReservationOrderOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.operation = OperationOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.calculate_exchange = CalculateExchangeOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.exchange = ExchangeOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.quota = QuotaOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.quota_request_status = QuotaRequestStatusOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+    def _send_request(
+        self,
+        request: HttpRequest,
+        **kwargs: Any
+    ) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = client._send_request(request)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.HttpResponse
+        :rtype: ~azure.core.rest.HttpResponse
         """
-        http_request.url = self._client.format_url(http_request.url)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, **kwargs)
 
     def close(self):
         # type: () -> None

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

@@ -6,22 +6,20 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
-from azure.mgmt.core.policies import ARMHttpLoggingPolicy
+from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
-class AzureReservationAPIConfiguration(Configuration):
+class AzureReservationAPIConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
     """Configuration for AzureReservationAPI.
 
     Note that all parameters used to create this instance are saved as instance
@@ -33,13 +31,12 @@ class AzureReservationAPIConfiguration(Configuration):
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+        credential: "TokenCredential",
+        **kwargs: Any
+    ) -> None:
+        super(AzureReservationAPIConfiguration, self).__init__(**kwargs)
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
-        super(AzureReservationAPIConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
@@ -61,4 +58,4 @@ def _configure(
         self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
         self.authentication_policy = kwargs.get('authentication_policy')
         if self.credential and not self.authentication_policy:
-            self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)