From 76c814311798ed898337565a3d65ffbade267122 Mon Sep 17 00:00:00 2001 From: Feng Zhou Date: Fri, 27 Sep 2019 09:01:21 +0000 Subject: [PATCH 1/8] model change for storage --- .../storage/v2019_04_01/models/__init__.py | 2 -- .../storage/v2019_04_01/models/_models.py | 21 --------------- .../storage/v2019_04_01/models/_models_py3.py | 27 +++---------------- .../_storage_management_client_enums.py | 6 ----- 4 files changed, 3 insertions(+), 53 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py index 371410aa5854..f7744238295c 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py @@ -167,7 +167,6 @@ DefaultAction, DirectoryServiceOptions, AccessTier, - LargeFileSharesState, GeoReplicationStatus, ProvisioningState, AccountStatus, @@ -276,7 +275,6 @@ 'DefaultAction', 'DirectoryServiceOptions', 'AccessTier', - 'LargeFileSharesState', 'GeoReplicationStatus', 'ProvisioningState', 'AccountStatus', diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py index 3992e7696a0d..5a53846c8bc0 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py @@ -2381,11 +2381,6 @@ class StorageAccount(TrackedResource): :ivar failover_in_progress: If the failover is in progress, the value will be true, otherwise, it will be null. :vartype failover_in_progress: bool - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2439,7 +2434,6 @@ class StorageAccount(TrackedResource): 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'geo_replication_stats': {'key': 'properties.geoReplicationStats', 'type': 'GeoReplicationStats'}, 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } def __init__(self, **kwargs): @@ -2465,7 +2459,6 @@ def __init__(self, **kwargs): self.is_hns_enabled = kwargs.get('is_hns_enabled', None) self.geo_replication_stats = None self.failover_in_progress = None - self.large_file_shares_state = kwargs.get('large_file_shares_state', None) class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2553,11 +2546,6 @@ class StorageAccountCreateParameters(Model): :param is_hns_enabled: Account HierarchicalNamespace enabled if sets to true. :type is_hns_enabled: bool - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2579,7 +2567,6 @@ class StorageAccountCreateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } def __init__(self, **kwargs): @@ -2596,7 +2583,6 @@ def __init__(self, **kwargs): self.azure_files_identity_based_authentication = kwargs.get('azure_files_identity_based_authentication', None) self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.is_hns_enabled = kwargs.get('is_hns_enabled', None) - self.large_file_shares_state = kwargs.get('large_file_shares_state', None) class StorageAccountKey(Model): @@ -2721,11 +2707,6 @@ class StorageAccountUpdateParameters(Model): :param network_rule_set: Network rule set :type network_rule_set: ~azure.mgmt.storage.v2019_04_01.models.NetworkRuleSet - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2742,7 +2723,6 @@ class StorageAccountUpdateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, } @@ -2757,7 +2737,6 @@ def __init__(self, **kwargs): self.azure_files_identity_based_authentication = kwargs.get('azure_files_identity_based_authentication', None) self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.network_rule_set = kwargs.get('network_rule_set', None) - self.large_file_shares_state = kwargs.get('large_file_shares_state', None) self.kind = kwargs.get('kind', None) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py index 17659f2bc0ae..093b8daeca43 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py @@ -2381,11 +2381,6 @@ class StorageAccount(TrackedResource): :ivar failover_in_progress: If the failover is in progress, the value will be true, otherwise, it will be null. :vartype failover_in_progress: bool - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2439,10 +2434,9 @@ class StorageAccount(TrackedResource): 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'geo_replication_stats': {'key': 'properties.geoReplicationStats', 'type': 'GeoReplicationStats'}, 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } - def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, **kwargs) -> None: super(StorageAccount, self).__init__(tags=tags, location=location, **kwargs) self.sku = None self.kind = None @@ -2465,7 +2459,6 @@ def __init__(self, *, location: str, tags=None, identity=None, azure_files_ident self.is_hns_enabled = is_hns_enabled self.geo_replication_stats = None self.failover_in_progress = None - self.large_file_shares_state = large_file_shares_state class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2553,11 +2546,6 @@ class StorageAccountCreateParameters(Model): :param is_hns_enabled: Account HierarchicalNamespace enabled if sets to true. :type is_hns_enabled: bool - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2579,10 +2567,9 @@ class StorageAccountCreateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } - def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: + def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, **kwargs) -> None: super(StorageAccountCreateParameters, self).__init__(**kwargs) self.sku = sku self.kind = kind @@ -2596,7 +2583,6 @@ def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom self.azure_files_identity_based_authentication = azure_files_identity_based_authentication self.enable_https_traffic_only = enable_https_traffic_only self.is_hns_enabled = is_hns_enabled - self.large_file_shares_state = large_file_shares_state class StorageAccountKey(Model): @@ -2721,11 +2707,6 @@ class StorageAccountUpdateParameters(Model): :param network_rule_set: Network rule set :type network_rule_set: ~azure.mgmt.storage.v2019_04_01.models.NetworkRuleSet - :param large_file_shares_state: Allow large file shares if sets to - Enabled. It cannot be disabled once it is enabled. Possible values - include: 'Disabled', 'Enabled' - :type large_file_shares_state: str or - ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2742,11 +2723,10 @@ class StorageAccountUpdateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, - 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, } - def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, large_file_shares_state=None, kind=None, **kwargs) -> None: + def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, kind=None, **kwargs) -> None: super(StorageAccountUpdateParameters, self).__init__(**kwargs) self.sku = sku self.tags = tags @@ -2757,7 +2737,6 @@ def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, en self.azure_files_identity_based_authentication = azure_files_identity_based_authentication self.enable_https_traffic_only = enable_https_traffic_only self.network_rule_set = network_rule_set - self.large_file_shares_state = large_file_shares_state self.kind = kind diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py index 9217257e5dbc..642376a2db60 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py @@ -98,12 +98,6 @@ class AccessTier(str, Enum): cool = "Cool" -class LargeFileSharesState(str, Enum): - - disabled = "Disabled" - enabled = "Enabled" - - class GeoReplicationStatus(str, Enum): live = "Live" From 64ff9faaa0cdcf878596a7f52bb9e4b05b563fb7 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Fri, 27 Sep 2019 07:31:46 +0800 Subject: [PATCH 2/8] Generated from ebaee7c36eb7db67a4e648374f69f26a654b444f (#7445) [SRP] Add new storage account property largeFileSharesState --- .../storage/v2019_04_01/models/__init__.py | 2 ++ .../storage/v2019_04_01/models/_models.py | 21 +++++++++++++++ .../storage/v2019_04_01/models/_models_py3.py | 27 ++++++++++++++++--- .../_storage_management_client_enums.py | 6 +++++ 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py index f7744238295c..371410aa5854 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py @@ -167,6 +167,7 @@ DefaultAction, DirectoryServiceOptions, AccessTier, + LargeFileSharesState, GeoReplicationStatus, ProvisioningState, AccountStatus, @@ -275,6 +276,7 @@ 'DefaultAction', 'DirectoryServiceOptions', 'AccessTier', + 'LargeFileSharesState', 'GeoReplicationStatus', 'ProvisioningState', 'AccountStatus', diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py index 5a53846c8bc0..3992e7696a0d 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models.py @@ -2381,6 +2381,11 @@ class StorageAccount(TrackedResource): :ivar failover_in_progress: If the failover is in progress, the value will be true, otherwise, it will be null. :vartype failover_in_progress: bool + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2434,6 +2439,7 @@ class StorageAccount(TrackedResource): 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'geo_replication_stats': {'key': 'properties.geoReplicationStats', 'type': 'GeoReplicationStats'}, 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } def __init__(self, **kwargs): @@ -2459,6 +2465,7 @@ def __init__(self, **kwargs): self.is_hns_enabled = kwargs.get('is_hns_enabled', None) self.geo_replication_stats = None self.failover_in_progress = None + self.large_file_shares_state = kwargs.get('large_file_shares_state', None) class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2546,6 +2553,11 @@ class StorageAccountCreateParameters(Model): :param is_hns_enabled: Account HierarchicalNamespace enabled if sets to true. :type is_hns_enabled: bool + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2567,6 +2579,7 @@ class StorageAccountCreateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } def __init__(self, **kwargs): @@ -2583,6 +2596,7 @@ def __init__(self, **kwargs): self.azure_files_identity_based_authentication = kwargs.get('azure_files_identity_based_authentication', None) self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.is_hns_enabled = kwargs.get('is_hns_enabled', None) + self.large_file_shares_state = kwargs.get('large_file_shares_state', None) class StorageAccountKey(Model): @@ -2707,6 +2721,11 @@ class StorageAccountUpdateParameters(Model): :param network_rule_set: Network rule set :type network_rule_set: ~azure.mgmt.storage.v2019_04_01.models.NetworkRuleSet + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2723,6 +2742,7 @@ class StorageAccountUpdateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, } @@ -2737,6 +2757,7 @@ def __init__(self, **kwargs): self.azure_files_identity_based_authentication = kwargs.get('azure_files_identity_based_authentication', None) self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.network_rule_set = kwargs.get('network_rule_set', None) + self.large_file_shares_state = kwargs.get('large_file_shares_state', None) self.kind = kwargs.get('kind', None) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py index 093b8daeca43..17659f2bc0ae 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py @@ -2381,6 +2381,11 @@ class StorageAccount(TrackedResource): :ivar failover_in_progress: If the failover is in progress, the value will be true, otherwise, it will be null. :vartype failover_in_progress: bool + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2434,9 +2439,10 @@ class StorageAccount(TrackedResource): 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'geo_replication_stats': {'key': 'properties.geoReplicationStats', 'type': 'GeoReplicationStats'}, 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } - def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: super(StorageAccount, self).__init__(tags=tags, location=location, **kwargs) self.sku = None self.kind = None @@ -2459,6 +2465,7 @@ def __init__(self, *, location: str, tags=None, identity=None, azure_files_ident self.is_hns_enabled = is_hns_enabled self.geo_replication_stats = None self.failover_in_progress = None + self.large_file_shares_state = large_file_shares_state class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2546,6 +2553,11 @@ class StorageAccountCreateParameters(Model): :param is_hns_enabled: Account HierarchicalNamespace enabled if sets to true. :type is_hns_enabled: bool + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState """ _validation = { @@ -2567,9 +2579,10 @@ class StorageAccountCreateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, } - def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, **kwargs) -> None: + def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: super(StorageAccountCreateParameters, self).__init__(**kwargs) self.sku = sku self.kind = kind @@ -2583,6 +2596,7 @@ def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom self.azure_files_identity_based_authentication = azure_files_identity_based_authentication self.enable_https_traffic_only = enable_https_traffic_only self.is_hns_enabled = is_hns_enabled + self.large_file_shares_state = large_file_shares_state class StorageAccountKey(Model): @@ -2707,6 +2721,11 @@ class StorageAccountUpdateParameters(Model): :param network_rule_set: Network rule set :type network_rule_set: ~azure.mgmt.storage.v2019_04_01.models.NetworkRuleSet + :param large_file_shares_state: Allow large file shares if sets to + Enabled. It cannot be disabled once it is enabled. Possible values + include: 'Disabled', 'Enabled' + :type large_file_shares_state: str or + ~azure.mgmt.storage.v2019_04_01.models.LargeFileSharesState :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2723,10 +2742,11 @@ class StorageAccountUpdateParameters(Model): 'azure_files_identity_based_authentication': {'key': 'properties.azureFilesIdentityBasedAuthentication', 'type': 'AzureFilesIdentityBasedAuthentication'}, 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, + 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, } - def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, kind=None, **kwargs) -> None: + def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, large_file_shares_state=None, kind=None, **kwargs) -> None: super(StorageAccountUpdateParameters, self).__init__(**kwargs) self.sku = sku self.tags = tags @@ -2737,6 +2757,7 @@ def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, en self.azure_files_identity_based_authentication = azure_files_identity_based_authentication self.enable_https_traffic_only = enable_https_traffic_only self.network_rule_set = network_rule_set + self.large_file_shares_state = large_file_shares_state self.kind = kind diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py index 642376a2db60..9217257e5dbc 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py @@ -98,6 +98,12 @@ class AccessTier(str, Enum): cool = "Cool" +class LargeFileSharesState(str, Enum): + + disabled = "Disabled" + enabled = "Enabled" + + class GeoReplicationStatus(str, Enum): live = "Live" From d3d6d0edd2b20ec3a26b95807672702b79900464 Mon Sep 17 00:00:00 2001 From: fengzhou-msft <55177366+fengzhou-msft@users.noreply.github.com> Date: Tue, 8 Oct 2019 10:32:42 +0800 Subject: [PATCH 3/8] Update HISTORY.rst --- sdk/storage/azure-mgmt-storage/HISTORY.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/HISTORY.rst b/sdk/storage/azure-mgmt-storage/HISTORY.rst index a1b82a60138b..5d09ef0f0e9c 100644 --- a/sdk/storage/azure-mgmt-storage/HISTORY.rst +++ b/sdk/storage/azure-mgmt-storage/HISTORY.rst @@ -37,16 +37,6 @@ Release History - Model StorageAccountUpdateParameters has a new parameter large_file_shares_state - Model StorageAccount has a new parameter large_file_shares_state -4.1.0 (2019-09-27) -++++++++++++++++++ - -**Features** - -- Model BlobServiceProperties has a new parameter change_feed -- Added operation BlobServicesOperations.list -- Added operation group FileServicesOperations -- Added operation group FileSharesOperations - 4.0.0 (2019-06-12) ++++++++++++++++++ From 911c23fee495baf332ebc1e65ee77ef957577898 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Tue, 5 Nov 2019 21:02:56 +0800 Subject: [PATCH 4/8] [AutoPR storage/resource-manager] [SRP] Remove a recent added property for container soft delete (#8388) * Generated from 5384fe0c3361da843a2b55c9bb7aa55e494ab984 [SRP] Remove a recent added property for container soft delete * Generated from 5384fe0c3361da843a2b55c9bb7aa55e494ab984 [SRP] Remove a recent added property for container soft delete --- .../azure/mgmt/storage/v2019_06_01/models/_models.py | 7 +++---- .../azure/mgmt/storage/v2019_06_01/models/_models_py3.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py index 841e93126d61..8b9db7112829 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py @@ -658,12 +658,11 @@ def __init__(self, **kwargs): class DeleteRetentionPolicy(Model): - """The blob service properties for soft delete. + """The service properties for soft delete. - :param enabled: Indicates whether DeleteRetentionPolicy is enabled for the - Blob service. + :param enabled: Indicates whether DeleteRetentionPolicy is enabled. :type enabled: bool - :param days: Indicates the number of days that the deleted blob should be + :param days: Indicates the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365. :type days: int diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py index e9843772c215..bd3bbb1ec933 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py @@ -658,12 +658,11 @@ def __init__(self, *, days_after_modification_greater_than: float, **kwargs) -> class DeleteRetentionPolicy(Model): - """The blob service properties for soft delete. + """The service properties for soft delete. - :param enabled: Indicates whether DeleteRetentionPolicy is enabled for the - Blob service. + :param enabled: Indicates whether DeleteRetentionPolicy is enabled. :type enabled: bool - :param days: Indicates the number of days that the deleted blob should be + :param days: Indicates the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365. :type days: int From d2c98114377d47dcd0fce9e6404144f86b24a9fe Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Fri, 22 Nov 2019 09:18:57 +0800 Subject: [PATCH 5/8] Generated from 6ac6e268eae9c51c39ffa3313ddd9f4fc4543487 (#8782) [SRP] Increase the max file share quota for LFS --- .../azure/mgmt/storage/v2019_06_01/models/_models.py | 10 ++++++---- .../mgmt/storage/v2019_06_01/models/_models_py3.py | 10 ++++++---- .../v2019_06_01/operations/_file_shares_operations.py | 6 ++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py index 8b9db7112829..5661180ac19e 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py @@ -974,7 +974,8 @@ class FileShare(AzureEntityResource): metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be - greater than 0, and less than or equal to 5TB (5120). + greater than 0, and less than or equal to 5TB (5120). For Large File + Shares, the maximum size is 100000. :type share_quota: int """ @@ -984,7 +985,7 @@ class FileShare(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 5120, 'minimum': 1}, + 'share_quota': {'maximum': 100000, 'minimum': 1}, } _attribute_map = { @@ -1027,7 +1028,8 @@ class FileShareItem(AzureEntityResource): metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be - greater than 0, and less than or equal to 5TB (5120). + greater than 0, and less than or equal to 5TB (5120). For Large File + Shares, the maximum size is 100000. :type share_quota: int """ @@ -1037,7 +1039,7 @@ class FileShareItem(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 5120, 'minimum': 1}, + 'share_quota': {'maximum': 100000, 'minimum': 1}, } _attribute_map = { diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py index bd3bbb1ec933..ca012603a176 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py @@ -974,7 +974,8 @@ class FileShare(AzureEntityResource): metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be - greater than 0, and less than or equal to 5TB (5120). + greater than 0, and less than or equal to 5TB (5120). For Large File + Shares, the maximum size is 100000. :type share_quota: int """ @@ -984,7 +985,7 @@ class FileShare(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 5120, 'minimum': 1}, + 'share_quota': {'maximum': 100000, 'minimum': 1}, } _attribute_map = { @@ -1027,7 +1028,8 @@ class FileShareItem(AzureEntityResource): metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be - greater than 0, and less than or equal to 5TB (5120). + greater than 0, and less than or equal to 5TB (5120). For Large File + Shares, the maximum size is 100000. :type share_quota: int """ @@ -1037,7 +1039,7 @@ class FileShareItem(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 5120, 'minimum': 1}, + 'share_quota': {'maximum': 100000, 'minimum': 1}, } _attribute_map = { diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py index 04fb59cd7da3..f370fcdb12b7 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py @@ -148,7 +148,8 @@ def create( metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must - be greater than 0, and less than or equal to 5TB (5120). + be greater than 0, and less than or equal to 5TB (5120). For Large + File Shares, the maximum size is 100000. :type share_quota: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -235,7 +236,8 @@ def update( metadata. :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must - be greater than 0, and less than or equal to 5TB (5120). + be greater than 0, and less than or equal to 5TB (5120). For Large + File Shares, the maximum size is 100000. :type share_quota: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the From b8f6957336450963d131ee7ad391ed64068b0cee Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 4 Dec 2019 11:31:37 +0800 Subject: [PATCH 6/8] Generated from 0de57e1ab5e1425affd87fcd66931cdedd0aa7b6 (#8978) [Storage] Fix the share max quota to right value 102400 --- .../azure/mgmt/storage/v2019_06_01/models/_models.py | 8 ++++---- .../azure/mgmt/storage/v2019_06_01/models/_models_py3.py | 8 ++++---- .../v2019_06_01/operations/_file_shares_operations.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py index 5661180ac19e..3d3c94e162e8 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py @@ -975,7 +975,7 @@ class FileShare(AzureEntityResource): :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File - Shares, the maximum size is 100000. + Shares, the maximum size is 102400. :type share_quota: int """ @@ -985,7 +985,7 @@ class FileShare(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 100000, 'minimum': 1}, + 'share_quota': {'maximum': 102400, 'minimum': 1}, } _attribute_map = { @@ -1029,7 +1029,7 @@ class FileShareItem(AzureEntityResource): :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File - Shares, the maximum size is 100000. + Shares, the maximum size is 102400. :type share_quota: int """ @@ -1039,7 +1039,7 @@ class FileShareItem(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 100000, 'minimum': 1}, + 'share_quota': {'maximum': 102400, 'minimum': 1}, } _attribute_map = { diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py index ca012603a176..21554c7c07dd 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py @@ -975,7 +975,7 @@ class FileShare(AzureEntityResource): :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File - Shares, the maximum size is 100000. + Shares, the maximum size is 102400. :type share_quota: int """ @@ -985,7 +985,7 @@ class FileShare(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 100000, 'minimum': 1}, + 'share_quota': {'maximum': 102400, 'minimum': 1}, } _attribute_map = { @@ -1029,7 +1029,7 @@ class FileShareItem(AzureEntityResource): :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File - Shares, the maximum size is 100000. + Shares, the maximum size is 102400. :type share_quota: int """ @@ -1039,7 +1039,7 @@ class FileShareItem(AzureEntityResource): 'type': {'readonly': True}, 'etag': {'readonly': True}, 'last_modified_time': {'readonly': True}, - 'share_quota': {'maximum': 100000, 'minimum': 1}, + 'share_quota': {'maximum': 102400, 'minimum': 1}, } _attribute_map = { diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py index f370fcdb12b7..ca0c37d18618 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py @@ -149,7 +149,7 @@ def create( :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large - File Shares, the maximum size is 100000. + File Shares, the maximum size is 102400. :type share_quota: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -237,7 +237,7 @@ def update( :type metadata: dict[str, str] :param share_quota: The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large - File Shares, the maximum size is 100000. + File Shares, the maximum size is 102400. :type share_quota: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the From 9ea3f39696bfefc392a64481edbdba96f93670cf Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Wed, 4 Dec 2019 07:31:56 +0000 Subject: [PATCH 7/8] regenerated --- .../storage/v2019_06_01/models/__init__.py | 18 +- .../storage/v2019_06_01/models/_models.py | 271 ++++++++++++++--- .../storage/v2019_06_01/models/_models_py3.py | 283 +++++++++++++++--- .../v2019_06_01/models/_paged_models.py | 8 +- .../_storage_management_client_enums.py | 6 + .../operations/_file_services_operations.py | 8 +- .../operations/_skus_operations.py | 6 +- 7 files changed, 499 insertions(+), 101 deletions(-) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py index 98954a295f6d..acbd2133a08e 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py @@ -67,15 +67,19 @@ from ._models_py3 import ProxyResource from ._models_py3 import Resource from ._models_py3 import Restriction + from ._models_py3 import RoutingPreference from ._models_py3 import ServiceSasParameters from ._models_py3 import ServiceSpecification from ._models_py3 import Sku from ._models_py3 import SKUCapability + from ._models_py3 import SkuInformation from ._models_py3 import StorageAccount from ._models_py3 import StorageAccountCheckNameAvailabilityParameters from ._models_py3 import StorageAccountCreateParameters + from ._models_py3 import StorageAccountInternetEndpoints from ._models_py3 import StorageAccountKey from ._models_py3 import StorageAccountListKeysResult + from ._models_py3 import StorageAccountMicrosoftEndpoints from ._models_py3 import StorageAccountRegenerateKeyParameters from ._models_py3 import StorageAccountUpdateParameters from ._models_py3 import TagProperty @@ -142,15 +146,19 @@ from ._models import ProxyResource from ._models import Resource from ._models import Restriction + from ._models import RoutingPreference from ._models import ServiceSasParameters from ._models import ServiceSpecification from ._models import Sku from ._models import SKUCapability + from ._models import SkuInformation from ._models import StorageAccount from ._models import StorageAccountCheckNameAvailabilityParameters from ._models import StorageAccountCreateParameters + from ._models import StorageAccountInternetEndpoints from ._models import StorageAccountKey from ._models import StorageAccountListKeysResult + from ._models import StorageAccountMicrosoftEndpoints from ._models import StorageAccountRegenerateKeyParameters from ._models import StorageAccountUpdateParameters from ._models import TagProperty @@ -163,7 +171,7 @@ from ._paged_models import FileShareItemPaged from ._paged_models import ListContainerItemPaged from ._paged_models import OperationPaged -from ._paged_models import SkuPaged +from ._paged_models import SkuInformationPaged from ._paged_models import StorageAccountPaged from ._paged_models import UsagePaged from ._storage_management_client_enums import ( @@ -180,6 +188,7 @@ DirectoryServiceOptions, AccessTier, LargeFileSharesState, + RoutingChoice, GeoReplicationStatus, ProvisioningState, AccountStatus, @@ -260,15 +269,19 @@ 'ProxyResource', 'Resource', 'Restriction', + 'RoutingPreference', 'ServiceSasParameters', 'ServiceSpecification', 'Sku', 'SKUCapability', + 'SkuInformation', 'StorageAccount', 'StorageAccountCheckNameAvailabilityParameters', 'StorageAccountCreateParameters', + 'StorageAccountInternetEndpoints', 'StorageAccountKey', 'StorageAccountListKeysResult', + 'StorageAccountMicrosoftEndpoints', 'StorageAccountRegenerateKeyParameters', 'StorageAccountUpdateParameters', 'TagProperty', @@ -278,7 +291,7 @@ 'UsageName', 'VirtualNetworkRule', 'OperationPaged', - 'SkuPaged', + 'SkuInformationPaged', 'StorageAccountPaged', 'UsagePaged', 'BlobServicePropertiesPaged', @@ -297,6 +310,7 @@ 'DirectoryServiceOptions', 'AccessTier', 'LargeFileSharesState', + 'RoutingChoice', 'GeoReplicationStatus', 'ProvisioningState', 'AccountStatus', diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py index 3d3c94e162e8..d39903261237 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py @@ -364,7 +364,7 @@ class BlobServiceProperties(Resource): request’s version is not specified. Possible values include version 2008-10-27 and all more recent versions. :type default_service_version: str - :param delete_retention_policy: The blob service properties for soft + :param delete_retention_policy: The blob service properties for blob soft delete. :type delete_retention_policy: ~azure.mgmt.storage.v2019_06_01.models.DeleteRetentionPolicy @@ -373,12 +373,15 @@ class BlobServiceProperties(Resource): :type automatic_snapshot_policy_enabled: bool :param change_feed: The blob service properties for change feed events. :type change_feed: ~azure.mgmt.storage.v2019_06_01.models.ChangeFeed + :ivar sku: Sku name and tier. + :vartype sku: ~azure.mgmt.storage.v2019_06_01.models.Sku """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'sku': {'readonly': True}, } _attribute_map = { @@ -390,6 +393,7 @@ class BlobServiceProperties(Resource): 'delete_retention_policy': {'key': 'properties.deleteRetentionPolicy', 'type': 'DeleteRetentionPolicy'}, 'automatic_snapshot_policy_enabled': {'key': 'properties.automaticSnapshotPolicyEnabled', 'type': 'bool'}, 'change_feed': {'key': 'properties.changeFeed', 'type': 'ChangeFeed'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, } def __init__(self, **kwargs): @@ -399,6 +403,7 @@ def __init__(self, **kwargs): self.delete_retention_policy = kwargs.get('delete_retention_policy', None) self.automatic_snapshot_policy_enabled = kwargs.get('automatic_snapshot_policy_enabled', None) self.change_feed = kwargs.get('change_feed', None) + self.sku = None class ChangeFeed(Model): @@ -823,6 +828,12 @@ class Endpoints(Model): :vartype web: str :ivar dfs: Gets the dfs endpoint. :vartype dfs: str + :param microsoft_endpoints: Gets the microsoft routing storage endpoints. + :type microsoft_endpoints: + ~azure.mgmt.storage.v2019_06_01.models.StorageAccountMicrosoftEndpoints + :param internet_endpoints: Gets the internet routing storage endpoints + :type internet_endpoints: + ~azure.mgmt.storage.v2019_06_01.models.StorageAccountInternetEndpoints """ _validation = { @@ -841,6 +852,8 @@ class Endpoints(Model): 'file': {'key': 'file', 'type': 'str'}, 'web': {'key': 'web', 'type': 'str'}, 'dfs': {'key': 'dfs', 'type': 'str'}, + 'microsoft_endpoints': {'key': 'microsoftEndpoints', 'type': 'StorageAccountMicrosoftEndpoints'}, + 'internet_endpoints': {'key': 'internetEndpoints', 'type': 'StorageAccountInternetEndpoints'}, } def __init__(self, **kwargs): @@ -851,6 +864,8 @@ def __init__(self, **kwargs): self.file = None self.web = None self.dfs = None + self.microsoft_endpoints = kwargs.get('microsoft_endpoints', None) + self.internet_endpoints = kwargs.get('internet_endpoints', None) class ErrorResponse(Model): @@ -930,12 +945,19 @@ class FileServiceProperties(Resource): included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service. :type cors: ~azure.mgmt.storage.v2019_06_01.models.CorsRules + :param share_delete_retention_policy: The file service properties for + share soft delete. + :type share_delete_retention_policy: + ~azure.mgmt.storage.v2019_06_01.models.DeleteRetentionPolicy + :ivar sku: Sku name and tier. + :vartype sku: ~azure.mgmt.storage.v2019_06_01.models.Sku """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'sku': {'readonly': True}, } _attribute_map = { @@ -943,11 +965,15 @@ class FileServiceProperties(Resource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'cors': {'key': 'properties.cors', 'type': 'CorsRules'}, + 'share_delete_retention_policy': {'key': 'properties.shareDeleteRetentionPolicy', 'type': 'DeleteRetentionPolicy'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, } def __init__(self, **kwargs): super(FileServiceProperties, self).__init__(**kwargs) self.cors = kwargs.get('cors', None) + self.share_delete_retention_policy = kwargs.get('share_delete_retention_policy', None) + self.sku = None class FileShare(AzureEntityResource): @@ -2218,6 +2244,37 @@ def __init__(self, **kwargs): self.reason_code = kwargs.get('reason_code', None) +class RoutingPreference(Model): + """Routing preference defines the type of network, either microsoft or + internet routing to be used to deliver the user data, the default option is + microsoft routing. + + :param routing_choice: Routing Choice defines the kind of network routing + opted by the user. Possible values include: 'MicrosoftRouting', + 'InternetRouting' + :type routing_choice: str or + ~azure.mgmt.storage.v2019_06_01.models.RoutingChoice + :param publish_microsoft_endpoints: A boolean flag which indicates whether + microsoft routing storage endpoints are to be published + :type publish_microsoft_endpoints: bool + :param publish_internet_endpoints: A boolean flag which indicates whether + internet routing storage endpoints are to be published + :type publish_internet_endpoints: bool + """ + + _attribute_map = { + 'routing_choice': {'key': 'routingChoice', 'type': 'str'}, + 'publish_microsoft_endpoints': {'key': 'publishMicrosoftEndpoints', 'type': 'bool'}, + 'publish_internet_endpoints': {'key': 'publishInternetEndpoints', 'type': 'bool'}, + } + + def __init__(self, **kwargs): + super(RoutingPreference, self).__init__(**kwargs) + self.routing_choice = kwargs.get('routing_choice', None) + self.publish_microsoft_endpoints = kwargs.get('publish_microsoft_endpoints', None) + self.publish_internet_endpoints = kwargs.get('publish_internet_endpoints', None) + + class ServiceSasParameters(Model): """The parameters to list service SAS credentials of a specific resource. @@ -2346,20 +2403,77 @@ def __init__(self, **kwargs): class Sku(Model): """The SKU of the storage account. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Possible values include: 'Standard_LRS', + 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', + 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS' + :type name: str or ~azure.mgmt.storage.v2019_06_01.models.SkuName + :param tier: Possible values include: 'Standard', 'Premium' + :type tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier + """ + + _validation = { + 'name': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'tier': {'key': 'tier', 'type': 'SkuTier'}, + } + + def __init__(self, **kwargs): + super(Sku, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.tier = kwargs.get('tier', None) + + +class SKUCapability(Model): + """The capability information in the specified SKU, including file encryption, + network ACLs, change notification, etc. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar name: The name of capability, The capability information in the + specified SKU, including file encryption, network ACLs, change + notification, etc. + :vartype name: str + :ivar value: A string value to indicate states of given capability. + Possibly 'true' or 'false'. + :vartype value: str + """ + + _validation = { + 'name': {'readonly': True}, + 'value': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(SKUCapability, self).__init__(**kwargs) + self.name = None + self.value = None + + +class SkuInformation(Model): + """Storage SKU and its properties. + 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. - :param name: Required. Gets or sets the SKU name. Required for account - creation; optional for update. Note that in older versions, SKU name was - called accountType. Possible values include: 'Standard_LRS', + :param name: Required. Possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS' :type name: str or ~azure.mgmt.storage.v2019_06_01.models.SkuName - :ivar tier: Gets the SKU tier. This is based on the SKU name. Possible - values include: 'Standard', 'Premium' - :vartype tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier + :param tier: Possible values include: 'Standard', 'Premium' + :type tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier :ivar resource_type: The type of the resource, usually it is 'storageAccounts'. :vartype resource_type: str @@ -2383,7 +2497,6 @@ class Sku(Model): _validation = { 'name': {'required': True}, - 'tier': {'readonly': True}, 'resource_type': {'readonly': True}, 'kind': {'readonly': True}, 'locations': {'readonly': True}, @@ -2401,9 +2514,9 @@ class Sku(Model): } def __init__(self, **kwargs): - super(Sku, self).__init__(**kwargs) + super(SkuInformation, self).__init__(**kwargs) self.name = kwargs.get('name', None) - self.tier = None + self.tier = kwargs.get('tier', None) self.resource_type = None self.kind = None self.locations = None @@ -2411,38 +2524,6 @@ def __init__(self, **kwargs): self.restrictions = kwargs.get('restrictions', None) -class SKUCapability(Model): - """The capability information in the specified SKU, including file encryption, - network ACLs, change notification, etc. - - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar name: The name of capability, The capability information in the - specified SKU, including file encryption, network ACLs, change - notification, etc. - :vartype name: str - :ivar value: A string value to indicate states of given capability. - Possibly 'true' or 'false'. - :vartype value: str - """ - - _validation = { - 'name': {'readonly': True}, - 'value': {'readonly': True}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(SKUCapability, self).__init__(**kwargs) - self.name = None - self.value = None - - class TrackedResource(Resource): """The resource model definition for a ARM tracked top level resource. @@ -2595,6 +2676,10 @@ class StorageAccount(TrackedResource): associated with the specified storage account :vartype private_endpoint_connections: list[~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection] + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference """ _validation = { @@ -2651,6 +2736,7 @@ class StorageAccount(TrackedResource): 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, } def __init__(self, **kwargs): @@ -2678,6 +2764,7 @@ def __init__(self, **kwargs): self.failover_in_progress = None self.large_file_shares_state = kwargs.get('large_file_shares_state', None) self.private_endpoint_connections = None + self.routing_preference = kwargs.get('routing_preference', None) class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2770,6 +2857,10 @@ class StorageAccountCreateParameters(Model): include: 'Disabled', 'Enabled' :type large_file_shares_state: str or ~azure.mgmt.storage.v2019_06_01.models.LargeFileSharesState + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference """ _validation = { @@ -2792,6 +2883,7 @@ class StorageAccountCreateParameters(Model): 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, } def __init__(self, **kwargs): @@ -2809,6 +2901,46 @@ def __init__(self, **kwargs): self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.is_hns_enabled = kwargs.get('is_hns_enabled', None) self.large_file_shares_state = kwargs.get('large_file_shares_state', None) + self.routing_preference = kwargs.get('routing_preference', None) + + +class StorageAccountInternetEndpoints(Model): + """The URIs that are used to perform a retrieval of a public blob, file, web + or dfs object via a internet routing endpoint. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar blob: Gets the blob endpoint. + :vartype blob: str + :ivar file: Gets the file endpoint. + :vartype file: str + :ivar web: Gets the web endpoint. + :vartype web: str + :ivar dfs: Gets the dfs endpoint. + :vartype dfs: str + """ + + _validation = { + 'blob': {'readonly': True}, + 'file': {'readonly': True}, + 'web': {'readonly': True}, + 'dfs': {'readonly': True}, + } + + _attribute_map = { + 'blob': {'key': 'blob', 'type': 'str'}, + 'file': {'key': 'file', 'type': 'str'}, + 'web': {'key': 'web', 'type': 'str'}, + 'dfs': {'key': 'dfs', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(StorageAccountInternetEndpoints, self).__init__(**kwargs) + self.blob = None + self.file = None + self.web = None + self.dfs = None class StorageAccountKey(Model): @@ -2871,6 +3003,55 @@ def __init__(self, **kwargs): self.keys = None +class StorageAccountMicrosoftEndpoints(Model): + """The URIs that are used to perform a retrieval of a public blob, queue, + table, web or dfs object via a microsoft routing endpoint. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar blob: Gets the blob endpoint. + :vartype blob: str + :ivar queue: Gets the queue endpoint. + :vartype queue: str + :ivar table: Gets the table endpoint. + :vartype table: str + :ivar file: Gets the file endpoint. + :vartype file: str + :ivar web: Gets the web endpoint. + :vartype web: str + :ivar dfs: Gets the dfs endpoint. + :vartype dfs: str + """ + + _validation = { + 'blob': {'readonly': True}, + 'queue': {'readonly': True}, + 'table': {'readonly': True}, + 'file': {'readonly': True}, + 'web': {'readonly': True}, + 'dfs': {'readonly': True}, + } + + _attribute_map = { + 'blob': {'key': 'blob', 'type': 'str'}, + 'queue': {'key': 'queue', 'type': 'str'}, + 'table': {'key': 'table', 'type': 'str'}, + 'file': {'key': 'file', 'type': 'str'}, + 'web': {'key': 'web', 'type': 'str'}, + 'dfs': {'key': 'dfs', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(StorageAccountMicrosoftEndpoints, self).__init__(**kwargs) + self.blob = None + self.queue = None + self.table = None + self.file = None + self.web = None + self.dfs = None + + class StorageAccountRegenerateKeyParameters(Model): """The parameters used to regenerate the storage account key. @@ -2938,6 +3119,10 @@ class StorageAccountUpdateParameters(Model): include: 'Disabled', 'Enabled' :type large_file_shares_state: str or ~azure.mgmt.storage.v2019_06_01.models.LargeFileSharesState + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2955,6 +3140,7 @@ class StorageAccountUpdateParameters(Model): 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, 'kind': {'key': 'kind', 'type': 'str'}, } @@ -2970,6 +3156,7 @@ def __init__(self, **kwargs): self.enable_https_traffic_only = kwargs.get('enable_https_traffic_only', None) self.network_rule_set = kwargs.get('network_rule_set', None) self.large_file_shares_state = kwargs.get('large_file_shares_state', None) + self.routing_preference = kwargs.get('routing_preference', None) self.kind = kwargs.get('kind', None) diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py index 21554c7c07dd..ccc5fcc8c9e8 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py @@ -364,7 +364,7 @@ class BlobServiceProperties(Resource): request’s version is not specified. Possible values include version 2008-10-27 and all more recent versions. :type default_service_version: str - :param delete_retention_policy: The blob service properties for soft + :param delete_retention_policy: The blob service properties for blob soft delete. :type delete_retention_policy: ~azure.mgmt.storage.v2019_06_01.models.DeleteRetentionPolicy @@ -373,12 +373,15 @@ class BlobServiceProperties(Resource): :type automatic_snapshot_policy_enabled: bool :param change_feed: The blob service properties for change feed events. :type change_feed: ~azure.mgmt.storage.v2019_06_01.models.ChangeFeed + :ivar sku: Sku name and tier. + :vartype sku: ~azure.mgmt.storage.v2019_06_01.models.Sku """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'sku': {'readonly': True}, } _attribute_map = { @@ -390,6 +393,7 @@ class BlobServiceProperties(Resource): 'delete_retention_policy': {'key': 'properties.deleteRetentionPolicy', 'type': 'DeleteRetentionPolicy'}, 'automatic_snapshot_policy_enabled': {'key': 'properties.automaticSnapshotPolicyEnabled', 'type': 'bool'}, 'change_feed': {'key': 'properties.changeFeed', 'type': 'ChangeFeed'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, } def __init__(self, *, cors=None, default_service_version: str=None, delete_retention_policy=None, automatic_snapshot_policy_enabled: bool=None, change_feed=None, **kwargs) -> None: @@ -399,6 +403,7 @@ def __init__(self, *, cors=None, default_service_version: str=None, delete_reten self.delete_retention_policy = delete_retention_policy self.automatic_snapshot_policy_enabled = automatic_snapshot_policy_enabled self.change_feed = change_feed + self.sku = None class ChangeFeed(Model): @@ -823,6 +828,12 @@ class Endpoints(Model): :vartype web: str :ivar dfs: Gets the dfs endpoint. :vartype dfs: str + :param microsoft_endpoints: Gets the microsoft routing storage endpoints. + :type microsoft_endpoints: + ~azure.mgmt.storage.v2019_06_01.models.StorageAccountMicrosoftEndpoints + :param internet_endpoints: Gets the internet routing storage endpoints + :type internet_endpoints: + ~azure.mgmt.storage.v2019_06_01.models.StorageAccountInternetEndpoints """ _validation = { @@ -841,9 +852,11 @@ class Endpoints(Model): 'file': {'key': 'file', 'type': 'str'}, 'web': {'key': 'web', 'type': 'str'}, 'dfs': {'key': 'dfs', 'type': 'str'}, + 'microsoft_endpoints': {'key': 'microsoftEndpoints', 'type': 'StorageAccountMicrosoftEndpoints'}, + 'internet_endpoints': {'key': 'internetEndpoints', 'type': 'StorageAccountInternetEndpoints'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, microsoft_endpoints=None, internet_endpoints=None, **kwargs) -> None: super(Endpoints, self).__init__(**kwargs) self.blob = None self.queue = None @@ -851,6 +864,8 @@ def __init__(self, **kwargs) -> None: self.file = None self.web = None self.dfs = None + self.microsoft_endpoints = microsoft_endpoints + self.internet_endpoints = internet_endpoints class ErrorResponse(Model): @@ -930,12 +945,19 @@ class FileServiceProperties(Resource): included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service. :type cors: ~azure.mgmt.storage.v2019_06_01.models.CorsRules + :param share_delete_retention_policy: The file service properties for + share soft delete. + :type share_delete_retention_policy: + ~azure.mgmt.storage.v2019_06_01.models.DeleteRetentionPolicy + :ivar sku: Sku name and tier. + :vartype sku: ~azure.mgmt.storage.v2019_06_01.models.Sku """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'sku': {'readonly': True}, } _attribute_map = { @@ -943,11 +965,15 @@ class FileServiceProperties(Resource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'cors': {'key': 'properties.cors', 'type': 'CorsRules'}, + 'share_delete_retention_policy': {'key': 'properties.shareDeleteRetentionPolicy', 'type': 'DeleteRetentionPolicy'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, } - def __init__(self, *, cors=None, **kwargs) -> None: + def __init__(self, *, cors=None, share_delete_retention_policy=None, **kwargs) -> None: super(FileServiceProperties, self).__init__(**kwargs) self.cors = cors + self.share_delete_retention_policy = share_delete_retention_policy + self.sku = None class FileShare(AzureEntityResource): @@ -2218,6 +2244,37 @@ def __init__(self, *, reason_code=None, **kwargs) -> None: self.reason_code = reason_code +class RoutingPreference(Model): + """Routing preference defines the type of network, either microsoft or + internet routing to be used to deliver the user data, the default option is + microsoft routing. + + :param routing_choice: Routing Choice defines the kind of network routing + opted by the user. Possible values include: 'MicrosoftRouting', + 'InternetRouting' + :type routing_choice: str or + ~azure.mgmt.storage.v2019_06_01.models.RoutingChoice + :param publish_microsoft_endpoints: A boolean flag which indicates whether + microsoft routing storage endpoints are to be published + :type publish_microsoft_endpoints: bool + :param publish_internet_endpoints: A boolean flag which indicates whether + internet routing storage endpoints are to be published + :type publish_internet_endpoints: bool + """ + + _attribute_map = { + 'routing_choice': {'key': 'routingChoice', 'type': 'str'}, + 'publish_microsoft_endpoints': {'key': 'publishMicrosoftEndpoints', 'type': 'bool'}, + 'publish_internet_endpoints': {'key': 'publishInternetEndpoints', 'type': 'bool'}, + } + + def __init__(self, *, routing_choice=None, publish_microsoft_endpoints: bool=None, publish_internet_endpoints: bool=None, **kwargs) -> None: + super(RoutingPreference, self).__init__(**kwargs) + self.routing_choice = routing_choice + self.publish_microsoft_endpoints = publish_microsoft_endpoints + self.publish_internet_endpoints = publish_internet_endpoints + + class ServiceSasParameters(Model): """The parameters to list service SAS credentials of a specific resource. @@ -2346,20 +2403,77 @@ def __init__(self, *, metric_specifications=None, **kwargs) -> None: class Sku(Model): """The SKU of the storage account. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Possible values include: 'Standard_LRS', + 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', + 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS' + :type name: str or ~azure.mgmt.storage.v2019_06_01.models.SkuName + :param tier: Possible values include: 'Standard', 'Premium' + :type tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier + """ + + _validation = { + 'name': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'tier': {'key': 'tier', 'type': 'SkuTier'}, + } + + def __init__(self, *, name, tier=None, **kwargs) -> None: + super(Sku, self).__init__(**kwargs) + self.name = name + self.tier = tier + + +class SKUCapability(Model): + """The capability information in the specified SKU, including file encryption, + network ACLs, change notification, etc. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar name: The name of capability, The capability information in the + specified SKU, including file encryption, network ACLs, change + notification, etc. + :vartype name: str + :ivar value: A string value to indicate states of given capability. + Possibly 'true' or 'false'. + :vartype value: str + """ + + _validation = { + 'name': {'readonly': True}, + 'value': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(SKUCapability, self).__init__(**kwargs) + self.name = None + self.value = None + + +class SkuInformation(Model): + """Storage SKU and its properties. + 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. - :param name: Required. Gets or sets the SKU name. Required for account - creation; optional for update. Note that in older versions, SKU name was - called accountType. Possible values include: 'Standard_LRS', + :param name: Required. Possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS' :type name: str or ~azure.mgmt.storage.v2019_06_01.models.SkuName - :ivar tier: Gets the SKU tier. This is based on the SKU name. Possible - values include: 'Standard', 'Premium' - :vartype tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier + :param tier: Possible values include: 'Standard', 'Premium' + :type tier: str or ~azure.mgmt.storage.v2019_06_01.models.SkuTier :ivar resource_type: The type of the resource, usually it is 'storageAccounts'. :vartype resource_type: str @@ -2383,7 +2497,6 @@ class Sku(Model): _validation = { 'name': {'required': True}, - 'tier': {'readonly': True}, 'resource_type': {'readonly': True}, 'kind': {'readonly': True}, 'locations': {'readonly': True}, @@ -2400,10 +2513,10 @@ class Sku(Model): 'restrictions': {'key': 'restrictions', 'type': '[Restriction]'}, } - def __init__(self, *, name, restrictions=None, **kwargs) -> None: - super(Sku, self).__init__(**kwargs) + def __init__(self, *, name, tier=None, restrictions=None, **kwargs) -> None: + super(SkuInformation, self).__init__(**kwargs) self.name = name - self.tier = None + self.tier = tier self.resource_type = None self.kind = None self.locations = None @@ -2411,38 +2524,6 @@ def __init__(self, *, name, restrictions=None, **kwargs) -> None: self.restrictions = restrictions -class SKUCapability(Model): - """The capability information in the specified SKU, including file encryption, - network ACLs, change notification, etc. - - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar name: The name of capability, The capability information in the - specified SKU, including file encryption, network ACLs, change - notification, etc. - :vartype name: str - :ivar value: A string value to indicate states of given capability. - Possibly 'true' or 'false'. - :vartype value: str - """ - - _validation = { - 'name': {'readonly': True}, - 'value': {'readonly': True}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - } - - def __init__(self, **kwargs) -> None: - super(SKUCapability, self).__init__(**kwargs) - self.name = None - self.value = None - - class TrackedResource(Resource): """The resource model definition for a ARM tracked top level resource. @@ -2595,6 +2676,10 @@ class StorageAccount(TrackedResource): associated with the specified storage account :vartype private_endpoint_connections: list[~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection] + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference """ _validation = { @@ -2651,9 +2736,10 @@ class StorageAccount(TrackedResource): 'failover_in_progress': {'key': 'properties.failoverInProgress', 'type': 'bool'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, } - def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, identity=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, routing_preference=None, **kwargs) -> None: super(StorageAccount, self).__init__(tags=tags, location=location, **kwargs) self.sku = None self.kind = None @@ -2678,6 +2764,7 @@ def __init__(self, *, location: str, tags=None, identity=None, azure_files_ident self.failover_in_progress = None self.large_file_shares_state = large_file_shares_state self.private_endpoint_connections = None + self.routing_preference = routing_preference class StorageAccountCheckNameAvailabilityParameters(Model): @@ -2770,6 +2857,10 @@ class StorageAccountCreateParameters(Model): include: 'Disabled', 'Enabled' :type large_file_shares_state: str or ~azure.mgmt.storage.v2019_06_01.models.LargeFileSharesState + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference """ _validation = { @@ -2792,9 +2883,10 @@ class StorageAccountCreateParameters(Model): 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'is_hns_enabled': {'key': 'properties.isHnsEnabled', 'type': 'bool'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, } - def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, **kwargs) -> None: + def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, is_hns_enabled: bool=None, large_file_shares_state=None, routing_preference=None, **kwargs) -> None: super(StorageAccountCreateParameters, self).__init__(**kwargs) self.sku = sku self.kind = kind @@ -2809,6 +2901,46 @@ def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom self.enable_https_traffic_only = enable_https_traffic_only self.is_hns_enabled = is_hns_enabled self.large_file_shares_state = large_file_shares_state + self.routing_preference = routing_preference + + +class StorageAccountInternetEndpoints(Model): + """The URIs that are used to perform a retrieval of a public blob, file, web + or dfs object via a internet routing endpoint. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar blob: Gets the blob endpoint. + :vartype blob: str + :ivar file: Gets the file endpoint. + :vartype file: str + :ivar web: Gets the web endpoint. + :vartype web: str + :ivar dfs: Gets the dfs endpoint. + :vartype dfs: str + """ + + _validation = { + 'blob': {'readonly': True}, + 'file': {'readonly': True}, + 'web': {'readonly': True}, + 'dfs': {'readonly': True}, + } + + _attribute_map = { + 'blob': {'key': 'blob', 'type': 'str'}, + 'file': {'key': 'file', 'type': 'str'}, + 'web': {'key': 'web', 'type': 'str'}, + 'dfs': {'key': 'dfs', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(StorageAccountInternetEndpoints, self).__init__(**kwargs) + self.blob = None + self.file = None + self.web = None + self.dfs = None class StorageAccountKey(Model): @@ -2871,6 +3003,55 @@ def __init__(self, **kwargs) -> None: self.keys = None +class StorageAccountMicrosoftEndpoints(Model): + """The URIs that are used to perform a retrieval of a public blob, queue, + table, web or dfs object via a microsoft routing endpoint. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar blob: Gets the blob endpoint. + :vartype blob: str + :ivar queue: Gets the queue endpoint. + :vartype queue: str + :ivar table: Gets the table endpoint. + :vartype table: str + :ivar file: Gets the file endpoint. + :vartype file: str + :ivar web: Gets the web endpoint. + :vartype web: str + :ivar dfs: Gets the dfs endpoint. + :vartype dfs: str + """ + + _validation = { + 'blob': {'readonly': True}, + 'queue': {'readonly': True}, + 'table': {'readonly': True}, + 'file': {'readonly': True}, + 'web': {'readonly': True}, + 'dfs': {'readonly': True}, + } + + _attribute_map = { + 'blob': {'key': 'blob', 'type': 'str'}, + 'queue': {'key': 'queue', 'type': 'str'}, + 'table': {'key': 'table', 'type': 'str'}, + 'file': {'key': 'file', 'type': 'str'}, + 'web': {'key': 'web', 'type': 'str'}, + 'dfs': {'key': 'dfs', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(StorageAccountMicrosoftEndpoints, self).__init__(**kwargs) + self.blob = None + self.queue = None + self.table = None + self.file = None + self.web = None + self.dfs = None + + class StorageAccountRegenerateKeyParameters(Model): """The parameters used to regenerate the storage account key. @@ -2938,6 +3119,10 @@ class StorageAccountUpdateParameters(Model): include: 'Disabled', 'Enabled' :type large_file_shares_state: str or ~azure.mgmt.storage.v2019_06_01.models.LargeFileSharesState + :param routing_preference: Maintains information about the network routing + choice opted by the user for data transfer + :type routing_preference: + ~azure.mgmt.storage.v2019_06_01.models.RoutingPreference :param kind: Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' @@ -2955,10 +3140,11 @@ class StorageAccountUpdateParameters(Model): 'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'}, 'large_file_shares_state': {'key': 'properties.largeFileSharesState', 'type': 'str'}, + 'routing_preference': {'key': 'properties.routingPreference', 'type': 'RoutingPreference'}, 'kind': {'key': 'kind', 'type': 'str'}, } - def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, large_file_shares_state=None, kind=None, **kwargs) -> None: + def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, azure_files_identity_based_authentication=None, enable_https_traffic_only: bool=None, network_rule_set=None, large_file_shares_state=None, routing_preference=None, kind=None, **kwargs) -> None: super(StorageAccountUpdateParameters, self).__init__(**kwargs) self.sku = sku self.tags = tags @@ -2970,6 +3156,7 @@ def __init__(self, *, sku=None, tags=None, identity=None, custom_domain=None, en self.enable_https_traffic_only = enable_https_traffic_only self.network_rule_set = network_rule_set self.large_file_shares_state = large_file_shares_state + self.routing_preference = routing_preference self.kind = kind diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_paged_models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_paged_models.py index 37ad24f0a1ae..c4ace1805ecc 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_paged_models.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_paged_models.py @@ -25,19 +25,19 @@ class OperationPaged(Paged): def __init__(self, *args, **kwargs): super(OperationPaged, self).__init__(*args, **kwargs) -class SkuPaged(Paged): +class SkuInformationPaged(Paged): """ - A paging container for iterating over a list of :class:`Sku ` object + A paging container for iterating over a list of :class:`SkuInformation ` object """ _attribute_map = { 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[Sku]'} + 'current_page': {'key': 'value', 'type': '[SkuInformation]'} } def __init__(self, *args, **kwargs): - super(SkuPaged, self).__init__(*args, **kwargs) + super(SkuInformationPaged, self).__init__(*args, **kwargs) class StorageAccountPaged(Paged): """ A paging container for iterating over a list of :class:`StorageAccount ` object diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py index ed0f3e793a9a..f6bb01c8fc0d 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py @@ -104,6 +104,12 @@ class LargeFileSharesState(str, Enum): enabled = "Enabled" +class RoutingChoice(str, Enum): + + microsoft_routing = "MicrosoftRouting" + internet_routing = "InternetRouting" + + class GeoReplicationStatus(str, Enum): live = "Live" diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py index be4567b37174..693f633a0fa1 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py @@ -106,7 +106,7 @@ def list( list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices'} def set_service_properties( - self, resource_group_name, account_name, cors=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, account_name, cors=None, share_delete_retention_policy=None, custom_headers=None, raw=False, **operation_config): """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. . @@ -122,6 +122,10 @@ def set_service_properties( elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service. :type cors: ~azure.mgmt.storage.v2019_06_01.models.CorsRules + :param share_delete_retention_policy: The file service properties for + share soft delete. + :type share_delete_retention_policy: + ~azure.mgmt.storage.v2019_06_01.models.DeleteRetentionPolicy :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -132,7 +136,7 @@ def set_service_properties( or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ - parameters = models.FileServiceProperties(cors=cors) + parameters = models.FileServiceProperties(cors=cors, share_delete_retention_policy=share_delete_retention_policy) # Construct URL url = self.set_service_properties.metadata['url'] diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py index 24b00d662228..abe72334abca 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py @@ -49,9 +49,9 @@ def list( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: An iterator like instance of Sku + :return: An iterator like instance of SkuInformation :rtype: - ~azure.mgmt.storage.v2019_06_01.models.SkuPaged[~azure.mgmt.storage.v2019_06_01.models.Sku] + ~azure.mgmt.storage.v2019_06_01.models.SkuInformationPaged[~azure.mgmt.storage.v2019_06_01.models.SkuInformation] :raises: :class:`CloudError` """ def prepare_request(next_link=None): @@ -101,7 +101,7 @@ def internal_paging(next_link=None): header_dict = None if raw: header_dict = {} - deserialized = models.SkuPaged(internal_paging, self._deserialize.dependencies, header_dict) + deserialized = models.SkuInformationPaged(internal_paging, self._deserialize.dependencies, header_dict) return deserialized list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Storage/skus'} From 64fda3fe4eda440c0d850e68d99726e392804193 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Wed, 4 Dec 2019 15:53:15 +0800 Subject: [PATCH 8/8] history and version --- sdk/storage/azure-mgmt-storage/HISTORY.rst | 29 +++++++++++++++++++ .../azure/mgmt/storage/version.py | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sdk/storage/azure-mgmt-storage/HISTORY.rst b/sdk/storage/azure-mgmt-storage/HISTORY.rst index 5d09ef0f0e9c..a71f116303e5 100644 --- a/sdk/storage/azure-mgmt-storage/HISTORY.rst +++ b/sdk/storage/azure-mgmt-storage/HISTORY.rst @@ -3,6 +3,25 @@ Release History =============== +7.0.0 (2019-12-04) +++++++++++++++++++ + +**Features** + +- Model StorageAccountCreateParameters has a new parameter routing_preference +- Model BlobServiceProperties has a new parameter sku +- Model FileServiceProperties has a new parameter share_delete_retention_policy +- Model FileServiceProperties has a new parameter sku +- Model StorageAccount has a new parameter routing_preference +- Model StorageAccountUpdateParameters has a new parameter routing_preference +- Model Endpoints has a new parameter internet_endpoints +- Model Endpoints has a new parameter microsoft_endpoints + +**Breaking changes** + +- Operation FileServicesOperations.set_service_properties has a new signature +- Model Sku has a new signature + 6.0.0 (2019-10-25) ++++++++++++++++++ @@ -37,6 +56,16 @@ Release History - Model StorageAccountUpdateParameters has a new parameter large_file_shares_state - Model StorageAccount has a new parameter large_file_shares_state +4.1.0 (2019-09-27) +++++++++++++++++++ + +**Features** + +- Model BlobServiceProperties has a new parameter change_feed +- Added operation BlobServicesOperations.list +- Added operation group FileServicesOperations +- Added operation group FileSharesOperations + 4.0.0 (2019-06-12) ++++++++++++++++++ diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/version.py index d15d41e4399e..99fc271627d8 100644 --- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/version.py +++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/version.py @@ -5,4 +5,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "6.0.0" +VERSION = "7.0.0"