From 65073b02f4aaf149888a61cbe41617da1058498e Mon Sep 17 00:00:00 2001 From: xiafu Date: Tue, 22 Sep 2020 13:04:05 -0700 Subject: [PATCH] [Swagger][FileShare]Regenerate for Clear Range Change --- .../_file_operations_async.py | 6 +- .../fileshare/_generated/models/__init__.py | 12 +- .../fileshare/_generated/models/_models.py | 112 +++++++++++++----- .../_generated/models/_models_py3.py | 112 +++++++++++++----- .../_generated/operations/_file_operations.py | 6 +- 5 files changed, 179 insertions(+), 69 deletions(-) diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/operations_async/_file_operations_async.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/operations_async/_file_operations_async.py index 1045ba184bed..51d76143b334 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/operations_async/_file_operations_async.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/operations_async/_file_operations_async.py @@ -1246,8 +1246,8 @@ async def get_range_list(self, sharesnapshot=None, prevsharesnapshot=None, timeo ~azure.storage.fileshare.models.LeaseAccessConditions :param callable cls: A custom type or function that will be passed the direct response - :return: list or the result of cls(response) - :rtype: list[~azure.storage.fileshare.models.Range] + :return: ShareFileRangeList or the result of cls(response) + :rtype: ~azure.storage.fileshare.models.ShareFileRangeList :raises: :class:`StorageErrorException` """ @@ -1296,7 +1296,7 @@ async def get_range_list(self, sharesnapshot=None, prevsharesnapshot=None, timeo header_dict = {} deserialized = None if response.status_code == 200: - deserialized = self._deserialize('[Range]', response) + deserialized = self._deserialize('ShareFileRangeList', response) header_dict = { 'Last-Modified': self._deserialize('rfc-1123', response.headers.get('Last-Modified')), 'ETag': self._deserialize('str', response.headers.get('ETag')), diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/__init__.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/__init__.py index 3fc77d5ec6d4..163c6b6c7f8e 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/__init__.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/__init__.py @@ -11,12 +11,14 @@ try: from ._models_py3 import AccessPolicy + from ._models_py3 import ClearRange from ._models_py3 import CopyFileSmbInfo from ._models_py3 import CorsRule from ._models_py3 import DirectoryItem from ._models_py3 import FileHTTPHeaders from ._models_py3 import FileItem from ._models_py3 import FileProperty + from ._models_py3 import FileRange from ._models_py3 import FilesAndDirectoriesListSegment from ._models_py3 import HandleItem from ._models_py3 import LeaseAccessConditions @@ -24,8 +26,8 @@ from ._models_py3 import ListHandlesResponse from ._models_py3 import ListSharesResponse from ._models_py3 import Metrics - from ._models_py3 import Range from ._models_py3 import RetentionPolicy + from ._models_py3 import ShareFileRangeList from ._models_py3 import ShareItem from ._models_py3 import SharePermission from ._models_py3 import ShareProperties @@ -39,12 +41,14 @@ from ._models_py3 import StorageServiceProperties except (SyntaxError, ImportError): from ._models import AccessPolicy + from ._models import ClearRange from ._models import CopyFileSmbInfo from ._models import CorsRule from ._models import DirectoryItem from ._models import FileHTTPHeaders from ._models import FileItem from ._models import FileProperty + from ._models import FileRange from ._models import FilesAndDirectoriesListSegment from ._models import HandleItem from ._models import LeaseAccessConditions @@ -52,8 +56,8 @@ from ._models import ListHandlesResponse from ._models import ListSharesResponse from ._models import Metrics - from ._models import Range from ._models import RetentionPolicy + from ._models import ShareFileRangeList from ._models import ShareItem from ._models import SharePermission from ._models import ShareProperties @@ -79,12 +83,14 @@ __all__ = [ 'AccessPolicy', + 'ClearRange', 'CopyFileSmbInfo', 'CorsRule', 'DirectoryItem', 'FileHTTPHeaders', 'FileItem', 'FileProperty', + 'FileRange', 'FilesAndDirectoriesListSegment', 'HandleItem', 'LeaseAccessConditions', @@ -92,8 +98,8 @@ 'ListHandlesResponse', 'ListSharesResponse', 'Metrics', - 'Range', 'RetentionPolicy', + 'ShareFileRangeList', 'ShareItem', 'SharePermission', 'ShareProperties', diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models.py index 255d15cd6226..9f6b2dbf672a 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models.py @@ -39,6 +39,36 @@ def __init__(self, **kwargs): self.permission = kwargs.get('permission', None) +class ClearRange(Model): + """ClearRange. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. + :type start: long + :param end: Required. + :type end: long + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, + 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, + } + _xml_map = { + 'name': 'ClearRange' + } + + def __init__(self, **kwargs): + super(ClearRange, self).__init__(**kwargs) + self.start = kwargs.get('start', None) + self.end = kwargs.get('end', None) + + class CopyFileSmbInfo(Model): """Additional parameters for start_copy operation. @@ -275,6 +305,36 @@ def __init__(self, **kwargs): self.content_length = kwargs.get('content_length', None) +class FileRange(Model): + """An Azure Storage file range. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. Start of the range. + :type start: long + :param end: Required. End of the range. + :type end: long + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, + 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, + } + _xml_map = { + 'name': 'Range' + } + + def __init__(self, **kwargs): + super(FileRange, self).__init__(**kwargs) + self.start = kwargs.get('start', None) + self.end = kwargs.get('end', None) + + class FilesAndDirectoriesListSegment(Model): """Abstract for entries that can be listed from Directory. @@ -564,36 +624,6 @@ def __init__(self, **kwargs): self.retention_policy = kwargs.get('retention_policy', None) -class Range(Model): - """An Azure Storage file range. - - All required parameters must be populated in order to send to Azure. - - :param start: Required. Start of the range. - :type start: long - :param end: Required. End of the range. - :type end: long - """ - - _validation = { - 'start': {'required': True}, - 'end': {'required': True}, - } - - _attribute_map = { - 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, - 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, - } - _xml_map = { - 'name': 'Range' - } - - def __init__(self, **kwargs): - super(Range, self).__init__(**kwargs) - self.start = kwargs.get('start', None) - self.end = kwargs.get('end', None) - - class RetentionPolicy(Model): """The retention policy. @@ -627,6 +657,28 @@ def __init__(self, **kwargs): self.days = kwargs.get('days', None) +class ShareFileRangeList(Model): + """The list of file ranges. + + :param ranges: + :type ranges: list[~azure.storage.fileshare.models.FileRange] + :param clear_ranges: + :type clear_ranges: list[~azure.storage.fileshare.models.ClearRange] + """ + + _attribute_map = { + 'ranges': {'key': 'Ranges', 'type': '[FileRange]', 'xml': {'name': 'Ranges', 'itemsName': 'Range'}}, + 'clear_ranges': {'key': 'ClearRanges', 'type': '[ClearRange]', 'xml': {'name': 'ClearRanges', 'itemsName': 'ClearRange'}}, + } + _xml_map = { + } + + def __init__(self, **kwargs): + super(ShareFileRangeList, self).__init__(**kwargs) + self.ranges = kwargs.get('ranges', None) + self.clear_ranges = kwargs.get('clear_ranges', None) + + class ShareItem(Model): """A listed Azure Storage share item. diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models_py3.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models_py3.py index a448242f5354..7fe9c4a7cb49 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models_py3.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models_py3.py @@ -39,6 +39,36 @@ def __init__(self, *, start: str=None, expiry: str=None, permission: str=None, * self.permission = permission +class ClearRange(Model): + """ClearRange. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. + :type start: long + :param end: Required. + :type end: long + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, + 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, + } + _xml_map = { + 'name': 'ClearRange' + } + + def __init__(self, *, start: int, end: int, **kwargs) -> None: + super(ClearRange, self).__init__(**kwargs) + self.start = start + self.end = end + + class CopyFileSmbInfo(Model): """Additional parameters for start_copy operation. @@ -275,6 +305,36 @@ def __init__(self, *, content_length: int, **kwargs) -> None: self.content_length = content_length +class FileRange(Model): + """An Azure Storage file range. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. Start of the range. + :type start: long + :param end: Required. End of the range. + :type end: long + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, + 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, + } + _xml_map = { + 'name': 'Range' + } + + def __init__(self, *, start: int, end: int, **kwargs) -> None: + super(FileRange, self).__init__(**kwargs) + self.start = start + self.end = end + + class FilesAndDirectoriesListSegment(Model): """Abstract for entries that can be listed from Directory. @@ -564,36 +624,6 @@ def __init__(self, *, version: str, enabled: bool, include_apis: bool=None, rete self.retention_policy = retention_policy -class Range(Model): - """An Azure Storage file range. - - All required parameters must be populated in order to send to Azure. - - :param start: Required. Start of the range. - :type start: long - :param end: Required. End of the range. - :type end: long - """ - - _validation = { - 'start': {'required': True}, - 'end': {'required': True}, - } - - _attribute_map = { - 'start': {'key': 'Start', 'type': 'long', 'xml': {'name': 'Start'}}, - 'end': {'key': 'End', 'type': 'long', 'xml': {'name': 'End'}}, - } - _xml_map = { - 'name': 'Range' - } - - def __init__(self, *, start: int, end: int, **kwargs) -> None: - super(Range, self).__init__(**kwargs) - self.start = start - self.end = end - - class RetentionPolicy(Model): """The retention policy. @@ -627,6 +657,28 @@ def __init__(self, *, enabled: bool, days: int=None, **kwargs) -> None: self.days = days +class ShareFileRangeList(Model): + """The list of file ranges. + + :param ranges: + :type ranges: list[~azure.storage.fileshare.models.FileRange] + :param clear_ranges: + :type clear_ranges: list[~azure.storage.fileshare.models.ClearRange] + """ + + _attribute_map = { + 'ranges': {'key': 'Ranges', 'type': '[FileRange]', 'xml': {'name': 'Ranges', 'itemsName': 'Range'}}, + 'clear_ranges': {'key': 'ClearRanges', 'type': '[ClearRange]', 'xml': {'name': 'ClearRanges', 'itemsName': 'ClearRange'}}, + } + _xml_map = { + } + + def __init__(self, *, ranges=None, clear_ranges=None, **kwargs) -> None: + super(ShareFileRangeList, self).__init__(**kwargs) + self.ranges = ranges + self.clear_ranges = clear_ranges + + class ShareItem(Model): """A listed Azure Storage share item. diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/operations/_file_operations.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/operations/_file_operations.py index 35053e581d6e..48df9325f80d 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/operations/_file_operations.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/operations/_file_operations.py @@ -1245,8 +1245,8 @@ def get_range_list(self, sharesnapshot=None, prevsharesnapshot=None, timeout=Non ~azure.storage.fileshare.models.LeaseAccessConditions :param callable cls: A custom type or function that will be passed the direct response - :return: list or the result of cls(response) - :rtype: list[~azure.storage.fileshare.models.Range] + :return: ShareFileRangeList or the result of cls(response) + :rtype: ~azure.storage.fileshare.models.ShareFileRangeList :raises: :class:`StorageErrorException` """ @@ -1295,7 +1295,7 @@ def get_range_list(self, sharesnapshot=None, prevsharesnapshot=None, timeout=Non header_dict = {} deserialized = None if response.status_code == 200: - deserialized = self._deserialize('[Range]', response) + deserialized = self._deserialize('ShareFileRangeList', response) header_dict = { 'Last-Modified': self._deserialize('rfc-1123', response.headers.get('Last-Modified')), 'ETag': self._deserialize('str', response.headers.get('ETag')),