[AutoRelease] t2-recoveryservices-2023-05-15-77206(can only be merged…

… by SDK owner) (#30394) * code and test * Update CHANGELOG.md --------- Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Yuchao Yan <[email protected]>
Azure · May 22, 2023 · b26314d · b26314d
1 parent 9dabac6
commit b26314d
Show file tree

Hide file tree

Showing 60 changed files with 322 additions and 389 deletions.
diff --git a/sdk/recoveryservices/azure-mgmt-recoveryservices/CHANGELOG.md b/sdk/recoveryservices/azure-mgmt-recoveryservices/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 2.4.0 (2023-05-20)
+
+### Features Added
+
+  - Model VaultProperties has a new parameter restore_settings
+
 ## 2.3.0 (2023-02-15)
 
 ### Other Changes

diff --git a/sdk/recoveryservices/azure-mgmt-recoveryservices/README.md b/sdk/recoveryservices/azure-mgmt-recoveryservices/README.md
@@ -45,8 +45,9 @@ client = RecoveryServicesClient(credential=DefaultAzureCredential(), subscriptio
 
 ## Examples
 
-
-Code samples for this package can be found at [Recovery Services](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com and [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+Code samples for this package can be found at:
+- [Search Recovery Services](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
+- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
 ## Troubleshooting

diff --git a/sdk/recoveryservices/azure-mgmt-recoveryservices/_meta.json b/sdk/recoveryservices/azure-mgmt-recoveryservices/_meta.json
@@ -1,11 +1,11 @@
 {
-  "commit": "630ec444f8dd7c09b9cdd5fa99951f8a0d1ad41f",
+  "commit": "18b397a02e5c7b856f61b6d7fb66a69c9c56c8ce",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.9.2",
   "use": [
-    "@autorest/python@6.2.16",
+    "@autorest/python@6.4.12",
     "@autorest/[email protected]"
   ],
-  "autorest_command": "autorest specification/recoveryservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.16 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/recoveryservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
   "readme": "specification/recoveryservices/resource-manager/readme.md"
 }
diff --git a/...ecoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_configuration.py b/...ecoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_configuration.py
@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from ._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
@@ -35,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration):  # pylint: disable=too
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2023-01-01"] = kwargs.pop("api_version", "2023-01-01")
+        api_version: str = kwargs.pop("api_version", "2023-02-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

diff --git a/...ices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_recovery_services_client.py b/...ices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_recovery_services_client.py
@@ -65,7 +65,7 @@ class RecoveryServicesClient(
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -82,7 +82,7 @@ def __init__(
         self._config = RecoveryServicesClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client: ARMPipelineClient = 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)
@@ -139,5 +139,5 @@ def __enter__(self) -> "RecoveryServicesClient":
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details) -> None:
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)
diff --git a/...ecoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_serialization.py b/...ecoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_serialization.py
@@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                         if xml_desc.get("attr", False):
                             if xml_ns:
                                 ET.register_namespace(xml_prefix, xml_ns)
-                                xml_name = "{}{}".format(xml_ns, xml_name)
+                                xml_name = "{{{}}}{}".format(xml_ns, xml_name)
                             serialized.set(xml_name, new_attr)  # type: ignore
                             continue
                         if xml_desc.get("text", False):
@@ -1271,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type):
     xml_name = internal_type_xml_map.get("name", internal_type.__name__)
     xml_ns = internal_type_xml_map.get("ns", None)
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
     return xml_name
 
 
@@ -1295,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data):
     # Integrate namespace if necessary
     xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
 
     # If it's an attribute, that's simple
     if xml_desc.get("attr", False):

diff --git a/sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_version.py b/sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.3.0"
+VERSION = "2.4.0"
diff --git a/...eryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_configuration.py b/...eryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_configuration.py
@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from .._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
@@ -35,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration):  # pylint: disable=too
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2023-01-01"] = kwargs.pop("api_version", "2023-01-01")
+        api_version: str = kwargs.pop("api_version", "2023-02-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

diff --git a/.../azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_recovery_services_client.py b/.../azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_recovery_services_client.py
@@ -68,7 +68,7 @@ class RecoveryServicesClient(
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -85,7 +85,7 @@ def __init__(
         self._config = RecoveryServicesClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(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)
@@ -142,5 +142,5 @@ async def __aenter__(self) -> "RecoveryServicesClient":
         await self._client.__aenter__()
         return self
 
-    async def __aexit__(self, *exc_details) -> None:
+    async def __aexit__(self, *exc_details: Any) -> None:
         await self._client.__aexit__(*exc_details)
diff --git a/...ces/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/operations/_operations.py b/...ces/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/operations/_operations.py
@@ -6,7 +6,6 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-import sys
 from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
@@ -31,10 +30,6 @@
 from ...operations._operations import build_list_request
 from .._vendor import RecoveryServicesClientMixinABC
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,9 +67,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.ClientDiscoveryValueForS
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2023-01-01"] = kwargs.pop(
-            "api_version", _params.pop("api-version", self._config.api_version)
-        )
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ClientDiscoveryResponse] = kwargs.pop("cls", None)
 
         error_map = {
@@ -125,8 +118,9 @@ async def extract_data(pipeline_response):
         async def get_next(next_link=None):
             request = prepare_request(next_link)
 
+            _stream = False
             pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-                request, stream=False, **kwargs
+                request, stream=_stream, **kwargs
             )
             response = pipeline_response.http_response
 

diff --git a/...services/azure/mgmt/recoveryservices/aio/operations/_private_link_resources_operations.py b/...services/azure/mgmt/recoveryservices/aio/operations/_private_link_resources_operations.py
@@ -6,7 +6,6 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-import sys
 from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
@@ -32,10 +31,6 @@
 from ...operations._private_link_resources_operations import build_get_request, build_list_request
 from .._vendor import RecoveryServicesClientMixinABC
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -81,9 +76,7 @@ def list(
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2023-01-01"] = kwargs.pop(
-            "api_version", _params.pop("api-version", self._config.api_version)
-        )
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None)
 
         error_map = {
@@ -137,8 +130,9 @@ async def extract_data(pipeline_response):
         async def get_next(next_link=None):
             request = prepare_request(next_link)
 
+            _stream = False
             pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-                request, stream=False, **kwargs
+                request, stream=_stream, **kwargs
             )
             response = pipeline_response.http_response
 
@@ -185,9 +179,7 @@ async def get(
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2023-01-01"] = kwargs.pop(
-            "api_version", _params.pop("api-version", self._config.api_version)
-        )
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.PrivateLinkResource] = kwargs.pop("cls", None)
 
         request = build_get_request(
@@ -203,8 +195,9 @@ async def get(
         request = _convert_request(request)
         request.url = self._client.format_url(request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response

diff --git a/...rvices/azure/mgmt/recoveryservices/aio/operations/_recovery_services_client_operations.py b/...rvices/azure/mgmt/recoveryservices/aio/operations/_recovery_services_client_operations.py
@@ -6,7 +6,6 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-import sys
 from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
@@ -32,10 +31,6 @@
 )
 from .._vendor import RecoveryServicesClientMixinABC
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,9 +65,7 @@ async def get_operation_status(
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2023-01-01"] = kwargs.pop(
-            "api_version", _params.pop("api-version", self._config.api_version)
-        )
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.OperationResource] = kwargs.pop("cls", None)
 
         request = build_get_operation_status_request(
@@ -88,8 +81,9 @@ async def get_operation_status(
         request = _convert_request(request)
         request.url = self._client.format_url(request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # type: ignore # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response
@@ -138,9 +132,7 @@ async def get_operation_result(
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2023-01-01"] = kwargs.pop(
-            "api_version", _params.pop("api-version", self._config.api_version)
-        )
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[Optional[_models.Vault]] = kwargs.pop("cls", None)
 
         request = build_get_operation_result_request(
@@ -156,8 +148,9 @@ async def get_operation_result(
         request = _convert_request(request)
         request.url = self._client.format_url(request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # type: ignore # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response