[AutoPR track2_azure-mgmt-reservations] [Microsoft.Capacity] Fixing API paths

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

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.7.2",
+  "autorest": "3.8.4",
   "use": [
-    "@autorest/python@5.13.0",
-    "@autorest/modelerfour@4.19.3"
+    "@autorest/python@6.1.5",
+    "@autorest/modelerfour@4.23.5"
   ],
-  "commit": "b1bbbab2f04c23e279c717f955d9a86bc4757946",
+  "commit": "faed328d0f9c39355cfe8cc86346a68e6f4e7228",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "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/modelerfour@4.19.3 --version=3.7.2",
+  "autorest_command": "autorest specification/reservations/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.1.5 --use=@autorest/modelerfour@4.23.5 --version=3.8.4 --version-tolerant=False",
   "readme": "specification/reservations/resource-manager/readme.md"
 }

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

@@ -10,9 +10,15 @@
 from ._version import VERSION
 
 __version__ = VERSION
-__all__ = ['AzureReservationAPI']
 
-# `._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()
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = ["AzureReservationAPI"]
+__all__.extend([p for p in _patch_all if p not in __all__])
+
+_patch_sdk()

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

@@ -9,20 +9,33 @@
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
 
-from msrest import Deserializer, Serializer
-
 from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
 
 from . import models
 from ._configuration import AzureReservationAPIConfiguration
-from .operations import AzureReservationAPIOperationsMixin, CalculateExchangeOperations, ExchangeOperations, OperationOperations, QuotaOperations, QuotaRequestStatusOperations, ReservationOperations, ReservationOrderOperations
+from ._serialization import Deserializer, Serializer
+from .operations import (
+    AzureReservationAPIOperationsMixin,
+    CalculateExchangeOperations,
+    CalculateRefundOperations,
+    ExchangeOperations,
+    OperationOperations,
+    QuotaOperations,
+    QuotaRequestStatusOperations,
+    ReservationOperations,
+    ReservationOrderOperations,
+    ReturnOperations,
+)
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
-class AzureReservationAPI(AzureReservationAPIOperationsMixin):    # pylint: disable=too-many-instance-attributes
+
+class AzureReservationAPI(
+    AzureReservationAPIOperationsMixin
+):  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """This API describe Azure Reservation.
 
     :ivar reservation: ReservationOperations operations
@@ -31,6 +44,10 @@ class AzureReservationAPI(AzureReservationAPIOperationsMixin):    # pylint: disa
     :vartype reservation_order: azure.mgmt.reservations.operations.ReservationOrderOperations
     :ivar operation: OperationOperations operations
     :vartype operation: azure.mgmt.reservations.operations.OperationOperations
+    :ivar calculate_refund: CalculateRefundOperations operations
+    :vartype calculate_refund: azure.mgmt.reservations.operations.CalculateRefundOperations
+    :ivar return_operations: ReturnOperations operations
+    :vartype return_operations: azure.mgmt.reservations.operations.ReturnOperations
     :ivar calculate_exchange: CalculateExchangeOperations operations
     :vartype calculate_exchange: azure.mgmt.reservations.operations.CalculateExchangeOperations
     :ivar exchange: ExchangeOperations operations
@@ -39,7 +56,7 @@ class AzureReservationAPI(AzureReservationAPIOperationsMixin):    # pylint: disa
     :vartype quota: azure.mgmt.reservations.operations.QuotaOperations
     :ivar quota_request_status: QuotaRequestStatusOperations operations
     :vartype quota_request_status: azure.mgmt.reservations.operations.QuotaRequestStatusOperations
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
@@ -48,10 +65,7 @@ class AzureReservationAPI(AzureReservationAPIOperationsMixin):    # pylint: disa
     """
 
     def __init__(
-        self,
-        credential: "TokenCredential",
-        base_url: str = "https://management.azure.com",
-        **kwargs: Any
+        self, 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)
@@ -61,19 +75,24 @@ def __init__(
         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.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.calculate_refund = CalculateRefundOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.return_operations = ReturnOperations(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.quota_request_status = QuotaRequestStatusOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
 
-    def _send_request(
-        self,
-        request: HttpRequest,
-        **kwargs: Any
-    ) -> HttpResponse:
+    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -82,7 +101,7 @@ def _send_request(
         >>> response = client._send_request(request)
         <HttpResponse: 200 OK>
 
-        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
 
         :param request: The network request you want to make. Required.
         :type request: ~azure.core.rest.HttpRequest

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

@@ -25,37 +25,34 @@ class AzureReservationAPIConfiguration(Configuration):  # pylint: disable=too-ma
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
     """
 
-    def __init__(
-        self,
-        credential: "TokenCredential",
-        **kwargs: Any
-    ) -> None:
+    def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
         super(AzureReservationAPIConfiguration, self).__init__(**kwargs)
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
 
         self.credential = credential
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-reservations/{}'.format(VERSION))
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-reservations/{}".format(VERSION))
         self._configure(**kwargs)
 
     def _configure(
-        self,
-        **kwargs  # type: Any
+        self, **kwargs  # type: Any
     ):
         # type: (...) -> None
-        self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
-        self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
-        self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
-        self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
-        self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
-        self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
-        self.authentication_policy = kwargs.get('authentication_policy')
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        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 = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )

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

@@ -28,4 +28,4 @@
 # This file 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
 def patch_sdk():
-    pass
+    pass