From 6323b469323066eb6648ade6c0f51649c8960f64 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 21 May 2021 01:40:49 +0000 Subject: [PATCH 1/3] CodeGen from PR 14272 in Azure/azure-rest-api-specs resourcemover track2 (#14272) Co-authored-by: Yan Zhang (WICRESOFT NORTH AMERICA LTD) --- .../azure-mgmt-resourcemover/MANIFEST.in | 1 + .../azure-mgmt-resourcemover/_meta.json | 11 ++ .../azure/mgmt/resourcemover/_metadata.json | 106 ++++++++++++++++++ .../_resource_mover_service_api.py | 19 ++++ .../azure/mgmt/resourcemover/_version.py | 2 +- .../aio/_resource_mover_service_api.py | 18 +++ .../_move_collections_operations.py | 68 +++++------ .../operations/_move_resources_operations.py | 20 ++-- .../_operations_discovery_operations.py | 2 +- .../_unresolved_dependencies_operations.py | 2 +- .../mgmt/resourcemover/models/_models.py | 49 ++++---- .../mgmt/resourcemover/models/_models_py3.py | 65 +++++------ .../_move_collections_operations.py | 28 ++--- .../operations/_move_resources_operations.py | 8 +- 14 files changed, 278 insertions(+), 121 deletions(-) create mode 100644 sdk/resourcemover/azure-mgmt-resourcemover/_meta.json create mode 100644 sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/MANIFEST.in b/sdk/resourcemover/azure-mgmt-resourcemover/MANIFEST.in index a3cb07df8765..3a9b6517412b 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/MANIFEST.in +++ b/sdk/resourcemover/azure-mgmt-resourcemover/MANIFEST.in @@ -1,3 +1,4 @@ +include _meta.json recursive-include tests *.py *.yaml include *.md include azure/__init__.py diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/_meta.json b/sdk/resourcemover/azure-mgmt-resourcemover/_meta.json new file mode 100644 index 000000000000..20306ecb704f --- /dev/null +++ b/sdk/resourcemover/azure-mgmt-resourcemover/_meta.json @@ -0,0 +1,11 @@ +{ + "autorest": "3.4.2", + "use": [ + "@autorest/python@5.8.0", + "@autorest/modelerfour@4.19.1" + ], + "commit": "2c9ddf48f96c0a78c5ec35ea3aaa636c303395d2", + "repository_url": "https://github.com/Azure/azure-rest-api-specs", + "autorest_command": "autorest specification/resourcemover/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/modelerfour@4.19.1 --version=3.4.2", + "readme": "specification/resourcemover/resource-manager/readme.md" +} \ No newline at end of file diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json new file mode 100644 index 000000000000..603dcf52f645 --- /dev/null +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json @@ -0,0 +1,106 @@ +{ + "chosen_version": "2021-01-01", + "total_api_version_list": ["2021-01-01"], + "client": { + "name": "ResourceMoverServiceAPI", + "filename": "_resource_mover_service_api", + "description": "A first party Azure service orchestrating the move of Azure resources from one Azure region to another or between zones within a region.", + "base_url": "\u0027https://management.azure.com\u0027", + "custom_base_url": null, + "azure_arm": true, + "has_lro_operations": true, + "client_side_validation": false, + "sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ResourceMoverServiceAPIConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}", + "async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ResourceMoverServiceAPIConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}" + }, + "global_parameters": { + "sync": { + "credential": { + "signature": "credential, # type: \"TokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials.TokenCredential", + "required": true + }, + "subscription_id": { + "signature": "subscription_id, # type: str", + "description": "The Subscription ID.", + "docstring_type": "str", + "required": true + } + }, + "async": { + "credential": { + "signature": "credential: \"AsyncTokenCredential\",", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential", + "required": true + }, + "subscription_id": { + "signature": "subscription_id: str,", + "description": "The Subscription ID.", + "docstring_type": "str", + "required": true + } + }, + "constant": { + }, + "call": "credential, subscription_id", + "service_client_specific": { + "sync": { + "api_version": { + "signature": "api_version=None, # type: Optional[str]", + "description": "API version to use if no profile is provided, or if missing in profile.", + "docstring_type": "str", + "required": false + }, + "base_url": { + "signature": "base_url=None, # type: Optional[str]", + "description": "Service URL", + "docstring_type": "str", + "required": false + }, + "profile": { + "signature": "profile=KnownProfiles.default, # type: KnownProfiles", + "description": "A profile definition, from KnownProfiles to dict.", + "docstring_type": "azure.profiles.KnownProfiles", + "required": false + } + }, + "async": { + "api_version": { + "signature": "api_version: Optional[str] = None,", + "description": "API version to use if no profile is provided, or if missing in profile.", + "docstring_type": "str", + "required": false + }, + "base_url": { + "signature": "base_url: Optional[str] = None,", + "description": "Service URL", + "docstring_type": "str", + "required": false + }, + "profile": { + "signature": "profile: KnownProfiles = KnownProfiles.default,", + "description": "A profile definition, from KnownProfiles to dict.", + "docstring_type": "azure.profiles.KnownProfiles", + "required": false + } + } + } + }, + "config": { + "credential": true, + "credential_scopes": ["https://management.azure.com/.default"], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true, + "credential_key_header_name": null, + "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}", + "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}" + }, + "operation_groups": { + "move_collections": "MoveCollectionsOperations", + "move_resources": "MoveResourcesOperations", + "unresolved_dependencies": "UnresolvedDependenciesOperations", + "operations_discovery": "OperationsDiscoveryOperations" + } +} \ No newline at end of file diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_resource_mover_service_api.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_resource_mover_service_api.py index 9d0745872ba5..3f5471df536a 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_resource_mover_service_api.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_resource_mover_service_api.py @@ -16,6 +16,7 @@ from typing import Any, Optional from azure.core.credentials import TokenCredential + from azure.core.pipeline.transport import HttpRequest, HttpResponse from ._configuration import ResourceMoverServiceAPIConfiguration from .operations import MoveCollectionsOperations @@ -71,6 +72,24 @@ def __init__( self.operations_discovery = OperationsDiscoveryOperations( self._client, self._config, self._serialize, self._deserialize) + def _send_request(self, http_request, **kwargs): + # type: (HttpRequest, 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. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.pipeline.transport.HttpResponse + """ + path_format_arguments = { + 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'), + } + http_request.url = self._client.format_url(http_request.url, **path_format_arguments) + stream = kwargs.pop("stream", True) + pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs) + return pipeline_response.http_response + def close(self): # type: () -> None self._client.close() diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py index 653b73a4a199..e5754a47ce68 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.0b1" +VERSION = "1.0.0b1" diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py index d4df41999d41..854bc1e704d1 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py @@ -8,6 +8,7 @@ from typing import Any, Optional, TYPE_CHECKING +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer @@ -68,6 +69,23 @@ def __init__( self.operations_discovery = OperationsDiscoveryOperations( self._client, self._config, self._serialize, self._deserialize) + async def _send_request(self, http_request: HttpRequest, **kwargs: Any) -> AsyncHttpResponse: + """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. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.pipeline.transport.AsyncHttpResponse + """ + path_format_arguments = { + 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'), + } + http_request.url = self._client.format_url(http_request.url, **path_format_arguments) + stream = kwargs.pop("stream", True) + pipeline_response = await self._client._pipeline.run(http_request, stream=stream, **kwargs) + return pipeline_response.http_response + async def close(self) -> None: await self._client.close() diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py index f6abcb3efe6b..2ce39cf42e45 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py @@ -48,7 +48,7 @@ async def create( resource_group_name: str, move_collection_name: str, body: Optional["_models.MoveCollection"] = None, - **kwargs + **kwargs: Any ) -> "_models.MoveCollection": """Creates or updates a move collection. @@ -121,7 +121,7 @@ async def update( resource_group_name: str, move_collection_name: str, body: Optional["_models.UpdateMoveCollectionRequest"] = None, - **kwargs + **kwargs: Any ) -> "_models.MoveCollection": """Updates a move collection. @@ -189,7 +189,7 @@ async def _delete_initial( self, resource_group_name: str, move_collection_name: str, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -238,7 +238,7 @@ async def begin_delete( self, resource_group_name: str, move_collection_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Deletes a move collection. @@ -248,8 +248,8 @@ async def begin_delete( :type move_collection_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -305,7 +305,7 @@ async def get( self, resource_group_name: str, move_collection_name: str, - **kwargs + **kwargs: Any ) -> "_models.MoveCollection": """Gets the move collection. @@ -364,7 +364,7 @@ async def _prepare_initial( resource_group_name: str, move_collection_name: str, body: Optional["_models.PrepareRequest"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -422,7 +422,7 @@ async def begin_prepare( resource_group_name: str, move_collection_name: str, body: Optional["_models.PrepareRequest"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Initiates prepare for the set of resources included in the request body. The prepare operation is on the moveResources that are in the moveState 'PreparePending' or 'PrepareFailed', on a @@ -438,8 +438,8 @@ async def begin_prepare( :type body: ~resource_mover_service_api.models.PrepareRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -497,7 +497,7 @@ async def _initiate_move_initial( resource_group_name: str, move_collection_name: str, body: Optional["_models.ResourceMoveRequest"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -555,7 +555,7 @@ async def begin_initiate_move( resource_group_name: str, move_collection_name: str, body: Optional["_models.ResourceMoveRequest"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Moves the set of resources included in the request body. The move operation is triggered after the moveResources are in the moveState 'MovePending' or 'MoveFailed', on a successful @@ -571,8 +571,8 @@ async def begin_initiate_move( :type body: ~resource_mover_service_api.models.ResourceMoveRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -630,7 +630,7 @@ async def _commit_initial( resource_group_name: str, move_collection_name: str, body: Optional["_models.CommitRequest"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -688,7 +688,7 @@ async def begin_commit( resource_group_name: str, move_collection_name: str, body: Optional["_models.CommitRequest"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Commits the set of resources included in the request body. The commit operation is triggered on the moveResources in the moveState 'CommitPending' or 'CommitFailed', on a successful @@ -704,8 +704,8 @@ async def begin_commit( :type body: ~resource_mover_service_api.models.CommitRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -763,7 +763,7 @@ async def _discard_initial( resource_group_name: str, move_collection_name: str, body: Optional["_models.DiscardRequest"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -821,7 +821,7 @@ async def begin_discard( resource_group_name: str, move_collection_name: str, body: Optional["_models.DiscardRequest"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Discards the set of resources included in the request body. The discard operation is triggered on the moveResources in the moveState 'CommitPending' or 'DiscardFailed', on a successful @@ -837,8 +837,8 @@ async def begin_discard( :type body: ~resource_mover_service_api.models.DiscardRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -895,7 +895,7 @@ async def _resolve_dependencies_initial( self, resource_group_name: str, move_collection_name: str, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -944,7 +944,7 @@ async def begin_resolve_dependencies( self, resource_group_name: str, move_collection_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Computes, resolves and validate the dependencies of the moveResources in the move collection. @@ -954,8 +954,8 @@ async def begin_resolve_dependencies( :type move_collection_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -1012,7 +1012,7 @@ async def _bulk_remove_initial( resource_group_name: str, move_collection_name: str, body: Optional["_models.BulkRemoveRequest"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -1070,7 +1070,7 @@ async def begin_bulk_remove( resource_group_name: str, move_collection_name: str, body: Optional["_models.BulkRemoveRequest"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Removes the set of move resources included in the request body from move collection. The orchestration is done by service. To aid the user to prerequisite the operation the client can @@ -1084,8 +1084,8 @@ async def begin_bulk_remove( :type body: ~resource_mover_service_api.models.BulkRemoveRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -1140,7 +1140,7 @@ def get_long_running_output(pipeline_response): def list_move_collections_by_subscription( self, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.MoveCollectionResultList"]: """Get all Move Collections. @@ -1209,7 +1209,7 @@ async def get_next(next_link=None): def list_move_collections_by_resource_group( self, resource_group_name: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.MoveCollectionResultList"]: """Get all Move Collections. @@ -1283,7 +1283,7 @@ async def list_required_for( resource_group_name: str, move_collection_name: str, source_id: str, - **kwargs + **kwargs: Any ) -> "_models.RequiredForResourcesCollection": """List of the move resources for which an arm resource is required for. diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py index 3cbf40f3fe8b..fa7acfac20c8 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py @@ -48,7 +48,7 @@ def list( resource_group_name: str, move_collection_name: str, filter: Optional[str] = None, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.MoveResourceCollection"]: """Lists the Move Resources in the move collection. @@ -129,7 +129,7 @@ async def _create_initial( move_collection_name: str, move_resource_name: str, body: Optional["_models.MoveResource"] = None, - **kwargs + **kwargs: Any ) -> Optional["_models.MoveResource"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.MoveResource"]] error_map = { @@ -189,7 +189,7 @@ async def begin_create( move_collection_name: str, move_resource_name: str, body: Optional["_models.MoveResource"] = None, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.MoveResource"]: """Creates or updates a Move Resource in the move collection. @@ -203,8 +203,8 @@ async def begin_create( :type body: ~resource_mover_service_api.models.MoveResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either MoveResource or the result of cls(response) @@ -264,7 +264,7 @@ async def _delete_initial( resource_group_name: str, move_collection_name: str, move_resource_name: str, - **kwargs + **kwargs: Any ) -> Optional["_models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.OperationStatus"]] error_map = { @@ -315,7 +315,7 @@ async def begin_delete( resource_group_name: str, move_collection_name: str, move_resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.OperationStatus"]: """Deletes a Move Resource from the move collection. @@ -327,8 +327,8 @@ async def begin_delete( :type move_resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either OperationStatus or the result of cls(response) @@ -387,7 +387,7 @@ async def get( resource_group_name: str, move_collection_name: str, move_resource_name: str, - **kwargs + **kwargs: Any ) -> "_models.MoveResource": """Gets the Move Resource. diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py index 12cd96934ef7..a89870d8f55d 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py @@ -42,7 +42,7 @@ def __init__(self, client, config, serializer, deserializer) -> None: async def get( self, - **kwargs + **kwargs: Any ) -> "_models.OperationsDiscoveryCollection": """get. diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py index 084cfcd48cff..74fb5a39f29c 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py @@ -48,7 +48,7 @@ def get( dependency_level: Optional[Union[str, "_models.DependencyLevel"]] = None, orderby: Optional[str] = None, filter: Optional[str] = None, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.UnresolvedDependencyCollection"]: """Gets a list of unresolved dependencies. diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models.py index 81b508f759cd..955a6d742206 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models.py @@ -513,8 +513,8 @@ class LBFrontendIPConfigurationResourceSettings(msrest.serialization.Model): :type private_ip_address: str :param private_ip_allocation_method: Gets or sets PrivateIP allocation method (Static/Dynamic). :type private_ip_allocation_method: str - :param subnet: Defines reference to a proxy resource. - :type subnet: ~resource_mover_service_api.models.ProxyResourceReference + :param subnet: Defines reference to subnet. + :type subnet: ~resource_mover_service_api.models.SubnetReference :param zones: Gets or sets the csv list of zones. :type zones: str """ @@ -523,7 +523,7 @@ class LBFrontendIPConfigurationResourceSettings(msrest.serialization.Model): 'name': {'key': 'name', 'type': 'str'}, 'private_ip_address': {'key': 'privateIpAddress', 'type': 'str'}, 'private_ip_allocation_method': {'key': 'privateIpAllocationMethod', 'type': 'str'}, - 'subnet': {'key': 'subnet', 'type': 'ProxyResourceReference'}, + 'subnet': {'key': 'subnet', 'type': 'SubnetReference'}, 'zones': {'key': 'zones', 'type': 'str'}, } @@ -766,7 +766,7 @@ class MoveCollectionProperties(msrest.serialization.Model): "Succeeded", "Updating", "Creating", "Failed". :vartype provisioning_state: str or ~resource_mover_service_api.models.ProvisioningState :ivar errors: Defines the move collection errors. - :vartype errors: ~resource_mover_service_api.models.MoveResourceError + :vartype errors: ~resource_mover_service_api.models.MoveCollectionPropertiesErrors """ _validation = { @@ -780,7 +780,7 @@ class MoveCollectionProperties(msrest.serialization.Model): 'source_region': {'key': 'sourceRegion', 'type': 'str'}, 'target_region': {'key': 'targetRegion', 'type': 'str'}, 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, - 'errors': {'key': 'errors', 'type': 'MoveResourceError'}, + 'errors': {'key': 'errors', 'type': 'MoveCollectionPropertiesErrors'}, } def __init__( @@ -1128,7 +1128,7 @@ class MoveResourceProperties(msrest.serialization.Model): :ivar source_resource_settings: Gets or sets the source resource settings. :vartype source_resource_settings: ~resource_mover_service_api.models.ResourceSettings :ivar move_status: Defines the move resource status. - :vartype move_status: ~resource_mover_service_api.models.MoveResourceStatus + :vartype move_status: ~resource_mover_service_api.models.MoveResourcePropertiesMoveStatus :ivar depends_on: Gets or sets the move resource dependencies. :vartype depends_on: list[~resource_mover_service_api.models.MoveResourceDependency] :param depends_on_overrides: Gets or sets the move resource dependencies overrides. @@ -1138,7 +1138,7 @@ class MoveResourceProperties(msrest.serialization.Model): the move collection. :vartype is_resolve_required: bool :ivar errors: Defines the move resource errors. - :vartype errors: ~resource_mover_service_api.models.MoveResourceError + :vartype errors: ~resource_mover_service_api.models.MoveResourcePropertiesErrors """ _validation = { @@ -1159,11 +1159,11 @@ class MoveResourceProperties(msrest.serialization.Model): 'existing_target_id': {'key': 'existingTargetId', 'type': 'str'}, 'resource_settings': {'key': 'resourceSettings', 'type': 'ResourceSettings'}, 'source_resource_settings': {'key': 'sourceResourceSettings', 'type': 'ResourceSettings'}, - 'move_status': {'key': 'moveStatus', 'type': 'MoveResourceStatus'}, + 'move_status': {'key': 'moveStatus', 'type': 'MoveResourcePropertiesMoveStatus'}, 'depends_on': {'key': 'dependsOn', 'type': '[MoveResourceDependency]'}, 'depends_on_overrides': {'key': 'dependsOnOverrides', 'type': '[MoveResourceDependencyOverride]'}, 'is_resolve_required': {'key': 'isResolveRequired', 'type': 'bool'}, - 'errors': {'key': 'errors', 'type': 'MoveResourceError'}, + 'errors': {'key': 'errors', 'type': 'MoveResourcePropertiesErrors'}, } def __init__( @@ -1357,29 +1357,30 @@ class NicIpConfigurationResourceSettings(msrest.serialization.Model): :type private_ip_address: str :param private_ip_allocation_method: Gets or sets the private IP address allocation method. :type private_ip_allocation_method: str - :param subnet: Defines reference to a proxy resource. - :type subnet: ~resource_mover_service_api.models.ProxyResourceReference + :param subnet: Defines reference to subnet. + :type subnet: ~resource_mover_service_api.models.SubnetReference :param primary: Gets or sets a value indicating whether this IP configuration is the primary. :type primary: bool :param load_balancer_backend_address_pools: Gets or sets the references of the load balancer backend address pools. :type load_balancer_backend_address_pools: - list[~resource_mover_service_api.models.ProxyResourceReference] + list[~resource_mover_service_api.models.LoadBalancerBackendAddressPoolReference] :param load_balancer_nat_rules: Gets or sets the references of the load balancer NAT rules. - :type load_balancer_nat_rules: list[~resource_mover_service_api.models.ProxyResourceReference] - :param public_ip: Defines reference to an Azure resource. - :type public_ip: ~resource_mover_service_api.models.AzureResourceReference + :type load_balancer_nat_rules: + list[~resource_mover_service_api.models.LoadBalancerNatRuleReference] + :param public_ip: Defines reference to a public IP. + :type public_ip: ~resource_mover_service_api.models.PublicIpReference """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'private_ip_address': {'key': 'privateIpAddress', 'type': 'str'}, 'private_ip_allocation_method': {'key': 'privateIpAllocationMethod', 'type': 'str'}, - 'subnet': {'key': 'subnet', 'type': 'ProxyResourceReference'}, + 'subnet': {'key': 'subnet', 'type': 'SubnetReference'}, 'primary': {'key': 'primary', 'type': 'bool'}, - 'load_balancer_backend_address_pools': {'key': 'loadBalancerBackendAddressPools', 'type': '[ProxyResourceReference]'}, - 'load_balancer_nat_rules': {'key': 'loadBalancerNatRules', 'type': '[ProxyResourceReference]'}, - 'public_ip': {'key': 'publicIp', 'type': 'AzureResourceReference'}, + 'load_balancer_backend_address_pools': {'key': 'loadBalancerBackendAddressPools', 'type': '[LoadBalancerBackendAddressPoolReference]'}, + 'load_balancer_nat_rules': {'key': 'loadBalancerNatRules', 'type': '[LoadBalancerNatRuleReference]'}, + 'public_ip': {'key': 'publicIp', 'type': 'PublicIpReference'}, } def __init__( @@ -1564,7 +1565,7 @@ class OperationsDiscovery(msrest.serialization.Model): Default value is "user,system". :type origin: str :param properties: Any object. - :type properties: object + :type properties: any """ _attribute_map = { @@ -1629,7 +1630,7 @@ class OperationStatus(msrest.serialization.Model): :ivar error: Error stating all error details for the operation. :vartype error: ~resource_mover_service_api.models.OperationStatusError :ivar properties: Custom data. - :vartype properties: object + :vartype properties: any """ _validation = { @@ -2038,14 +2039,14 @@ class SubnetResourceSettings(msrest.serialization.Model): :type name: str :param address_prefix: Gets or sets address prefix for the subnet. :type address_prefix: str - :param network_security_group: Defines reference to an Azure resource. - :type network_security_group: ~resource_mover_service_api.models.AzureResourceReference + :param network_security_group: Defines reference to NSG. + :type network_security_group: ~resource_mover_service_api.models.NsgReference """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'address_prefix': {'key': 'addressPrefix', 'type': 'str'}, - 'network_security_group': {'key': 'networkSecurityGroup', 'type': 'AzureResourceReference'}, + 'network_security_group': {'key': 'networkSecurityGroup', 'type': 'NsgReference'}, } def __init__( diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models_py3.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models_py3.py index 1538b775a474..103aacce22b7 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models_py3.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Dict, List, Optional, Union +from typing import Any, Dict, List, Optional, Union import msrest.serialization @@ -559,8 +559,8 @@ class LBFrontendIPConfigurationResourceSettings(msrest.serialization.Model): :type private_ip_address: str :param private_ip_allocation_method: Gets or sets PrivateIP allocation method (Static/Dynamic). :type private_ip_allocation_method: str - :param subnet: Defines reference to a proxy resource. - :type subnet: ~resource_mover_service_api.models.ProxyResourceReference + :param subnet: Defines reference to subnet. + :type subnet: ~resource_mover_service_api.models.SubnetReference :param zones: Gets or sets the csv list of zones. :type zones: str """ @@ -569,7 +569,7 @@ class LBFrontendIPConfigurationResourceSettings(msrest.serialization.Model): 'name': {'key': 'name', 'type': 'str'}, 'private_ip_address': {'key': 'privateIpAddress', 'type': 'str'}, 'private_ip_allocation_method': {'key': 'privateIpAllocationMethod', 'type': 'str'}, - 'subnet': {'key': 'subnet', 'type': 'ProxyResourceReference'}, + 'subnet': {'key': 'subnet', 'type': 'SubnetReference'}, 'zones': {'key': 'zones', 'type': 'str'}, } @@ -579,7 +579,7 @@ def __init__( name: Optional[str] = None, private_ip_address: Optional[str] = None, private_ip_allocation_method: Optional[str] = None, - subnet: Optional["ProxyResourceReference"] = None, + subnet: Optional["SubnetReference"] = None, zones: Optional[str] = None, **kwargs ): @@ -840,7 +840,7 @@ class MoveCollectionProperties(msrest.serialization.Model): "Succeeded", "Updating", "Creating", "Failed". :vartype provisioning_state: str or ~resource_mover_service_api.models.ProvisioningState :ivar errors: Defines the move collection errors. - :vartype errors: ~resource_mover_service_api.models.MoveResourceError + :vartype errors: ~resource_mover_service_api.models.MoveCollectionPropertiesErrors """ _validation = { @@ -854,7 +854,7 @@ class MoveCollectionProperties(msrest.serialization.Model): 'source_region': {'key': 'sourceRegion', 'type': 'str'}, 'target_region': {'key': 'targetRegion', 'type': 'str'}, 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, - 'errors': {'key': 'errors', 'type': 'MoveResourceError'}, + 'errors': {'key': 'errors', 'type': 'MoveCollectionPropertiesErrors'}, } def __init__( @@ -1233,7 +1233,7 @@ class MoveResourceProperties(msrest.serialization.Model): :ivar source_resource_settings: Gets or sets the source resource settings. :vartype source_resource_settings: ~resource_mover_service_api.models.ResourceSettings :ivar move_status: Defines the move resource status. - :vartype move_status: ~resource_mover_service_api.models.MoveResourceStatus + :vartype move_status: ~resource_mover_service_api.models.MoveResourcePropertiesMoveStatus :ivar depends_on: Gets or sets the move resource dependencies. :vartype depends_on: list[~resource_mover_service_api.models.MoveResourceDependency] :param depends_on_overrides: Gets or sets the move resource dependencies overrides. @@ -1243,7 +1243,7 @@ class MoveResourceProperties(msrest.serialization.Model): the move collection. :vartype is_resolve_required: bool :ivar errors: Defines the move resource errors. - :vartype errors: ~resource_mover_service_api.models.MoveResourceError + :vartype errors: ~resource_mover_service_api.models.MoveResourcePropertiesErrors """ _validation = { @@ -1264,11 +1264,11 @@ class MoveResourceProperties(msrest.serialization.Model): 'existing_target_id': {'key': 'existingTargetId', 'type': 'str'}, 'resource_settings': {'key': 'resourceSettings', 'type': 'ResourceSettings'}, 'source_resource_settings': {'key': 'sourceResourceSettings', 'type': 'ResourceSettings'}, - 'move_status': {'key': 'moveStatus', 'type': 'MoveResourceStatus'}, + 'move_status': {'key': 'moveStatus', 'type': 'MoveResourcePropertiesMoveStatus'}, 'depends_on': {'key': 'dependsOn', 'type': '[MoveResourceDependency]'}, 'depends_on_overrides': {'key': 'dependsOnOverrides', 'type': '[MoveResourceDependencyOverride]'}, 'is_resolve_required': {'key': 'isResolveRequired', 'type': 'bool'}, - 'errors': {'key': 'errors', 'type': 'MoveResourceError'}, + 'errors': {'key': 'errors', 'type': 'MoveResourcePropertiesErrors'}, } def __init__( @@ -1482,29 +1482,30 @@ class NicIpConfigurationResourceSettings(msrest.serialization.Model): :type private_ip_address: str :param private_ip_allocation_method: Gets or sets the private IP address allocation method. :type private_ip_allocation_method: str - :param subnet: Defines reference to a proxy resource. - :type subnet: ~resource_mover_service_api.models.ProxyResourceReference + :param subnet: Defines reference to subnet. + :type subnet: ~resource_mover_service_api.models.SubnetReference :param primary: Gets or sets a value indicating whether this IP configuration is the primary. :type primary: bool :param load_balancer_backend_address_pools: Gets or sets the references of the load balancer backend address pools. :type load_balancer_backend_address_pools: - list[~resource_mover_service_api.models.ProxyResourceReference] + list[~resource_mover_service_api.models.LoadBalancerBackendAddressPoolReference] :param load_balancer_nat_rules: Gets or sets the references of the load balancer NAT rules. - :type load_balancer_nat_rules: list[~resource_mover_service_api.models.ProxyResourceReference] - :param public_ip: Defines reference to an Azure resource. - :type public_ip: ~resource_mover_service_api.models.AzureResourceReference + :type load_balancer_nat_rules: + list[~resource_mover_service_api.models.LoadBalancerNatRuleReference] + :param public_ip: Defines reference to a public IP. + :type public_ip: ~resource_mover_service_api.models.PublicIpReference """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'private_ip_address': {'key': 'privateIpAddress', 'type': 'str'}, 'private_ip_allocation_method': {'key': 'privateIpAllocationMethod', 'type': 'str'}, - 'subnet': {'key': 'subnet', 'type': 'ProxyResourceReference'}, + 'subnet': {'key': 'subnet', 'type': 'SubnetReference'}, 'primary': {'key': 'primary', 'type': 'bool'}, - 'load_balancer_backend_address_pools': {'key': 'loadBalancerBackendAddressPools', 'type': '[ProxyResourceReference]'}, - 'load_balancer_nat_rules': {'key': 'loadBalancerNatRules', 'type': '[ProxyResourceReference]'}, - 'public_ip': {'key': 'publicIp', 'type': 'AzureResourceReference'}, + 'load_balancer_backend_address_pools': {'key': 'loadBalancerBackendAddressPools', 'type': '[LoadBalancerBackendAddressPoolReference]'}, + 'load_balancer_nat_rules': {'key': 'loadBalancerNatRules', 'type': '[LoadBalancerNatRuleReference]'}, + 'public_ip': {'key': 'publicIp', 'type': 'PublicIpReference'}, } def __init__( @@ -1513,11 +1514,11 @@ def __init__( name: Optional[str] = None, private_ip_address: Optional[str] = None, private_ip_allocation_method: Optional[str] = None, - subnet: Optional["ProxyResourceReference"] = None, + subnet: Optional["SubnetReference"] = None, primary: Optional[bool] = None, - load_balancer_backend_address_pools: Optional[List["ProxyResourceReference"]] = None, - load_balancer_nat_rules: Optional[List["ProxyResourceReference"]] = None, - public_ip: Optional["AzureResourceReference"] = None, + load_balancer_backend_address_pools: Optional[List["LoadBalancerBackendAddressPoolReference"]] = None, + load_balancer_nat_rules: Optional[List["LoadBalancerNatRuleReference"]] = None, + public_ip: Optional["PublicIpReference"] = None, **kwargs ): super(NicIpConfigurationResourceSettings, self).__init__(**kwargs) @@ -1711,7 +1712,7 @@ class OperationsDiscovery(msrest.serialization.Model): Default value is "user,system". :type origin: str :param properties: Any object. - :type properties: object + :type properties: any """ _attribute_map = { @@ -1729,7 +1730,7 @@ def __init__( is_data_action: Optional[bool] = None, display: Optional["Display"] = None, origin: Optional[str] = None, - properties: Optional[object] = None, + properties: Optional[Any] = None, **kwargs ): super(OperationsDiscovery, self).__init__(**kwargs) @@ -1785,7 +1786,7 @@ class OperationStatus(msrest.serialization.Model): :ivar error: Error stating all error details for the operation. :vartype error: ~resource_mover_service_api.models.OperationStatusError :ivar properties: Custom data. - :vartype properties: object + :vartype properties: any """ _validation = { @@ -2226,14 +2227,14 @@ class SubnetResourceSettings(msrest.serialization.Model): :type name: str :param address_prefix: Gets or sets address prefix for the subnet. :type address_prefix: str - :param network_security_group: Defines reference to an Azure resource. - :type network_security_group: ~resource_mover_service_api.models.AzureResourceReference + :param network_security_group: Defines reference to NSG. + :type network_security_group: ~resource_mover_service_api.models.NsgReference """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'address_prefix': {'key': 'addressPrefix', 'type': 'str'}, - 'network_security_group': {'key': 'networkSecurityGroup', 'type': 'AzureResourceReference'}, + 'network_security_group': {'key': 'networkSecurityGroup', 'type': 'NsgReference'}, } def __init__( @@ -2241,7 +2242,7 @@ def __init__( *, name: Optional[str] = None, address_prefix: Optional[str] = None, - network_security_group: Optional["AzureResourceReference"] = None, + network_security_group: Optional["NsgReference"] = None, **kwargs ): super(SubnetResourceSettings, self).__init__(**kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_collections_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_collections_operations.py index 7bcbe83ba037..e8b86493b7e3 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_collections_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_collections_operations.py @@ -256,8 +256,8 @@ def begin_delete( :type move_collection_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -449,8 +449,8 @@ def begin_prepare( :type body: ~resource_mover_service_api.models.PrepareRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -584,8 +584,8 @@ def begin_initiate_move( :type body: ~resource_mover_service_api.models.ResourceMoveRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -719,8 +719,8 @@ def begin_commit( :type body: ~resource_mover_service_api.models.CommitRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -854,8 +854,8 @@ def begin_discard( :type body: ~resource_mover_service_api.models.DiscardRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -973,8 +973,8 @@ def begin_resolve_dependencies( :type move_collection_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) @@ -1105,8 +1105,8 @@ def begin_bulk_remove( :type body: ~resource_mover_service_api.models.BulkRemoveRequest :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_resources_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_resources_operations.py index 2418793fca3a..78513121e40a 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_resources_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_move_resources_operations.py @@ -210,8 +210,8 @@ def begin_create( :type body: ~resource_mover_service_api.models.MoveResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either MoveResource or the result of cls(response) @@ -336,8 +336,8 @@ def begin_delete( :type move_resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: True for ARMPolling, False for no polling, or a - polling object for personal polling strategy + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either OperationStatus or the result of cls(response) From c8f5e542520de3796757a6b8b017c26972630174 Mon Sep 17 00:00:00 2001 From: PythonSdkPipelines Date: Fri, 21 May 2021 02:05:27 +0000 Subject: [PATCH 2/3] version,CHANGELOG --- sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md | 4 ++++ .../azure/mgmt/resourcemover/_version.py | 2 +- sdk/resourcemover/azure-mgmt-resourcemover/setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md b/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md index 1f018649aaec..cf1d3e213123 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md +++ b/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History +## 1.1.0b2 (2021-05-21) + + + ## 1.1.0b1 (2021-03-09) * version number change diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py index e5754a47ce68..f1fb63697cf5 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0b1" +VERSION = "1.1.0b2" diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/setup.py b/sdk/resourcemover/azure-mgmt-resourcemover/setup.py index 6dd50b81997c..1ddee00fa455 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/setup.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/setup.py @@ -80,7 +80,7 @@ 'azure.mgmt', ]), install_requires=[ - 'msrest>=0.5.0', + 'msrest>=0.6.21', 'azure-common~=1.1', 'azure-mgmt-core>=1.2.0,<2.0.0', ], From ec434c82915c70be6a9106298603f773d5002997 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Mon, 24 May 2021 16:08:21 +0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md b/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md index cf1d3e213123..37f8c4846d92 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md +++ b/sdk/resourcemover/azure-mgmt-resourcemover/CHANGELOG.md @@ -1,8 +1,8 @@ # Release History -## 1.1.0b2 (2021-05-21) - +## 1.1.0b2 (2021-05-24) + - Models rename ## 1.1.0b1 (2021-03-09)