From e520b37567de255d674c90019de7b2b3d1d6b650 Mon Sep 17 00:00:00 2001 From: tasherif-msft <69483382+tasherif-msft@users.noreply.github.com> Date: Fri, 18 Sep 2020 06:37:24 -0700 Subject: [PATCH] Added SMB Multichannel protocol (#13795) * added smb multichannel feature * added protocol properties to desarialize * added two more classes * better docstrings * added test and everything is working * added async * passing tests * fixed var names --- .../azure/storage/fileshare/__init__.py | 6 + .../azure/storage/fileshare/_models.py | 38 ++++++ .../fileshare/_share_service_client.py | 10 +- .../aio/_share_service_client_async.py | 8 +- ...st_file_client.test_user_agent_append.yaml | 17 +-- ...st_file_client.test_user_agent_custom.yaml | 33 +++--- ...t_file_client.test_user_agent_default.yaml | 16 +-- ...nt_async.test_user_agent_append_async.yaml | 25 ++-- ...nt_async.test_user_agent_custom_async.yaml | 49 +++----- ...t_async.test_user_agent_default_async.yaml | 24 ++-- ...operties.test_file_service_properties.yaml | 108 +++++++++++++++--- ...file_service_properties.test_set_cors.yaml | 26 ++--- ...vice_properties.test_set_hour_metrics.yaml | 26 ++--- ...ce_properties.test_set_minute_metrics.yaml | 26 ++--- ...e_properties.test_too_many_cors_rules.yaml | 12 +- ...nc.test_file_service_properties_async.yaml | 105 ++++++++++++----- ..._properties_async.test_set_cors_async.yaml | 42 +++---- ...ies_async.test_set_hour_metrics_async.yaml | 42 +++---- ...s_async.test_set_minute_metrics_async.yaml | 42 +++---- ..._async.test_too_many_cors_rules_async.yaml | 21 ++-- .../tests/test_file_service_properties.py | 15 ++- .../test_file_service_properties_async.py | 14 ++- 22 files changed, 421 insertions(+), 284 deletions(-) diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/__init__.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/__init__.py index 3266ae2ad6c9..7c838c1d1707 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/__init__.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/__init__.py @@ -25,6 +25,9 @@ Metrics, RetentionPolicy, CorsRule, + ShareSmbSettings, + SmbMultichannel, + ShareProtocolSettings, AccessPolicy, FileSasPermissions, ShareSasPermissions, @@ -52,6 +55,9 @@ 'Metrics', 'RetentionPolicy', 'CorsRule', + 'ShareSmbSettings', + 'SmbMultichannel', + 'ShareProtocolSettings', 'AccessPolicy', 'FileSasPermissions', 'ShareSasPermissions', diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py index 17b5425b65cf..4882ad4d7277 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py @@ -14,6 +14,9 @@ from ._generated.models import Metrics as GeneratedMetrics from ._generated.models import RetentionPolicy as GeneratedRetentionPolicy from ._generated.models import CorsRule as GeneratedCorsRule +from ._generated.models import ShareProtocolSettings as GeneratedShareProtocolSettings +from ._generated.models import ShareSmbSettings as GeneratedShareSmbSettings +from ._generated.models import SmbMultichannel as GeneratedSmbMultichannel from ._generated.models import AccessPolicy as GenAccessPolicy from ._generated.models import DirectoryItem @@ -134,6 +137,40 @@ def _from_generated(cls, generated): ) +class ShareSmbSettings(GeneratedShareSmbSettings): + """ Settings for the SMB protocol. + + :param SmbMultichannel multichannel: Required. Sets the multichannel settings. + """ + def __init__(self, multichannel): + self.multichannel = multichannel + + +class SmbMultichannel(GeneratedSmbMultichannel): + """ Settings for Multichannel. + + :param bool enabled: Required. If SMB Multichannel is enabled. + """ + def __init__(self, enabled): + self.enabled = enabled + + +class ShareProtocolSettings(GeneratedShareProtocolSettings): + """Protocol Settings class used by the set and get service properties methods in the share service. + + Contains protocol properties of the share service such as the SMB setting of the share service. + + :param SmbSettings smb: Required. Sets SMB settings. + """ + def __init__(self, smb): + self.smb = smb + + @classmethod + def _from_generated(cls, generated): + return cls( + smb=generated.smb) + + class AccessPolicy(GenAccessPolicy): """Access Policy class used by the set and get acl methods in each service. @@ -922,4 +959,5 @@ def service_properties_deserialize(generated): 'hour_metrics': Metrics._from_generated(generated.hour_metrics), # pylint: disable=protected-access 'minute_metrics': Metrics._from_generated(generated.minute_metrics), # pylint: disable=protected-access 'cors': [CorsRule._from_generated(cors) for cors in generated.cors], # pylint: disable=protected-access + 'protocol': ShareProtocolSettings._from_generated(generated.protocol), # pylint: disable=protected-access } diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_share_service_client.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_share_service_client.py index 549e09f62965..d6b240e9efa7 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_share_service_client.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_share_service_client.py @@ -35,6 +35,7 @@ ShareProperties, Metrics, CorsRule, + ShareProtocolSettings ) @@ -169,6 +170,7 @@ def set_service_properties( self, hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] + protocol=None, # type: Optional[ShareProtocolSettings], **kwargs ): # type: (...) -> None @@ -189,6 +191,9 @@ def set_service_properties( list. If an empty list is specified, all CORS rules will be deleted, and CORS will be disabled for the service. :type cors: list(:class:`~azure.storage.fileshare.CorsRule`) + :param protocol: + Sets protocol settings + :type protocol: ~azure.storage.fileshare.ShareProtocolSettings :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: None @@ -206,10 +211,11 @@ def set_service_properties( props = StorageServiceProperties( hour_metrics=hour_metrics, minute_metrics=minute_metrics, - cors=cors + cors=cors, + protocol=protocol ) try: - self._client.service.set_properties(props, timeout=timeout, **kwargs) + self._client.service.set_properties(storage_service_properties=props, timeout=timeout, **kwargs) except StorageErrorException as error: process_storage_error(error) diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_share_service_client_async.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_share_service_client_async.py index 2ee8390932f4..af67dcd83213 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_share_service_client_async.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_share_service_client_async.py @@ -34,6 +34,7 @@ ShareProperties, Metrics, CorsRule, + ShareProtocolSettings, ) @@ -124,6 +125,7 @@ async def set_service_properties( self, hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] + protocol=None, # type: Optional[ShareProtocolSettings], **kwargs ): # type: (...) -> None @@ -144,6 +146,9 @@ async def set_service_properties( list. If an empty list is specified, all CORS rules will be deleted, and CORS will be disabled for the service. :type cors: list(:class:`~azure.storage.fileshare.CorsRule`) + :param protocol_settings: + Sets protocol settings + :type protocol: ~azure.storage.fileshare.ShareProtocolSettings :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: None @@ -161,7 +166,8 @@ async def set_service_properties( props = StorageServiceProperties( hour_metrics=hour_metrics, minute_metrics=minute_metrics, - cors=cors + cors=cors, + protocol=protocol ) try: await self._client.service.set_properties(props, timeout=timeout, **kwargs) diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_append.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_append.yaml index 680a67b9fb38..e6ba0a348740 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_append.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_append.yaml @@ -9,29 +9,30 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) - customer_user_agent + - customer_user_agent azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:21 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:21 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked + vary: + - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_custom.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_custom.yaml index 88668b5d8077..96a432f8ee0b 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_custom.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_custom.yaml @@ -9,28 +9,30 @@ interactions: Connection: - keep-alive User-Agent: - - TestApp/v1.0 azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - TestApp/v1.0 azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:23 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:22 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked + vary: + - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK @@ -44,28 +46,31 @@ interactions: Connection: - keep-alive User-Agent: - - TestApp/v2.0 azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - TestApp/v2.0 TestApp/v1.0 azsdk-python-storage-file-share/12.2.0 Python/3.8.5 + (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:23 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:22 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked + vary: + - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_default.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_default.yaml index 8cc459694ab0..ddf36533263c 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_default.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client.test_user_agent_default.yaml @@ -9,28 +9,30 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:23 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:11 GMT + - Fri, 18 Sep 2020 01:52:22 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked + vary: + - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_append_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_append_async.yaml index 587b007fab9e..90ab35cec905 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_append_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_append_async.yaml @@ -5,33 +5,26 @@ interactions: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) - customer_user_agent + - customer_user_agent azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:13 GMT + - Fri, 18 Sep 2020 01:52:39 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:12 GMT + date: Fri, 18 Sep 2020 01:52:38 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-02-02' + vary: Origin + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seanmcccanary3.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_custom_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_custom_async.yaml index df949c5be398..0e248ab1a26b 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_custom_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_custom_async.yaml @@ -5,66 +5,55 @@ interactions: Accept: - application/xml User-Agent: - - TestApp/v1.0 azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - TestApp/v1.0 azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:13 GMT + - Fri, 18 Sep 2020 01:52:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:12 GMT + date: Fri, 18 Sep 2020 01:52:38 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-02-02' + vary: Origin + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seanmcccanary3.file.core.windows.net/?restype=service&comp=properties - request: body: null headers: Accept: - application/xml User-Agent: - - TestApp/v2.0 azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - TestApp/v2.0 TestApp/v1.0 azsdk-python-storage-file-share/12.2.0 Python/3.8.5 + (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:13 GMT + - Fri, 18 Sep 2020 01:52:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:12 GMT + date: Fri, 18 Sep 2020 01:52:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-02-02' + vary: Origin + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seanmcccanary3.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_default_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_default_async.yaml index 14350dd64ec5..035d8432b964 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_default_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_client_async.test_user_agent_default_async.yaml @@ -5,32 +5,26 @@ interactions: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:13 GMT + - Fri, 18 Sep 2020 01:52:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetrue71.0falsefalse" + string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500false" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:14 GMT + date: Fri, 18 Sep 2020 01:52:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-02-02' + vary: Origin + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seanmcccanary3.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_file_service_properties.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_file_service_properties.yaml index 9661f7b7229d..e942c7f5ca0b 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_file_service_properties.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_file_service_properties.yaml @@ -3,7 +3,7 @@ interactions: body: ' 1.0falsefalse1.0falsefalse' + />false' headers: Accept: - '*/*' @@ -12,29 +12,105 @@ interactions: Connection: - keep-alive Content-Length: - - '368' + - '469' Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:14 GMT + - Fri, 18 Sep 2020 01:45:18 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: - - '0' date: - - Wed, 15 Jan 2020 23:51:14 GMT + - Fri, 18 Sep 2020 01:45:17 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked + x-ms-version: + - '2020-02-10' + status: + code: 202 + message: Accepted +- request: + body: null + headers: + Accept: + - application/xml + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + User-Agent: + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) + x-ms-date: + - Fri, 18 Sep 2020 01:45:19 GMT + x-ms-version: + - '2020-02-10' + method: GET + uri: https://storagename.file.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0falsefalse1.0falsefalsefalse" + headers: + content-type: + - application/xml + date: + - Fri, 18 Sep 2020 01:45:18 GMT + server: + - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked + vary: + - Origin + x-ms-version: + - '2020-02-10' + status: + code: 200 + message: OK +- request: + body: ' + + 1.0falsefalse1.0falsefalsetrue' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '468' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) + x-ms-date: + - Fri, 18 Sep 2020 01:45:19 GMT + x-ms-version: + - '2020-02-10' + method: PUT + uri: https://storagename.file.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + date: + - Fri, 18 Sep 2020 01:45:18 GMT + server: + - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 202 message: Accepted @@ -48,28 +124,30 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:15 GMT + - Fri, 18 Sep 2020 01:45:19 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0falsefalse1.0falsefalse" + />true" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:14 GMT + - Fri, 18 Sep 2020 01:45:18 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked + vary: + - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_cors.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_cors.yaml index 7aa701e4ef79..91758e790171 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_cors.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_cors.yaml @@ -16,25 +16,25 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:15 GMT + - Thu, 17 Sep 2020 17:19:38 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: - - '0' date: - - Wed, 15 Jan 2020 23:51:15 GMT + - Thu, 17 Sep 2020 17:19:40 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 202 message: Accepted @@ -48,22 +48,22 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:16 GMT + - Thu, 17 Sep 2020 17:19:41 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0falsefalse1.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:15 GMT + - Thu, 17 Sep 2020 17:19:40 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: @@ -71,7 +71,7 @@ interactions: vary: - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_hour_metrics.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_hour_metrics.yaml index 959cebe114be..08b9ee6d9948 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_hour_metrics.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_hour_metrics.yaml @@ -15,25 +15,25 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:16 GMT + - Thu, 17 Sep 2020 17:19:41 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: - - '0' date: - - Wed, 15 Jan 2020 23:51:17 GMT + - Thu, 17 Sep 2020 17:19:42 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 202 message: Accepted @@ -47,22 +47,22 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:17 GMT + - Thu, 17 Sep 2020 17:19:44 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:17 GMT + - Thu, 17 Sep 2020 17:19:42 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: @@ -70,7 +70,7 @@ interactions: vary: - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_minute_metrics.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_minute_metrics.yaml index c8886063fc24..dbf96f07169a 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_minute_metrics.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_set_minute_metrics.yaml @@ -15,25 +15,25 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:17 GMT + - Thu, 17 Sep 2020 17:19:44 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: - - '0' date: - - Wed, 15 Jan 2020 23:51:17 GMT + - Thu, 17 Sep 2020 17:19:44 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 202 message: Accepted @@ -47,22 +47,22 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:18 GMT + - Thu, 17 Sep 2020 17:19:45 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:18 GMT + - Thu, 17 Sep 2020 17:19:44 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: @@ -70,7 +70,7 @@ interactions: vary: - Origin x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_too_many_cors_rules.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_too_many_cors_rules.yaml index f923e3d8b690..cd70dd61c7c6 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_too_many_cors_rules.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties.test_too_many_cors_rules.yaml @@ -21,17 +21,17 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:18 GMT + - Thu, 17 Sep 2020 17:19:45 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFFInvalidXmlDocumentXML - specified is not syntactically valid.\nRequestId:bf9fc971-701a-0071-0bfe-cb90ac000000\nTime:2020-01-15T23:51:19.3215206Z0000" headers: content-length: @@ -39,13 +39,13 @@ interactions: content-type: - application/xml date: - - Wed, 15 Jan 2020 23:51:18 GMT + - Thu, 17 Sep 2020 17:19:44 GMT server: - Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: - InvalidXmlDocument x-ms-version: - - '2019-02-02' + - '2020-02-10' status: code: 400 message: XML specified is not syntactically valid. diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_file_service_properties_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_file_service_properties_async.yaml index 56791da59694..0fcb6611e76a 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_file_service_properties_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_file_service_properties_async.yaml @@ -3,71 +3,116 @@ interactions: body: ' 1.0falsefalse1.0falsefalse' + />false' headers: Content-Length: - - '368' + - '469' Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:19 GMT + - Fri, 18 Sep 2020 01:53:37 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: '0' - date: Wed, 15 Jan 2020 23:51:19 GMT + date: Fri, 18 Sep 2020 01:53:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-02-02' + transfer-encoding: chunked + x-ms-version: '2020-02-10' + status: + code: 202 + message: Accepted + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties +- request: + body: null + headers: + Accept: + - application/xml + User-Agent: + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) + x-ms-date: + - Fri, 18 Sep 2020 01:53:40 GMT + x-ms-version: + - '2020-02-10' + method: GET + uri: https://storagename.file.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0falsefalse1.0falsefalsefalse" + headers: + content-type: application/xml + date: Fri, 18 Sep 2020 01:53:39 GMT + server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: chunked + vary: Origin + x-ms-version: '2020-02-10' + status: + code: 200 + message: OK + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties +- request: + body: ' + + 1.0falsefalse1.0falsefalsetrue' + headers: + Content-Length: + - '468' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) + x-ms-date: + - Fri, 18 Sep 2020 01:53:40 GMT + x-ms-version: + - '2020-02-10' + method: PUT + uri: https://storagename.file.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + date: Fri, 18 Sep 2020 01:53:39 GMT + server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: chunked + x-ms-version: '2020-02-10' status: code: 202 message: Accepted - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:20 GMT + - Fri, 18 Sep 2020 01:53:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0falsefalse1.0falsefalse" + />true" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:20 GMT + date: Fri, 18 Sep 2020 01:53:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-02-02' + vary: Origin + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_cors_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_cors_async.yaml index f00a6cea78b6..0181be1e5aa2 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_cors_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_cors_async.yaml @@ -10,65 +10,51 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:20 GMT + - Fri, 18 Sep 2020 01:53:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: '0' - date: Wed, 15 Jan 2020 23:51:20 GMT + date: Fri, 18 Sep 2020 01:53:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-02-02' + transfer-encoding: chunked + x-ms-version: '2020-02-10' status: code: 202 message: Accepted - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:21 GMT + - Fri, 18 Sep 2020 01:53:40 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0falsefalse1.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:20 GMT + date: Fri, 18 Sep 2020 01:53:39 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked vary: Origin - x-ms-version: '2019-02-02' + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_hour_metrics_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_hour_metrics_async.yaml index 54cfd749208e..b82ba345dc86 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_hour_metrics_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_hour_metrics_async.yaml @@ -9,65 +9,51 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:21 GMT + - Fri, 18 Sep 2020 01:53:41 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: '0' - date: Wed, 15 Jan 2020 23:51:21 GMT + date: Fri, 18 Sep 2020 01:53:40 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-02-02' + transfer-encoding: chunked + x-ms-version: '2020-02-10' status: code: 202 message: Accepted - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:22 GMT + - Fri, 18 Sep 2020 01:53:41 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:21 GMT + date: Fri, 18 Sep 2020 01:53:40 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked vary: Origin - x-ms-version: '2019-02-02' + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_minute_metrics_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_minute_metrics_async.yaml index 98b6fab23dbc..0eca84a4c4f9 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_minute_metrics_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_set_minute_metrics_async.yaml @@ -9,65 +9,51 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:22 GMT + - Fri, 18 Sep 2020 01:53:42 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: '' headers: - content-length: '0' - date: Wed, 15 Jan 2020 23:51:22 GMT + date: Fri, 18 Sep 2020 01:53:41 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-02-02' + transfer-encoding: chunked + x-ms-version: '2020-02-10' status: code: 202 message: Accepted - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:22 GMT + - Fri, 18 Sep 2020 01:53:43 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: GET uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFF1.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500" + />0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500true" headers: content-type: application/xml - date: Wed, 15 Jan 2020 23:51:22 GMT + date: Fri, 18 Sep 2020 01:53:41 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked vary: Origin - x-ms-version: '2019-02-02' + x-ms-version: '2020-02-10' status: code: 200 message: OK - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_too_many_cors_rules_async.yaml b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_too_many_cors_rules_async.yaml index a8cbe6c69a78..10dfe103177f 100644 --- a/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_too_many_cors_rules_async.yaml +++ b/sdk/storage/azure-storage-file-share/tests/recordings/test_file_service_properties_async.test_too_many_cors_rules_async.yaml @@ -15,34 +15,27 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-file-share/12.0.1 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-file-share/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Wed, 15 Jan 2020 23:51:23 GMT + - Fri, 18 Sep 2020 01:53:43 GMT x-ms-version: - - '2019-02-02' + - '2020-02-10' method: PUT uri: https://storagename.file.core.windows.net/?restype=service&comp=properties response: body: string: "\uFEFFInvalidXmlDocumentXML - specified is not syntactically valid.\nRequestId:92094185-001a-0057-77fe-cb0b18000000\nTime:2020-01-15T23:51:23.3058154Z0000" headers: content-length: '294' content-type: application/xml - date: Wed, 15 Jan 2020 23:51:22 GMT + date: Fri, 18 Sep 2020 01:53:42 GMT server: Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: InvalidXmlDocument - x-ms-version: '2019-02-02' + x-ms-version: '2020-02-10' status: code: 400 message: XML specified is not syntactically valid. - url: !!python/object/new:yarl.URL - state: !!python/tuple - - !!python/object/new:urllib.parse.SplitResult - - https - - pyacrstorage43x4qoc3y4bx.file.core.windows.net - - / - - restype=service&comp=properties - - '' + url: https://seancanarypremiumfile.file.core.windows.net/?restype=service&comp=properties version: 1 diff --git a/sdk/storage/azure-storage-file-share/tests/test_file_service_properties.py b/sdk/storage/azure-storage-file-share/tests/test_file_service_properties.py index af540fe39b59..f5c03734e7f0 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_file_service_properties.py +++ b/sdk/storage/azure-storage-file-share/tests/test_file_service_properties.py @@ -14,6 +14,9 @@ Metrics, CorsRule, RetentionPolicy, + ShareSmbSettings, + SmbMultichannel, + ShareProtocolSettings, ) from devtools_testutils import ResourceGroupPreparer, StorageAccountPreparer @@ -75,16 +78,24 @@ def _assert_retention_equal(self, ret1, ret2): def test_file_service_properties(self, resource_group, location, storage_account, storage_account_key): self._setup(storage_account, storage_account_key) + protocol_properties1 = ShareProtocolSettings(ShareSmbSettings(SmbMultichannel(enabled=False))) + protocol_properties2 = ShareProtocolSettings(ShareSmbSettings(SmbMultichannel(enabled=True))) # Act resp = self.fsc.set_service_properties( - hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list()) - + hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), protocol=protocol_properties1) # Assert self.assertIsNone(resp) props = self.fsc.get_service_properties() self._assert_metrics_equal(props['hour_metrics'], Metrics()) self._assert_metrics_equal(props['minute_metrics'], Metrics()) self._assert_cors_equal(props['cors'], list()) + self.assertEqual(props['protocol'].smb.multichannel.enabled, False) + + # Act + self.fsc.set_service_properties( + hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), protocol=protocol_properties2) + props = self.fsc.get_service_properties() + self.assertEqual(props['protocol'].smb.multichannel.enabled, True) # --Test cases per feature --------------------------------------- @GlobalStorageAccountPreparer() diff --git a/sdk/storage/azure-storage-file-share/tests/test_file_service_properties_async.py b/sdk/storage/azure-storage-file-share/tests/test_file_service_properties_async.py index a38231090d77..f0dcd2ac2f9b 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_file_service_properties_async.py +++ b/sdk/storage/azure-storage-file-share/tests/test_file_service_properties_async.py @@ -15,6 +15,9 @@ Metrics, CorsRule, RetentionPolicy, + ShareProtocolSettings, + SmbMultichannel, + ShareSmbSettings, ) from azure.storage.fileshare.aio import ShareServiceClient from devtools_testutils import ResourceGroupPreparer, StorageAccountPreparer @@ -85,10 +88,12 @@ def _assert_retention_equal(self, ret1, ret2): @AsyncStorageTestCase.await_prepared_test async def test_file_service_properties_async(self, resource_group, location, storage_account, storage_account_key): self._setup(storage_account, storage_account_key) + protocol_properties1 = ShareProtocolSettings(ShareSmbSettings(SmbMultichannel(enabled=False))) + protocol_properties2 = ShareProtocolSettings(ShareSmbSettings(SmbMultichannel(enabled=True))) # Act resp = await self.fsc.set_service_properties( - hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list()) + hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), protocol=protocol_properties1) # Assert self.assertIsNone(resp) @@ -96,6 +101,13 @@ async def test_file_service_properties_async(self, resource_group, location, sto self._assert_metrics_equal(props['hour_metrics'], Metrics()) self._assert_metrics_equal(props['minute_metrics'], Metrics()) self._assert_cors_equal(props['cors'], list()) + self.assertEqual(props['protocol'].smb.multichannel.enabled, False) + + # Act + await self.fsc.set_service_properties( + hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), protocol=protocol_properties2) + props = await self.fsc.get_service_properties() + self.assertEqual(props['protocol'].smb.multichannel.enabled, True) # --Test cases per feature --------------------------------------- @GlobalStorageAccountPreparer()