diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/__init__.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/__init__.py index a26441be9fd6..055e320b7ba3 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/__init__.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/__init__.py @@ -13,7 +13,7 @@ __all__ = ['ResourceMoverServiceAPI'] try: - from ._patch import patch_sdk + from ._patch import patch_sdk # type: ignore patch_sdk() except ImportError: pass diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_configuration.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_configuration.py index e95a95d31b28..d5a87ef6e72d 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_configuration.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_configuration.py @@ -10,6 +10,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies +from azure.mgmt.core.policies import ARMHttpLoggingPolicy from ._version import VERSION @@ -48,8 +49,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2019-10-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-resourcemover/{}'.format(VERSION)) self._configure(**kwargs) @@ -62,6 +62,7 @@ def _configure( 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) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json index eb6983123964..a0046b6ae5d9 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/_metadata.json @@ -4,7 +4,11 @@ "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." + "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 }, "global_parameters": { "sync_method": { @@ -41,7 +45,10 @@ }, "config": { "credential": true, - "credential_scopes": ["https://management.azure.com/.default"] + "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 }, "operation_groups": { "move_collections": "MoveCollectionsOperations", 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 3fa7978c637e..95e84007ac63 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.1b1" +VERSION = "0.1.0-preview" diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/__init__.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/__init__.py index 30a18f6e7433..f487634cb60f 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/__init__.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._resource_mover_service_api_async import ResourceMoverServiceAPI +from ._resource_mover_service_api import ResourceMoverServiceAPI __all__ = ['ResourceMoverServiceAPI'] diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration.py similarity index 91% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration.py index 6fe8878c7e56..dc633dacd553 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_configuration.py @@ -10,6 +10,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies +from azure.mgmt.core.policies import ARMHttpLoggingPolicy from .._version import VERSION @@ -45,8 +46,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2019-10-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-resourcemover/{}'.format(VERSION)) self._configure(**kwargs) @@ -58,6 +58,7 @@ def _configure( 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.AsyncRetryPolicy(**kwargs) self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py similarity index 87% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py index 3d08451a3ff9..b8db859a391f 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/_resource_mover_service_api.py @@ -15,11 +15,11 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import ResourceMoverServiceAPIConfiguration -from .operations_async import MoveCollectionsOperations -from .operations_async import MoveResourcesOperations -from .operations_async import UnresolvedDependenciesOperations -from .operations_async import OperationsDiscoveryOperations +from ._configuration import ResourceMoverServiceAPIConfiguration +from .operations import MoveCollectionsOperations +from .operations import MoveResourcesOperations +from .operations import UnresolvedDependenciesOperations +from .operations import OperationsDiscoveryOperations from .. import models @@ -27,13 +27,13 @@ class ResourceMoverServiceAPI(object): """A first party Azure service orchestrating the move of Azure resources from one Azure region to another or between zones within a region. :ivar move_collections: MoveCollectionsOperations operations - :vartype move_collections: resource_mover_service_api.aio.operations_async.MoveCollectionsOperations + :vartype move_collections: resource_mover_service_api.aio.operations.MoveCollectionsOperations :ivar move_resources: MoveResourcesOperations operations - :vartype move_resources: resource_mover_service_api.aio.operations_async.MoveResourcesOperations + :vartype move_resources: resource_mover_service_api.aio.operations.MoveResourcesOperations :ivar unresolved_dependencies: UnresolvedDependenciesOperations operations - :vartype unresolved_dependencies: resource_mover_service_api.aio.operations_async.UnresolvedDependenciesOperations + :vartype unresolved_dependencies: resource_mover_service_api.aio.operations.UnresolvedDependenciesOperations :ivar operations_discovery: OperationsDiscoveryOperations operations - :vartype operations_discovery: resource_mover_service_api.aio.operations_async.OperationsDiscoveryOperations + :vartype operations_discovery: resource_mover_service_api.aio.operations.OperationsDiscoveryOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The Subscription ID. diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/__init__.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/__init__.py similarity index 66% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/__init__.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/__init__.py index 2d5f1a423391..fb98319827bc 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/__init__.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/__init__.py @@ -6,10 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._move_collections_operations_async import MoveCollectionsOperations -from ._move_resources_operations_async import MoveResourcesOperations -from ._unresolved_dependencies_operations_async import UnresolvedDependenciesOperations -from ._operations_discovery_operations_async import OperationsDiscoveryOperations +from ._move_collections_operations import MoveCollectionsOperations +from ._move_resources_operations import MoveResourcesOperations +from ._unresolved_dependencies_operations import UnresolvedDependenciesOperations +from ._operations_discovery_operations import OperationsDiscoveryOperations __all__ = [ 'MoveCollectionsOperations', diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_collections_operations_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py similarity index 92% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_collections_operations_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py index 45707f2f6cfe..c8257bbe1403 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_collections_operations_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_collections_operations.py @@ -9,7 +9,7 @@ import warnings from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod @@ -64,10 +64,13 @@ async def create( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self.create.metadata['url'] # type: ignore @@ -85,7 +88,7 @@ async def create( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -94,7 +97,6 @@ async def create( body_content = None body_content_kwargs['content'] = body_content request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -135,10 +137,13 @@ async def update( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self.update.metadata['url'] # type: ignore @@ -156,7 +161,7 @@ async def update( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -165,7 +170,6 @@ async def update( body_content = None body_content_kwargs['content'] = body_content request = self._client.patch(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -188,9 +192,12 @@ async def _delete_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -207,7 +214,7 @@ async def _delete_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.delete(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) @@ -306,9 +313,12 @@ async def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -325,7 +335,7 @@ async def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) @@ -351,10 +361,13 @@ async def _prepare_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._prepare_initial.metadata['url'] # type: ignore @@ -372,7 +385,7 @@ async def _prepare_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -381,7 +394,6 @@ async def _prepare_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -407,10 +419,10 @@ async def begin_prepare( **kwargs ) -> 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 - successful completion the moveResource moveState do a transition to MovePending. To aid the - user to prerequisite the operation the client can call operation with validateOnly property set - to true. + is on the moveResources that are in the moveState 'PreparePending' or 'PrepareFailed', on a + successful completion the moveResource moveState do a transition to MovePending. To aid the + user to prerequisite the operation the client can call operation with validateOnly property set + to true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -476,10 +488,13 @@ async def _initiate_move_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._initiate_move_initial.metadata['url'] # type: ignore @@ -497,7 +512,7 @@ async def _initiate_move_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -506,7 +521,6 @@ async def _initiate_move_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -532,10 +546,10 @@ async def begin_initiate_move( **kwargs ) -> 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 - completion the moveResource moveState do a transition to CommitPending. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + the moveResources are in the moveState 'MovePending' or 'MoveFailed', on a successful + completion the moveResource moveState do a transition to CommitPending. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -601,10 +615,13 @@ async def _commit_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._commit_initial.metadata['url'] # type: ignore @@ -622,7 +639,7 @@ async def _commit_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -631,7 +648,6 @@ async def _commit_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -657,10 +673,10 @@ async def begin_commit( **kwargs ) -> 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 - completion the moveResource moveState do a transition to Committed. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + the moveResources in the moveState 'CommitPending' or 'CommitFailed', on a successful + completion the moveResource moveState do a transition to Committed. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -726,10 +742,13 @@ async def _discard_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._discard_initial.metadata['url'] # type: ignore @@ -747,7 +766,7 @@ async def _discard_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -756,7 +775,6 @@ async def _discard_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -782,10 +800,10 @@ async def begin_discard( **kwargs ) -> 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 - completion the moveResource moveState do a transition to MovePending. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + on the moveResources in the moveState 'CommitPending' or 'DiscardFailed', on a successful + completion the moveResource moveState do a transition to MovePending. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -850,9 +868,12 @@ async def _resolve_dependencies_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._resolve_dependencies_initial.metadata['url'] # type: ignore @@ -869,7 +890,7 @@ async def _resolve_dependencies_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.post(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) @@ -964,14 +985,17 @@ def list_move_collections_by_subscription( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollectionResultList"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL @@ -1032,14 +1056,17 @@ def list_move_collections_by_resource_group( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollectionResultList"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_resources_operations_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py similarity index 94% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_resources_operations_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py index 727816300472..e7ab08b4db9e 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_move_resources_operations_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_move_resources_operations.py @@ -9,7 +9,7 @@ import warnings from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod @@ -57,7 +57,7 @@ def list( :param move_collection_name: The Move Collection Name. :type move_collection_name: str :param filter: The filter to apply on the operation. For example, you can use - $filter=Properties/ProvisioningState eq 'Succeeded'. + $filter=Properties/ProvisioningState eq 'Succeeded'. :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MoveResourceCollection or the result of cls(response) @@ -65,14 +65,17 @@ def list( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveResourceCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL @@ -129,10 +132,13 @@ async def _create_initial( **kwargs ) -> Optional["models.MoveResource"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MoveResource"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._create_initial.metadata['url'] # type: ignore @@ -151,7 +157,7 @@ async def _create_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -160,7 +166,6 @@ async def _create_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -255,9 +260,12 @@ async def _delete_initial( **kwargs ) -> Optional["models.OperationStatus"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -275,7 +283,7 @@ async def _delete_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.delete(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) @@ -381,9 +389,12 @@ async def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveResource"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -401,7 +412,7 @@ async def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_operations_discovery_operations_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py similarity index 89% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_operations_discovery_operations_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py index ea062168c1d3..4a1800ca1982 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_operations_discovery_operations_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_operations_discovery_operations.py @@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Generic, Optional, TypeVar import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest from azure.mgmt.core.exceptions import ARMErrorFormat @@ -52,9 +52,12 @@ async def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.OperationsDiscoveryCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -65,7 +68,7 @@ async def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_unresolved_dependencies_operations_async.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py similarity index 91% rename from sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_unresolved_dependencies_operations_async.py rename to sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py index f806c5e873c7..54eccbf1cd7b 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations_async/_unresolved_dependencies_operations_async.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/aio/operations/_unresolved_dependencies_operations.py @@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, Generic, Optional, TypeVar import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest from azure.mgmt.core.exceptions import ARMErrorFormat @@ -58,9 +58,12 @@ async def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.UnresolvedDependencyCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -77,7 +80,7 @@ async def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/__init__.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/__init__.py index f11d29625f1b..8794ebc44a31 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/__init__.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/__init__.py @@ -60,6 +60,7 @@ from ._models_py3 import SqlServerResourceSettings from ._models_py3 import SubnetReference from ._models_py3 import SubnetResourceSettings + from ._models_py3 import SummaryItem from ._models_py3 import UnresolvedDependency from ._models_py3 import UnresolvedDependencyCollection from ._models_py3 import UpdateMoveCollectionRequest @@ -119,6 +120,7 @@ from ._models import SqlServerResourceSettings # type: ignore from ._models import SubnetReference # type: ignore from ._models import SubnetResourceSettings # type: ignore + from ._models import SummaryItem # type: ignore from ._models import UnresolvedDependency # type: ignore from ._models import UnresolvedDependencyCollection # type: ignore from ._models import UpdateMoveCollectionRequest # type: ignore @@ -127,6 +129,7 @@ from ._resource_mover_service_api_enums import ( DependencyType, + JobName, MoveResourceInputType, MoveState, ProvisioningState, @@ -190,12 +193,14 @@ 'SqlServerResourceSettings', 'SubnetReference', 'SubnetResourceSettings', + 'SummaryItem', 'UnresolvedDependency', 'UnresolvedDependencyCollection', 'UpdateMoveCollectionRequest', 'VirtualMachineResourceSettings', 'VirtualNetworkResourceSettings', 'DependencyType', + 'JobName', 'MoveResourceInputType', 'MoveState', 'ProvisioningState', 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 edad9e8e4f8b..63b6ae7a6376 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 @@ -98,7 +98,7 @@ def __init__( **kwargs ): super(ResourceSettings, self).__init__(**kwargs) - self.resource_type = None + self.resource_type = None # type: Optional[str] self.target_resource_name = kwargs['target_resource_name'] @@ -137,7 +137,7 @@ def __init__( **kwargs ): super(AvailabilitySetResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Compute/availabilitySets' + self.resource_type = 'Microsoft.Compute/availabilitySets' # type: str self.fault_domain = kwargs.get('fault_domain', None) self.update_domain = kwargs.get('update_domain', None) @@ -368,14 +368,14 @@ class JobStatus(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar job_name: Defines the job name. Default value: "InitialSync". - :vartype job_name: str + :ivar job_name: Defines the job name. Possible values include: "InitialSync". + :vartype job_name: str or ~resource_mover_service_api.models.JobName :ivar job_progress: Gets or sets the monitoring job percentage. :vartype job_progress: str """ _validation = { - 'job_name': {'readonly': True, 'constant': True}, + 'job_name': {'readonly': True}, 'job_progress': {'readonly': True}, } @@ -384,8 +384,6 @@ class JobStatus(msrest.serialization.Model): 'job_progress': {'key': 'jobProgress', 'type': 'str'}, } - job_name = "InitialSync" - def __init__( self, **kwargs @@ -580,7 +578,7 @@ def __init__( **kwargs ): super(LoadBalancerResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Network/loadBalancers' + self.resource_type = 'Microsoft.Network/loadBalancers' # type: str self.sku = kwargs.get('sku', None) self.frontend_ip_configurations = kwargs.get('frontend_ip_configurations', None) self.backend_address_pools = kwargs.get('backend_address_pools', None) @@ -790,11 +788,14 @@ class MoveResourceCollection(msrest.serialization.Model): :type value: list[~resource_mover_service_api.models.MoveResource] :param next_link: Gets the value of next link. :type next_link: str + :param summary: Gets or the list of summary items. + :type summary: list[~resource_mover_service_api.models.SummaryItem] """ _attribute_map = { 'value': {'key': 'value', 'type': '[MoveResource]'}, 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'summary': {'key': 'summary', 'type': '[SummaryItem]'}, } def __init__( @@ -804,6 +805,7 @@ def __init__( super(MoveResourceCollection, self).__init__(**kwargs) self.value = kwargs.get('value', None) self.next_link = kwargs.get('next_link', None) + self.summary = kwargs.get('summary', None) class MoveResourceDependency(msrest.serialization.Model): @@ -1170,7 +1172,7 @@ def __init__( **kwargs ): super(MoveResourcePropertiesSourceResourceSettings, self).__init__(**kwargs) - self.resource_type = 'MoveResourceProperties-sourceResourceSettings' + self.resource_type = 'MoveResourceProperties-sourceResourceSettings' # type: str class NetworkInterfaceResourceSettings(ResourceSettings): @@ -1208,7 +1210,7 @@ def __init__( **kwargs ): super(NetworkInterfaceResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Network/networkInterfaces' + self.resource_type = 'Microsoft.Network/networkInterfaces' # type: str self.ip_configurations = kwargs.get('ip_configurations', None) self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None) @@ -1243,7 +1245,7 @@ def __init__( **kwargs ): super(NetworkSecurityGroupResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Network/networkSecurityGroups' + self.resource_type = 'Microsoft.Network/networkSecurityGroups' # type: str self.security_rules = kwargs.get('security_rules', None) @@ -1647,7 +1649,7 @@ def __init__( **kwargs ): super(PublicIPAddressResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Network/publicIPAddresses' + self.resource_type = 'Microsoft.Network/publicIPAddresses' # type: str self.domain_name_label = kwargs.get('domain_name_label', None) self.f_qdn = kwargs.get('f_qdn', None) self.public_ip_allocation_method = kwargs.get('public_ip_allocation_method', None) @@ -1682,7 +1684,7 @@ def __init__( **kwargs ): super(ResourceGroupResourceSettings, self).__init__(**kwargs) - self.resource_type = 'resourceGroups' + self.resource_type = 'resourceGroups' # type: str class ResourceMoveRequest(msrest.serialization.Model): @@ -1752,7 +1754,7 @@ def __init__( **kwargs ): super(SqlDatabaseResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Sql/servers/databases' + self.resource_type = 'Microsoft.Sql/servers/databases' # type: str self.zone_redundant = kwargs.get('zone_redundant', None) @@ -1787,7 +1789,7 @@ def __init__( **kwargs ): super(SqlElasticPoolResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Sql/servers/elasticPools' + self.resource_type = 'Microsoft.Sql/servers/elasticPools' # type: str self.zone_redundant = kwargs.get('zone_redundant', None) @@ -1818,7 +1820,7 @@ def __init__( **kwargs ): super(SqlServerResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Sql/servers' + self.resource_type = 'Microsoft.Sql/servers' # type: str class SubnetReference(ProxyResourceReference): @@ -1872,6 +1874,29 @@ def __init__( self.address_prefix = kwargs.get('address_prefix', None) +class SummaryItem(msrest.serialization.Model): + """Summary item. + + :param count: Gets the count. + :type count: int + :param item: Gets the item. + :type item: str + """ + + _attribute_map = { + 'count': {'key': 'count', 'type': 'int'}, + 'item': {'key': 'item', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(SummaryItem, self).__init__(**kwargs) + self.count = kwargs.get('count', None) + self.item = kwargs.get('item', None) + + class UnresolvedDependency(msrest.serialization.Model): """Unresolved dependency. @@ -1980,7 +2005,7 @@ def __init__( **kwargs ): super(VirtualMachineResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Compute/virtualMachines' + self.resource_type = 'Microsoft.Compute/virtualMachines' # type: str self.target_availability_zone = kwargs.get('target_availability_zone', None) self.target_vm_size = kwargs.get('target_vm_size', None) self.target_availability_set_id = kwargs.get('target_availability_set_id', None) @@ -2028,7 +2053,7 @@ def __init__( **kwargs ): super(VirtualNetworkResourceSettings, self).__init__(**kwargs) - self.resource_type = 'Microsoft.Network/virtualNetworks' + self.resource_type = 'Microsoft.Network/virtualNetworks' # type: str self.enable_ddos_protection = kwargs.get('enable_ddos_protection', None) self.address_space = kwargs.get('address_space', None) self.dns_servers = kwargs.get('dns_servers', None) 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 5b274ca100a3..987b624a4483 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 @@ -106,7 +106,7 @@ def __init__( **kwargs ): super(ResourceSettings, self).__init__(**kwargs) - self.resource_type: Optional[str] = None + self.resource_type = None # type: Optional[str] self.target_resource_name = target_resource_name @@ -149,7 +149,7 @@ def __init__( **kwargs ): super(AvailabilitySetResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Compute/availabilitySets' + self.resource_type = 'Microsoft.Compute/availabilitySets' # type: str self.fault_domain = fault_domain self.update_domain = update_domain @@ -404,14 +404,14 @@ class JobStatus(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar job_name: Defines the job name. Default value: "InitialSync". - :vartype job_name: str + :ivar job_name: Defines the job name. Possible values include: "InitialSync". + :vartype job_name: str or ~resource_mover_service_api.models.JobName :ivar job_progress: Gets or sets the monitoring job percentage. :vartype job_progress: str """ _validation = { - 'job_name': {'readonly': True, 'constant': True}, + 'job_name': {'readonly': True}, 'job_progress': {'readonly': True}, } @@ -420,8 +420,6 @@ class JobStatus(msrest.serialization.Model): 'job_progress': {'key': 'jobProgress', 'type': 'str'}, } - job_name = "InitialSync" - def __init__( self, **kwargs @@ -639,7 +637,7 @@ def __init__( **kwargs ): super(LoadBalancerResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Network/loadBalancers' + self.resource_type = 'Microsoft.Network/loadBalancers' # type: str self.sku = sku self.frontend_ip_configurations = frontend_ip_configurations self.backend_address_pools = backend_address_pools @@ -864,11 +862,14 @@ class MoveResourceCollection(msrest.serialization.Model): :type value: list[~resource_mover_service_api.models.MoveResource] :param next_link: Gets the value of next link. :type next_link: str + :param summary: Gets or the list of summary items. + :type summary: list[~resource_mover_service_api.models.SummaryItem] """ _attribute_map = { 'value': {'key': 'value', 'type': '[MoveResource]'}, 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'summary': {'key': 'summary', 'type': '[SummaryItem]'}, } def __init__( @@ -876,11 +877,13 @@ def __init__( *, value: Optional[List["MoveResource"]] = None, next_link: Optional[str] = None, + summary: Optional[List["SummaryItem"]] = None, **kwargs ): super(MoveResourceCollection, self).__init__(**kwargs) self.value = value self.next_link = next_link + self.summary = summary class MoveResourceDependency(msrest.serialization.Model): @@ -1279,7 +1282,7 @@ def __init__( **kwargs ): super(MoveResourcePropertiesSourceResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'MoveResourceProperties-sourceResourceSettings' + self.resource_type = 'MoveResourceProperties-sourceResourceSettings' # type: str class NetworkInterfaceResourceSettings(ResourceSettings): @@ -1321,7 +1324,7 @@ def __init__( **kwargs ): super(NetworkInterfaceResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Network/networkInterfaces' + self.resource_type = 'Microsoft.Network/networkInterfaces' # type: str self.ip_configurations = ip_configurations self.enable_accelerated_networking = enable_accelerated_networking @@ -1359,7 +1362,7 @@ def __init__( **kwargs ): super(NetworkSecurityGroupResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Network/networkSecurityGroups' + self.resource_type = 'Microsoft.Network/networkSecurityGroups' # type: str self.security_rules = security_rules @@ -1800,7 +1803,7 @@ def __init__( **kwargs ): super(PublicIPAddressResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Network/publicIPAddresses' + self.resource_type = 'Microsoft.Network/publicIPAddresses' # type: str self.domain_name_label = domain_name_label self.f_qdn = f_qdn self.public_ip_allocation_method = public_ip_allocation_method @@ -1837,7 +1840,7 @@ def __init__( **kwargs ): super(ResourceGroupResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'resourceGroups' + self.resource_type = 'resourceGroups' # type: str class ResourceMoveRequest(msrest.serialization.Model): @@ -1914,7 +1917,7 @@ def __init__( **kwargs ): super(SqlDatabaseResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Sql/servers/databases' + self.resource_type = 'Microsoft.Sql/servers/databases' # type: str self.zone_redundant = zone_redundant @@ -1952,7 +1955,7 @@ def __init__( **kwargs ): super(SqlElasticPoolResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Sql/servers/elasticPools' + self.resource_type = 'Microsoft.Sql/servers/elasticPools' # type: str self.zone_redundant = zone_redundant @@ -1985,7 +1988,7 @@ def __init__( **kwargs ): super(SqlServerResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Sql/servers' + self.resource_type = 'Microsoft.Sql/servers' # type: str class SubnetReference(ProxyResourceReference): @@ -2045,6 +2048,32 @@ def __init__( self.address_prefix = address_prefix +class SummaryItem(msrest.serialization.Model): + """Summary item. + + :param count: Gets the count. + :type count: int + :param item: Gets the item. + :type item: str + """ + + _attribute_map = { + 'count': {'key': 'count', 'type': 'int'}, + 'item': {'key': 'item', 'type': 'str'}, + } + + def __init__( + self, + *, + count: Optional[int] = None, + item: Optional[str] = None, + **kwargs + ): + super(SummaryItem, self).__init__(**kwargs) + self.count = count + self.item = item + + class UnresolvedDependency(msrest.serialization.Model): """Unresolved dependency. @@ -2167,7 +2196,7 @@ def __init__( **kwargs ): super(VirtualMachineResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Compute/virtualMachines' + self.resource_type = 'Microsoft.Compute/virtualMachines' # type: str self.target_availability_zone = target_availability_zone self.target_vm_size = target_vm_size self.target_availability_set_id = target_availability_set_id @@ -2221,7 +2250,7 @@ def __init__( **kwargs ): super(VirtualNetworkResourceSettings, self).__init__(target_resource_name=target_resource_name, **kwargs) - self.resource_type: str = 'Microsoft.Network/virtualNetworks' + self.resource_type = 'Microsoft.Network/virtualNetworks' # type: str self.enable_ddos_protection = enable_ddos_protection self.address_space = address_space self.dns_servers = dns_servers diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_resource_mover_service_api_enums.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_resource_mover_service_api_enums.py index 51532630f9d8..d283cae8590a 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_resource_mover_service_api_enums.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/models/_resource_mover_service_api_enums.py @@ -6,76 +6,100 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from enum import Enum - -class DependencyType(str, Enum): +from enum import Enum, EnumMeta +from six import with_metaclass + +class _CaseInsensitiveEnumMeta(EnumMeta): + def __getitem__(self, name): + return super().__getitem__(name.upper()) + + def __getattr__(cls, name): + """Return the enum member matching `name` + We use __getattr__ instead of descriptors or inserting into the enum + class' __dict__ in order to support `name` and `value` being both + properties for enum members (which live in the class' __dict__) and + enum members themselves. + """ + try: + return cls._member_map_[name.upper()] + except KeyError: + raise AttributeError(name) + + +class DependencyType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the dependency type. """ - required_for_prepare = "RequiredForPrepare" - required_for_move = "RequiredForMove" + REQUIRED_FOR_PREPARE = "RequiredForPrepare" + REQUIRED_FOR_MOVE = "RequiredForMove" + +class JobName(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): + """Defines the job name. + """ + + INITIAL_SYNC = "InitialSync" -class MoveResourceInputType(str, Enum): +class MoveResourceInputType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the move resource input type. """ - move_resource_id = "MoveResourceId" - move_resource_source_id = "MoveResourceSourceId" + MOVE_RESOURCE_ID = "MoveResourceId" + MOVE_RESOURCE_SOURCE_ID = "MoveResourceSourceId" -class MoveState(str, Enum): +class MoveState(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the MoveResource states. """ - assignment_pending = "AssignmentPending" - prepare_pending = "PreparePending" - prepare_in_progress = "PrepareInProgress" - prepare_failed = "PrepareFailed" - move_pending = "MovePending" - move_in_progress = "MoveInProgress" - move_failed = "MoveFailed" - discard_in_progress = "DiscardInProgress" - discard_failed = "DiscardFailed" - commit_pending = "CommitPending" - commit_in_progress = "CommitInProgress" - commit_failed = "CommitFailed" - committed = "Committed" - -class ProvisioningState(str, Enum): + ASSIGNMENT_PENDING = "AssignmentPending" + PREPARE_PENDING = "PreparePending" + PREPARE_IN_PROGRESS = "PrepareInProgress" + PREPARE_FAILED = "PrepareFailed" + MOVE_PENDING = "MovePending" + MOVE_IN_PROGRESS = "MoveInProgress" + MOVE_FAILED = "MoveFailed" + DISCARD_IN_PROGRESS = "DiscardInProgress" + DISCARD_FAILED = "DiscardFailed" + COMMIT_PENDING = "CommitPending" + COMMIT_IN_PROGRESS = "CommitInProgress" + COMMIT_FAILED = "CommitFailed" + COMMITTED = "Committed" + +class ProvisioningState(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the provisioning states. """ - succeeded = "Succeeded" - updating = "Updating" - creating = "Creating" - failed = "Failed" + SUCCEEDED = "Succeeded" + UPDATING = "Updating" + CREATING = "Creating" + FAILED = "Failed" -class ResolutionType(str, Enum): +class ResolutionType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the resolution type. """ - manual = "Manual" - automatic = "Automatic" + MANUAL = "Manual" + AUTOMATIC = "Automatic" -class ResourceIdentityType(str, Enum): +class ResourceIdentityType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """The type of identity used for the resource mover service. """ - none = "None" - system_assigned = "SystemAssigned" - user_assigned = "UserAssigned" + NONE = "None" + SYSTEM_ASSIGNED = "SystemAssigned" + USER_ASSIGNED = "UserAssigned" -class TargetAvailabilityZone(str, Enum): +class TargetAvailabilityZone(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Gets or sets the target availability zone. """ - one = "1" - two = "2" - three = "3" - na = "NA" + ONE = "1" + TWO = "2" + THREE = "3" + NA = "NA" -class ZoneRedundant(str, Enum): +class ZoneRedundant(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Defines the zone redundant resource setting. """ - enable = "Enable" - disable = "Disable" + ENABLE = "Enable" + DISABLE = "Disable" 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 4ac913c942c8..697a3cf07ad3 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 @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpRequest, HttpResponse @@ -69,10 +69,13 @@ def create( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self.create.metadata['url'] # type: ignore @@ -90,7 +93,7 @@ def create( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -99,7 +102,6 @@ def create( body_content = None body_content_kwargs['content'] = body_content request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -141,10 +143,13 @@ def update( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self.update.metadata['url'] # type: ignore @@ -162,7 +167,7 @@ def update( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -171,7 +176,6 @@ def update( body_content = None body_content_kwargs['content'] = body_content request = self._client.patch(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -195,9 +199,12 @@ def _delete_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -214,7 +221,7 @@ def _delete_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.delete(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) @@ -315,9 +322,12 @@ def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -334,7 +344,7 @@ def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) @@ -361,10 +371,13 @@ def _prepare_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._prepare_initial.metadata['url'] # type: ignore @@ -382,7 +395,7 @@ def _prepare_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -391,7 +404,6 @@ def _prepare_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -418,10 +430,10 @@ def begin_prepare( ): # type: (...) -> LROPoller["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 - successful completion the moveResource moveState do a transition to MovePending. To aid the - user to prerequisite the operation the client can call operation with validateOnly property set - to true. + is on the moveResources that are in the moveState 'PreparePending' or 'PrepareFailed', on a + successful completion the moveResource moveState do a transition to MovePending. To aid the + user to prerequisite the operation the client can call operation with validateOnly property set + to true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -488,10 +500,13 @@ def _initiate_move_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._initiate_move_initial.metadata['url'] # type: ignore @@ -509,7 +524,7 @@ def _initiate_move_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -518,7 +533,6 @@ def _initiate_move_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -545,10 +559,10 @@ def begin_initiate_move( ): # type: (...) -> LROPoller["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 - completion the moveResource moveState do a transition to CommitPending. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + the moveResources are in the moveState 'MovePending' or 'MoveFailed', on a successful + completion the moveResource moveState do a transition to CommitPending. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -615,10 +629,13 @@ def _commit_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._commit_initial.metadata['url'] # type: ignore @@ -636,7 +653,7 @@ def _commit_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -645,7 +662,6 @@ def _commit_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -672,10 +688,10 @@ def begin_commit( ): # type: (...) -> LROPoller["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 - completion the moveResource moveState do a transition to Committed. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + the moveResources in the moveState 'CommitPending' or 'CommitFailed', on a successful + completion the moveResource moveState do a transition to Committed. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -742,10 +758,13 @@ def _discard_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._discard_initial.metadata['url'] # type: ignore @@ -763,7 +782,7 @@ def _discard_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -772,7 +791,6 @@ def _discard_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -799,10 +817,10 @@ def begin_discard( ): # type: (...) -> LROPoller["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 - completion the moveResource moveState do a transition to MovePending. To aid the user to - prerequisite the operation the client can call operation with validateOnly property set to - true. + on the moveResources in the moveState 'CommitPending' or 'DiscardFailed', on a successful + completion the moveResource moveState do a transition to MovePending. To aid the user to + prerequisite the operation the client can call operation with validateOnly property set to + true. :param resource_group_name: The Resource Group Name. :type resource_group_name: str @@ -868,9 +886,12 @@ def _resolve_dependencies_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._resolve_dependencies_initial.metadata['url'] # type: ignore @@ -887,7 +908,7 @@ def _resolve_dependencies_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.post(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) @@ -984,14 +1005,17 @@ def list_move_collections_by_subscription( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollectionResultList"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL @@ -1053,14 +1077,17 @@ def list_move_collections_by_resource_group( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveCollectionResultList"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL 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 df788568ba54..5ed85ce62789 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 @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpRequest, HttpResponse @@ -62,7 +62,7 @@ def list( :param move_collection_name: The Move Collection Name. :type move_collection_name: str :param filter: The filter to apply on the operation. For example, you can use - $filter=Properties/ProvisioningState eq 'Succeeded'. + $filter=Properties/ProvisioningState eq 'Succeeded'. :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MoveResourceCollection or the result of cls(response) @@ -70,14 +70,17 @@ def list( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveResourceCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" def prepare_request(next_link=None): # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') if not next_link: # Construct URL @@ -135,10 +138,13 @@ def _create_initial( ): # type: (...) -> Optional["models.MoveResource"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MoveResource"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" content_type = kwargs.pop("content_type", "application/json") + accept = "application/json" # Construct URL url = self._create_initial.metadata['url'] # type: ignore @@ -157,7 +163,7 @@ def _create_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') body_content_kwargs = {} # type: Dict[str, Any] if body is not None: @@ -166,7 +172,6 @@ def _create_initial( body_content = None body_content_kwargs['content'] = body_content request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) response = pipeline_response.http_response @@ -263,9 +268,12 @@ def _delete_initial( ): # type: (...) -> Optional["models.OperationStatus"] cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.OperationStatus"]] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -283,7 +291,7 @@ def _delete_initial( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.delete(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) @@ -391,9 +399,12 @@ def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.MoveResource"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -411,7 +422,7 @@ def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_operations_discovery_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_operations_discovery_operations.py index 3a0e1c49c868..b93a355b87d0 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_operations_discovery_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_operations_discovery_operations.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpRequest, HttpResponse from azure.mgmt.core.exceptions import ARMErrorFormat @@ -57,9 +57,12 @@ def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.OperationsDiscoveryCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -70,7 +73,7 @@ def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) diff --git a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_unresolved_dependencies_operations.py b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_unresolved_dependencies_operations.py index 3ab01138bfe2..dcc26b8099ab 100644 --- a/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_unresolved_dependencies_operations.py +++ b/sdk/resourcemover/azure-mgmt-resourcemover/azure/mgmt/resourcemover/operations/_unresolved_dependencies_operations.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING import warnings -from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpRequest, HttpResponse from azure.mgmt.core.exceptions import ARMErrorFormat @@ -63,9 +63,12 @@ def get( :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.UnresolvedDependencyCollection"] - error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } error_map.update(kwargs.pop('error_map', {})) api_version = "2019-10-01-preview" + accept = "application/json" # Construct URL url = self.get.metadata['url'] # type: ignore @@ -82,7 +85,7 @@ def get( # Construct headers header_parameters = {} # type: Dict[str, Any] - header_parameters['Accept'] = 'application/json' + header_parameters['Accept'] = self._serialize.header("accept", accept, 'str') request = self._client.get(url, query_parameters, header_parameters) pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)