diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/__init__.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/__init__.py index 6691d5e232b5..f1d223157e06 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/__init__.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/__init__.py @@ -13,11 +13,11 @@ from .storage_sync_error_details_py3 import StorageSyncErrorDetails from .storage_sync_error_py3 import StorageSyncError, StorageSyncErrorException from .resource_py3 import Resource - from .tracked_resource_py3 import TrackedResource from .subscription_state_py3 import SubscriptionState from .storage_sync_service_py3 import StorageSyncService from .sync_group_py3 import SyncGroup from .cloud_endpoint_py3 import CloudEndpoint + from .server_endpoint_update_parameters_py3 import ServerEndpointUpdateParameters from .server_endpoint_py3 import ServerEndpoint from .registered_server_py3 import RegisteredServer from .resources_move_info_py3 import ResourcesMoveInfo @@ -33,15 +33,17 @@ from .backup_request_py3 import BackupRequest from .post_backup_response_py3 import PostBackupResponse from .workflow_array_py3 import WorkflowArray + from .storage_sync_service_update_parameters_py3 import StorageSyncServiceUpdateParameters + from .tracked_resource_py3 import TrackedResource except (SyntaxError, ImportError): from .storage_sync_error_details import StorageSyncErrorDetails from .storage_sync_error import StorageSyncError, StorageSyncErrorException from .resource import Resource - from .tracked_resource import TrackedResource from .subscription_state import SubscriptionState from .storage_sync_service import StorageSyncService from .sync_group import SyncGroup from .cloud_endpoint import CloudEndpoint + from .server_endpoint_update_parameters import ServerEndpointUpdateParameters from .server_endpoint import ServerEndpoint from .registered_server import RegisteredServer from .resources_move_info import ResourcesMoveInfo @@ -57,6 +59,8 @@ from .backup_request import BackupRequest from .post_backup_response import PostBackupResponse from .workflow_array import WorkflowArray + from .storage_sync_service_update_parameters import StorageSyncServiceUpdateParameters + from .tracked_resource import TrackedResource from .operation_entity_paged import OperationEntityPaged from .storage_sync_service_paged import StorageSyncServicePaged from .sync_group_paged import SyncGroupPaged @@ -72,11 +76,11 @@ 'StorageSyncErrorDetails', 'StorageSyncError', 'StorageSyncErrorException', 'Resource', - 'TrackedResource', 'SubscriptionState', 'StorageSyncService', 'SyncGroup', 'CloudEndpoint', + 'ServerEndpointUpdateParameters', 'ServerEndpoint', 'RegisteredServer', 'ResourcesMoveInfo', @@ -92,6 +96,8 @@ 'BackupRequest', 'PostBackupResponse', 'WorkflowArray', + 'StorageSyncServiceUpdateParameters', + 'TrackedResource', 'OperationEntityPaged', 'StorageSyncServicePaged', 'SyncGroupPaged', diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters.py new file mode 100644 index 000000000000..763badfa8817 --- /dev/null +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerEndpointUpdateParameters(Model): + """Parameters for updating an Server Endpoint. + + :param tags: The user-specified tags associated with the server endpoint. + :type tags: dict[str, str] + :param cloud_tiering: Cloud Tiering. Possible values include: 'on', 'off' + :type cloud_tiering: str or ~azure.mgmt.storagesync.models.enum + :param volume_free_space_percent: Level of free space to be maintained by + Cloud Tiering if it is enabled. + :type volume_free_space_percent: int + """ + + _validation = { + 'volume_free_space_percent': {'maximum': 100, 'minimum': 0}, + } + + _attribute_map = { + 'tags': {'key': 'tags', 'type': '{str}'}, + 'cloud_tiering': {'key': 'properties.cloudTiering', 'type': 'str'}, + 'volume_free_space_percent': {'key': 'properties.volumeFreeSpacePercent', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(ServerEndpointUpdateParameters, self).__init__(**kwargs) + self.tags = kwargs.get('tags', None) + self.cloud_tiering = kwargs.get('cloud_tiering', None) + self.volume_free_space_percent = kwargs.get('volume_free_space_percent', None) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters_py3.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters_py3.py new file mode 100644 index 000000000000..b08f88ace0a0 --- /dev/null +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/server_endpoint_update_parameters_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ServerEndpointUpdateParameters(Model): + """Parameters for updating an Server Endpoint. + + :param tags: The user-specified tags associated with the server endpoint. + :type tags: dict[str, str] + :param cloud_tiering: Cloud Tiering. Possible values include: 'on', 'off' + :type cloud_tiering: str or ~azure.mgmt.storagesync.models.enum + :param volume_free_space_percent: Level of free space to be maintained by + Cloud Tiering if it is enabled. + :type volume_free_space_percent: int + """ + + _validation = { + 'volume_free_space_percent': {'maximum': 100, 'minimum': 0}, + } + + _attribute_map = { + 'tags': {'key': 'tags', 'type': '{str}'}, + 'cloud_tiering': {'key': 'properties.cloudTiering', 'type': 'str'}, + 'volume_free_space_percent': {'key': 'properties.volumeFreeSpacePercent', 'type': 'int'}, + } + + def __init__(self, *, tags=None, cloud_tiering=None, volume_free_space_percent: int=None, **kwargs) -> None: + super(ServerEndpointUpdateParameters, self).__init__(**kwargs) + self.tags = tags + self.cloud_tiering = cloud_tiering + self.volume_free_space_percent = volume_free_space_percent diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service.py index 44a6ef92f2ac..b103c8232a86 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service.py @@ -18,16 +18,18 @@ class StorageSyncService(TrackedResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: The id of the resource. :vartype id: str :ivar name: The name of the resource. :vartype name: str :ivar type: The type of the resource :vartype type: str - :param location: The location of the resource. + :param tags: Resource tags. + :type tags: dict[str, str] + :param location: Required. The geo-location where the resource lives :type location: str - :param tags: The tags of the resource. - :type tags: object :ivar storage_sync_service_status: Storage Sync service status. :vartype storage_sync_service_status: int :ivar storage_sync_service_uid: Storage Sync service Uid @@ -38,6 +40,7 @@ class StorageSyncService(TrackedResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'location': {'required': True}, 'storage_sync_service_status': {'readonly': True}, 'storage_sync_service_uid': {'readonly': True}, } @@ -46,8 +49,8 @@ class StorageSyncService(TrackedResource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, 'storage_sync_service_status': {'key': 'properties.storageSyncServiceStatus', 'type': 'int'}, 'storage_sync_service_uid': {'key': 'properties.storageSyncServiceUid', 'type': 'str'}, } diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_py3.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_py3.py index f2e89f9a9350..6fae9e5884b0 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_py3.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_py3.py @@ -18,16 +18,18 @@ class StorageSyncService(TrackedResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: The id of the resource. :vartype id: str :ivar name: The name of the resource. :vartype name: str :ivar type: The type of the resource :vartype type: str - :param location: The location of the resource. + :param tags: Resource tags. + :type tags: dict[str, str] + :param location: Required. The geo-location where the resource lives :type location: str - :param tags: The tags of the resource. - :type tags: object :ivar storage_sync_service_status: Storage Sync service status. :vartype storage_sync_service_status: int :ivar storage_sync_service_uid: Storage Sync service Uid @@ -38,6 +40,7 @@ class StorageSyncService(TrackedResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'location': {'required': True}, 'storage_sync_service_status': {'readonly': True}, 'storage_sync_service_uid': {'readonly': True}, } @@ -46,13 +49,13 @@ class StorageSyncService(TrackedResource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, 'storage_sync_service_status': {'key': 'properties.storageSyncServiceStatus', 'type': 'int'}, 'storage_sync_service_uid': {'key': 'properties.storageSyncServiceUid', 'type': 'str'}, } - def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: - super(StorageSyncService, self).__init__(location=location, tags=tags, **kwargs) + def __init__(self, *, location: str, tags=None, **kwargs) -> None: + super(StorageSyncService, self).__init__(tags=tags, location=location, **kwargs) self.storage_sync_service_status = None self.storage_sync_service_uid = None diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters.py new file mode 100644 index 000000000000..4038e1fb1941 --- /dev/null +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class StorageSyncServiceUpdateParameters(Model): + """Parameters for updating an Storage sync service. + + :param tags: The user-specified tags associated with the storage sync + service. + :type tags: dict[str, str] + :param properties: The properties of the storage sync service. + :type properties: object + """ + + _attribute_map = { + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(StorageSyncServiceUpdateParameters, self).__init__(**kwargs) + self.tags = kwargs.get('tags', None) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters_py3.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters_py3.py new file mode 100644 index 000000000000..b70ad833087d --- /dev/null +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/storage_sync_service_update_parameters_py3.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class StorageSyncServiceUpdateParameters(Model): + """Parameters for updating an Storage sync service. + + :param tags: The user-specified tags associated with the storage sync + service. + :type tags: dict[str, str] + :param properties: The properties of the storage sync service. + :type properties: object + """ + + _attribute_map = { + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'object'}, + } + + def __init__(self, *, tags=None, properties=None, **kwargs) -> None: + super(StorageSyncServiceUpdateParameters, self).__init__(**kwargs) + self.tags = tags + self.properties = properties diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource.py index 2ad3a5f74d20..5aa67617e44e 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource.py @@ -13,38 +13,41 @@ class TrackedResource(Resource): - """ARM tracked resource. + """The resource model definition for a ARM tracked top level resource. Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: The id of the resource. :vartype id: str :ivar name: The name of the resource. :vartype name: str :ivar type: The type of the resource :vartype type: str - :param location: The location of the resource. + :param tags: Resource tags. + :type tags: dict[str, str] + :param location: Required. The geo-location where the resource lives :type location: str - :param tags: The tags of the resource. - :type tags: object """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'location': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, } def __init__(self, **kwargs): super(TrackedResource, self).__init__(**kwargs) - self.location = kwargs.get('location', None) self.tags = kwargs.get('tags', None) + self.location = kwargs.get('location', None) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource_py3.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource_py3.py index 7f843d7f3eda..dd748c0b8298 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource_py3.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/models/tracked_resource_py3.py @@ -13,38 +13,41 @@ class TrackedResource(Resource): - """ARM tracked resource. + """The resource model definition for a ARM tracked top level resource. Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: The id of the resource. :vartype id: str :ivar name: The name of the resource. :vartype name: str :ivar type: The type of the resource :vartype type: str - :param location: The location of the resource. + :param tags: Resource tags. + :type tags: dict[str, str] + :param location: Required. The geo-location where the resource lives :type location: str - :param tags: The tags of the resource. - :type tags: object """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'location': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, } - def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, **kwargs) -> None: super(TrackedResource, self).__init__(**kwargs) - self.location = location self.tags = tags + self.location = location diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/cloud_endpoints_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/cloud_endpoints_operations.py index 747835b25d53..5b6d8de3c982 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/cloud_endpoints_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/cloud_endpoints_operations.py @@ -24,7 +24,7 @@ class CloudEndpointsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -44,7 +44,7 @@ def _create_initial( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -54,10 +54,11 @@ def _create_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -70,9 +71,8 @@ def _create_initial( body_content = self._serialize.body(parameters, 'CloudEndpoint') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -101,8 +101,8 @@ def create( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Create a new CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -168,8 +168,8 @@ def get( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, custom_headers=None, raw=False, **operation_config): """Get a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -192,7 +192,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -202,11 +202,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -215,8 +215,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -245,7 +245,7 @@ def _delete_initial( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -255,11 +255,10 @@ def _delete_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -268,8 +267,8 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -290,8 +289,8 @@ def delete( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, custom_headers=None, raw=False, polling=True, **operation_config): """Delete a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -347,8 +346,8 @@ def list_by_sync_group( self, resource_group_name, storage_sync_service_name, sync_group_name, custom_headers=None, raw=False, **operation_config): """Get a CloudEndpoint List. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -372,7 +371,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_sync_group.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str') @@ -381,7 +380,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -389,7 +388,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -398,9 +397,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -426,7 +424,7 @@ def _pre_backup_initial( # Construct URL url = self.pre_backup.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -436,7 +434,7 @@ def _pre_backup_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} @@ -452,9 +450,8 @@ def _pre_backup_initial( body_content = self._serialize.body(parameters, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -473,8 +470,8 @@ def pre_backup( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, azure_file_share=None, custom_headers=None, raw=False, polling=True, **operation_config): """Pre Backup a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -535,7 +532,7 @@ def _post_backup_initial( # Construct URL url = self.post_backup.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -545,10 +542,11 @@ def _post_backup_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -561,9 +559,8 @@ def _post_backup_initial( body_content = self._serialize.body(parameters, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -590,8 +587,8 @@ def post_backup( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, azure_file_share=None, custom_headers=None, raw=False, polling=True, **operation_config): """Post Backup a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -657,7 +654,7 @@ def _pre_restore_initial( # Construct URL url = self.pre_restore.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -667,7 +664,7 @@ def _pre_restore_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} @@ -683,9 +680,8 @@ def _pre_restore_initial( body_content = self._serialize.body(parameters, 'PreRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -704,8 +700,8 @@ def pre_restore( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Pre Restore a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -762,8 +758,8 @@ def restoreheartbeat( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, custom_headers=None, raw=False, **operation_config): """Restore Heartbeat a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -785,7 +781,7 @@ def restoreheartbeat( # Construct URL url = self.restoreheartbeat.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -795,11 +791,10 @@ def restoreheartbeat( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -808,8 +803,8 @@ def restoreheartbeat( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -829,7 +824,7 @@ def _post_restore_initial( # Construct URL url = self.post_restore.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -839,7 +834,7 @@ def _post_restore_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} @@ -855,9 +850,8 @@ def _post_restore_initial( body_content = self._serialize.body(parameters, 'PostRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -876,8 +870,8 @@ def post_restore( self, resource_group_name, storage_sync_service_name, sync_group_name, cloud_endpoint_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Post Restore a given CloudEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/operations.py index 78bb14cdfb11..647832d4f685 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/operations.py @@ -22,7 +22,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/registered_servers_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/registered_servers_operations.py index 53017b34da96..ef3298992bf2 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/registered_servers_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/registered_servers_operations.py @@ -24,7 +24,7 @@ class RegisteredServersOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -42,8 +42,8 @@ def list_by_storage_sync_service( self, resource_group_name, storage_sync_service_name, custom_headers=None, raw=False, **operation_config): """Get a given registered server list. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -65,7 +65,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_storage_sync_service.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -73,7 +73,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -81,7 +81,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -90,9 +90,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -114,8 +113,8 @@ def get( self, resource_group_name, storage_sync_service_name, server_id, custom_headers=None, raw=False, **operation_config): """Get a given registered server. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -136,7 +135,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'serverId': self._serialize.url("server_id", server_id, 'str') @@ -145,11 +144,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -158,8 +157,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -188,7 +187,7 @@ def _create_initial( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'serverId': self._serialize.url("server_id", server_id, 'str') @@ -197,10 +196,11 @@ def _create_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -213,9 +213,8 @@ def _create_initial( body_content = self._serialize.body(parameters, 'RegisteredServer') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -243,8 +242,8 @@ def create( self, resource_group_name, storage_sync_service_name, server_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Add a new registered server. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -308,7 +307,7 @@ def _delete_initial( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'serverId': self._serialize.url("server_id", server_id, 'str') @@ -317,11 +316,10 @@ def _delete_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -330,8 +328,8 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -350,8 +348,8 @@ def delete( self, resource_group_name, storage_sync_service_name, server_id, custom_headers=None, raw=False, polling=True, **operation_config): """Delete the given registered server. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/server_endpoints_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/server_endpoints_operations.py index 9471cb508238..6ed18409755c 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/server_endpoints_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/server_endpoints_operations.py @@ -24,7 +24,7 @@ class ServerEndpointsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -44,7 +44,7 @@ def _create_initial( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -54,10 +54,11 @@ def _create_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -70,9 +71,8 @@ def _create_initial( body_content = self._serialize.body(parameters, 'ServerEndpoint') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -100,8 +100,8 @@ def create( self, resource_group_name, storage_sync_service_name, sync_group_name, server_endpoint_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Create a new ServerEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -168,7 +168,7 @@ def _update_initial( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -178,10 +178,11 @@ def _update_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -192,14 +193,13 @@ def _update_initial( # Construct body if parameters is not None: - body_content = self._serialize.body(parameters, 'ServerEndpoint') + body_content = self._serialize.body(parameters, 'ServerEndpointUpdateParameters') else: body_content = None # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -227,8 +227,8 @@ def update( self, resource_group_name, storage_sync_service_name, sync_group_name, server_endpoint_name, parameters=None, custom_headers=None, raw=False, polling=True, **operation_config): """Patch a given ServerEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -238,7 +238,8 @@ def update( :param server_endpoint_name: Name of Server Endpoint object. :type server_endpoint_name: str :param parameters: Any of the properties applicable in PUT request. - :type parameters: ~azure.mgmt.storagesync.models.ServerEndpoint + :type parameters: + ~azure.mgmt.storagesync.models.ServerEndpointUpdateParameters :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -293,8 +294,8 @@ def get( self, resource_group_name, storage_sync_service_name, sync_group_name, server_endpoint_name, custom_headers=None, raw=False, **operation_config): """Get a ServerEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -317,7 +318,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -327,11 +328,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -340,8 +341,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -370,7 +371,7 @@ def _delete_initial( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -380,11 +381,10 @@ def _delete_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -393,8 +393,8 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -413,8 +413,8 @@ def delete( self, resource_group_name, storage_sync_service_name, sync_group_name, server_endpoint_name, custom_headers=None, raw=False, polling=True, **operation_config): """Delete a given ServerEndpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -468,8 +468,8 @@ def list_by_sync_group( self, resource_group_name, storage_sync_service_name, sync_group_name, custom_headers=None, raw=False, **operation_config): """Get a ServerEndpoint list. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -493,7 +493,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_sync_group.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str') @@ -502,7 +502,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -510,7 +510,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -519,9 +519,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -545,7 +544,7 @@ def _recall_action_initial( # Construct URL url = self.recall_action.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str'), @@ -555,11 +554,10 @@ def _recall_action_initial( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -568,8 +566,8 @@ def _recall_action_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -588,8 +586,8 @@ def recall_action( self, resource_group_name, storage_sync_service_name, sync_group_name, server_endpoint_name, custom_headers=None, raw=False, polling=True, **operation_config): """Recall a serverendpoint. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/storage_sync_services_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/storage_sync_services_operations.py index 4a9c7f7f5ed6..304e1285856c 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/storage_sync_services_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/storage_sync_services_operations.py @@ -23,7 +23,7 @@ class StorageSyncServicesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -61,16 +61,17 @@ def check_name_availability( url = self.check_name_availability.metadata['url'] path_format_arguments = { 'locationName': self._serialize.url("location_name", location_name, 'str'), - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1) } url = self._client.format_url(url, **path_format_arguments) # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -83,9 +84,8 @@ def check_name_availability( body_content = self._serialize.body(parameters, 'CheckNameAvailabilityParameters') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -105,19 +105,19 @@ def check_name_availability( check_name_availability.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.StorageSync/locations/{locationName}/checkNameAvailability'} def create( - self, resource_group_name, storage_sync_service_name, location=None, tags=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, storage_sync_service_name, location, tags=None, custom_headers=None, raw=False, **operation_config): """Create a new StorageSyncService. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. :type storage_sync_service_name: str - :param location: The location of the resource. + :param location: The geo-location where the resource lives :type location: str - :param tags: The tags of the resource. - :type tags: object + :param tags: Resource tags. + :type tags: dict[str, str] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -129,12 +129,12 @@ def create( :raises: :class:`StorageSyncErrorException` """ - parameters = models.StorageSyncService(location=location, tags=tags) + parameters = models.StorageSyncService(tags=tags, location=location) # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -142,10 +142,11 @@ def create( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -158,9 +159,8 @@ def create( body_content = self._serialize.body(parameters, 'StorageSyncService') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -181,8 +181,8 @@ def get( self, resource_group_name, storage_sync_service_name, custom_headers=None, raw=False, **operation_config): """Get a given StorageSyncService. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -201,7 +201,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -209,11 +209,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -222,8 +222,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -247,19 +247,20 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}'} def update( - self, resource_group_name, storage_sync_service_name, location=None, tags=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, storage_sync_service_name, tags=None, properties=None, custom_headers=None, raw=False, **operation_config): """Patch a given StorageSyncService. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. :type storage_sync_service_name: str - :param location: The location of the resource. - :type location: str - :param tags: The tags of the resource. - :type tags: object + :param tags: The user-specified tags associated with the storage sync + service. + :type tags: dict[str, str] + :param properties: The properties of the storage sync service. + :type properties: object :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -272,13 +273,13 @@ def update( :class:`StorageSyncErrorException` """ parameters = None - if location is not None or tags is not None: - parameters = models.StorageSyncService(location=location, tags=tags) + if tags is not None or properties is not None: + parameters = models.StorageSyncServiceUpdateParameters(tags=tags, properties=properties) # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -286,10 +287,11 @@ def update( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -300,14 +302,13 @@ def update( # Construct body if parameters is not None: - body_content = self._serialize.body(parameters, 'StorageSyncService') + body_content = self._serialize.body(parameters, 'StorageSyncServiceUpdateParameters') else: body_content = None # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -334,8 +335,8 @@ def delete( self, resource_group_name, storage_sync_service_name, custom_headers=None, raw=False, **operation_config): """Delete a given StorageSyncService. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -353,7 +354,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -361,11 +362,10 @@ def delete( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -374,8 +374,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -393,8 +393,8 @@ def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): """Get a StorageSyncService list by Resource group name. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -413,14 +413,14 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_resource_group.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$') } url = self._client.format_url(url, **path_format_arguments) # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -428,7 +428,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -437,9 +437,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -478,13 +477,13 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_subscription.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1) } url = self._client.format_url(url, **path_format_arguments) # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -492,7 +491,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -501,9 +500,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/sync_groups_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/sync_groups_operations.py index 71cd458c9657..d20fd9114ec2 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/sync_groups_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/sync_groups_operations.py @@ -22,7 +22,7 @@ class SyncGroupsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -40,8 +40,8 @@ def list_by_storage_sync_service( self, resource_group_name, storage_sync_service_name, custom_headers=None, raw=False, **operation_config): """Get a SyncGroup List. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -63,7 +63,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_storage_sync_service.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str') } @@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) else: url = next_link @@ -79,7 +79,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -88,9 +88,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -112,8 +111,8 @@ def create( self, resource_group_name, storage_sync_service_name, sync_group_name, unique_id=None, custom_headers=None, raw=False, **operation_config): """Create a new SyncGroup. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -138,7 +137,7 @@ def create( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str') @@ -147,10 +146,11 @@ def create( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -163,9 +163,8 @@ def create( body_content = self._serialize.body(parameters, 'SyncGroup') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -192,8 +191,8 @@ def get( self, resource_group_name, storage_sync_service_name, sync_group_name, custom_headers=None, raw=False, **operation_config): """Get a given SyncGroup. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -214,7 +213,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str') @@ -223,11 +222,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -236,8 +235,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -264,8 +263,8 @@ def delete( self, resource_group_name, storage_sync_service_name, sync_group_name, custom_headers=None, raw=False, **operation_config): """Delete a given SyncGroup. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -285,7 +284,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'syncGroupName': self._serialize.url("sync_group_name", sync_group_name, 'str') @@ -294,11 +293,10 @@ def delete( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -307,8 +305,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: raise models.StorageSyncErrorException(self._deserialize, response) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/workflows_operations.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/workflows_operations.py index 7fe7e152cccd..c2b89a18bc1d 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/workflows_operations.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/operations/workflows_operations.py @@ -22,7 +22,7 @@ class WorkflowsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-04-02". + :ivar api_version: The API version to use for this operation. Constant value: "2018-04-02". """ models = models @@ -40,8 +40,8 @@ def get( self, resource_group_name, storage_sync_service_name, workflow_id, custom_headers=None, raw=False, **operation_config): """Get Workflows resource. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -62,7 +62,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'workflowId': self._serialize.url("workflow_id", workflow_id, 'str') @@ -71,11 +71,11 @@ def get( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -84,8 +84,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) @@ -112,8 +112,8 @@ def abort( self, resource_group_name, storage_sync_service_name, workflow_id, custom_headers=None, raw=False, **operation_config): """Abort the given workflow. - :param resource_group_name: The name of the resource group within the - user's subscription. The name is case insensitive. + :param resource_group_name: The name of the resource group. The name + is case insensitive. :type resource_group_name: str :param storage_sync_service_name: Name of Storage Sync Service resource. @@ -133,7 +133,7 @@ def abort( # Construct URL url = self.abort.metadata['url'] path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str', min_length=1), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), 'storageSyncServiceName': self._serialize.url("storage_sync_service_name", storage_sync_service_name, 'str'), 'workflowId': self._serialize.url("workflow_id", workflow_id, 'str') @@ -142,11 +142,10 @@ def abort( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -155,8 +154,8 @@ def abort( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.StorageSyncErrorException(self._deserialize, response) diff --git a/azure-mgmt-storagesync/azure/mgmt/storagesync/storage_sync_management_client.py b/azure-mgmt-storagesync/azure/mgmt/storagesync/storage_sync_management_client.py index cb528aa061bc..6128e87ae534 100644 --- a/azure-mgmt-storagesync/azure/mgmt/storagesync/storage_sync_management_client.py +++ b/azure-mgmt-storagesync/azure/mgmt/storagesync/storage_sync_management_client.py @@ -31,9 +31,7 @@ class StorageSyncManagementClientConfiguration(AzureConfiguration): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param subscription_id: Gets subscription credentials which uniquely - identify the Microsoft Azure subscription. The subscription ID forms part - of the URI for every service call. + :param subscription_id: The ID of the target subscription. :type subscription_id: str :param str base_url: Service URL """ @@ -81,9 +79,7 @@ class StorageSyncManagementClient(SDKClient): :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials object` - :param subscription_id: Gets subscription credentials which uniquely - identify the Microsoft Azure subscription. The subscription ID forms part - of the URI for every service call. + :param subscription_id: The ID of the target subscription. :type subscription_id: str :param str base_url: Service URL """