From cdbca596f6ac5f841551300c6db3a3c4b5e03452 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Tue, 5 Nov 2019 20:01:38 +0000 Subject: [PATCH 1/2] Generated from 4d9474e12075391cb75073fc6ae94ddd8eff4cdb Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs into getservicesku --- .../storage/v2019_06_01/models/__init__.py | 7 +- .../storage/v2019_06_01/models/_models.py | 116 +++++++++++------ .../storage/v2019_06_01/models/_models_py3.py | 118 +++++++++++------- .../v2019_06_01/models/_paged_models.py | 8 +- .../operations/_skus_operations.py | 6 +- 5 files changed, 163 insertions(+), 92 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 4d14128dbfb2..3fcea2f78751 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 @@ -72,6 +72,7 @@ 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 @@ -148,6 +149,7 @@ 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 @@ -165,7 +167,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 ( @@ -268,6 +270,7 @@ 'ServiceSpecification', 'Sku', 'SKUCapability', + 'SkuInformation', 'StorageAccount', 'StorageAccountCheckNameAvailabilityParameters', 'StorageAccountCreateParameters', @@ -282,7 +285,7 @@ 'UsageName', 'VirtualNetworkRule', 'OperationPaged', - 'SkuPaged', + 'SkuInformationPaged', 'StorageAccountPaged', 'UsagePaged', 'BlobServicePropertiesPaged', 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 42ee95225b61..a0df629925a2 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 @@ -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): @@ -984,12 +989,15 @@ class FileServiceProperties(Resource): 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 = { @@ -998,12 +1006,14 @@ class FileServiceProperties(Resource): '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): @@ -2431,20 +2441,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 @@ -2468,7 +2535,6 @@ class Sku(Model): _validation = { 'name': {'required': True}, - 'tier': {'readonly': True}, 'resource_type': {'readonly': True}, 'kind': {'readonly': True}, 'locations': {'readonly': True}, @@ -2486,9 +2552,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 @@ -2496,38 +2562,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. 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 f0534e1cf8c8..548b12eeea2f 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 @@ -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): @@ -984,12 +989,15 @@ class FileServiceProperties(Resource): 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 = { @@ -998,12 +1006,14 @@ class FileServiceProperties(Resource): '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, 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): @@ -2431,20 +2441,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 @@ -2468,7 +2535,6 @@ class Sku(Model): _validation = { 'name': {'required': True}, - 'tier': {'readonly': True}, 'resource_type': {'readonly': True}, 'kind': {'readonly': True}, 'locations': {'readonly': True}, @@ -2485,10 +2551,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 @@ -2496,38 +2562,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. 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/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 a41152352d0e9594ef4875c50ed0371a97f63a24 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 6 Nov 2019 23:34:15 +0000 Subject: [PATCH 2/2] Generated from 4d9474e12075391cb75073fc6ae94ddd8eff4cdb Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs into getservicesku --- .../storage/v2019_06_01/models/__init__.py | 6 + .../storage/v2019_06_01/models/_models.py | 152 +++++++++++------ .../storage/v2019_06_01/models/_models_py3.py | 154 ++++++++++++------ 3 files changed, 207 insertions(+), 105 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 3fcea2f78751..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 @@ -76,8 +76,10 @@ 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 @@ -153,8 +155,10 @@ 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 @@ -274,8 +278,10 @@ 'StorageAccount', 'StorageAccountCheckNameAvailabilityParameters', 'StorageAccountCreateParameters', + 'StorageAccountInternetEndpoints', 'StorageAccountKey', 'StorageAccountListKeysResult', + 'StorageAccountMicrosoftEndpoints', 'StorageAccountRegenerateKeyParameters', 'StorageAccountUpdateParameters', 'TagProperty', 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 a0df629925a2..3d508e591ed3 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 @@ -828,26 +828,12 @@ class Endpoints(Model): :vartype web: str :ivar dfs: Gets the dfs endpoint. :vartype dfs: str - :ivar blob1: Gets the blob endpoint. - :vartype blob1: str - :ivar queue1: Gets the queue endpoint. - :vartype queue1: str - :ivar table1: Gets the table endpoint. - :vartype table1: str - :ivar file1: Gets the file endpoint. - :vartype file1: str - :ivar web1: Gets the web endpoint. - :vartype web1: str - :ivar dfs1: Gets the dfs endpoint. - :vartype dfs1: str - :ivar blob2: Gets the blob endpoint. - :vartype blob2: str - :ivar file2: Gets the file endpoint. - :vartype file2: str - :ivar web2: Gets the web endpoint. - :vartype web2: str - :ivar dfs2: Gets the dfs endpoint. - :vartype dfs2: 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 = { @@ -857,16 +843,6 @@ class Endpoints(Model): 'file': {'readonly': True}, 'web': {'readonly': True}, 'dfs': {'readonly': True}, - 'blob1': {'readonly': True}, - 'queue1': {'readonly': True}, - 'table1': {'readonly': True}, - 'file1': {'readonly': True}, - 'web1': {'readonly': True}, - 'dfs1': {'readonly': True}, - 'blob2': {'readonly': True}, - 'file2': {'readonly': True}, - 'web2': {'readonly': True}, - 'dfs2': {'readonly': True}, } _attribute_map = { @@ -876,16 +852,8 @@ class Endpoints(Model): 'file': {'key': 'file', 'type': 'str'}, 'web': {'key': 'web', 'type': 'str'}, 'dfs': {'key': 'dfs', 'type': 'str'}, - 'blob1': {'key': 'microsoftEndpoints.blob', 'type': 'str'}, - 'queue1': {'key': 'microsoftEndpoints.queue', 'type': 'str'}, - 'table1': {'key': 'microsoftEndpoints.table', 'type': 'str'}, - 'file1': {'key': 'microsoftEndpoints.file', 'type': 'str'}, - 'web1': {'key': 'microsoftEndpoints.web', 'type': 'str'}, - 'dfs1': {'key': 'microsoftEndpoints.dfs', 'type': 'str'}, - 'blob2': {'key': 'internetEndpoints.blob', 'type': 'str'}, - 'file2': {'key': 'internetEndpoints.file', 'type': 'str'}, - 'web2': {'key': 'internetEndpoints.web', 'type': 'str'}, - 'dfs2': {'key': 'internetEndpoints.dfs', 'type': 'str'}, + 'microsoft_endpoints': {'key': 'microsoftEndpoints', 'type': 'StorageAccountMicrosoftEndpoints'}, + 'internet_endpoints': {'key': 'internetEndpoints', 'type': 'StorageAccountInternetEndpoints'}, } def __init__(self, **kwargs): @@ -896,16 +864,8 @@ def __init__(self, **kwargs): self.file = None self.web = None self.dfs = None - self.blob1 = None - self.queue1 = None - self.table1 = None - self.file1 = None - self.web1 = None - self.dfs1 = None - self.blob2 = None - self.file2 = None - self.web2 = None - self.dfs2 = None + self.microsoft_endpoints = kwargs.get('microsoft_endpoints', None) + self.internet_endpoints = kwargs.get('internet_endpoints', None) class ErrorResponse(Model): @@ -2288,8 +2248,8 @@ class RoutingPreference(Model): microsoft routing. :param routing_choice: Routing Choice defines the kind of network routing - opted by the user. The default option is microsoft routing. Possible - values include: 'MicrosoftRouting', 'InternetRouting' + 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 @@ -2942,6 +2902,45 @@ def __init__(self, **kwargs): 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): """An access key for the storage account. @@ -3002,6 +3001,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. 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 548b12eeea2f..d9969d55c622 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 @@ -828,26 +828,12 @@ class Endpoints(Model): :vartype web: str :ivar dfs: Gets the dfs endpoint. :vartype dfs: str - :ivar blob1: Gets the blob endpoint. - :vartype blob1: str - :ivar queue1: Gets the queue endpoint. - :vartype queue1: str - :ivar table1: Gets the table endpoint. - :vartype table1: str - :ivar file1: Gets the file endpoint. - :vartype file1: str - :ivar web1: Gets the web endpoint. - :vartype web1: str - :ivar dfs1: Gets the dfs endpoint. - :vartype dfs1: str - :ivar blob2: Gets the blob endpoint. - :vartype blob2: str - :ivar file2: Gets the file endpoint. - :vartype file2: str - :ivar web2: Gets the web endpoint. - :vartype web2: str - :ivar dfs2: Gets the dfs endpoint. - :vartype dfs2: 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 = { @@ -857,16 +843,6 @@ class Endpoints(Model): 'file': {'readonly': True}, 'web': {'readonly': True}, 'dfs': {'readonly': True}, - 'blob1': {'readonly': True}, - 'queue1': {'readonly': True}, - 'table1': {'readonly': True}, - 'file1': {'readonly': True}, - 'web1': {'readonly': True}, - 'dfs1': {'readonly': True}, - 'blob2': {'readonly': True}, - 'file2': {'readonly': True}, - 'web2': {'readonly': True}, - 'dfs2': {'readonly': True}, } _attribute_map = { @@ -876,19 +852,11 @@ class Endpoints(Model): 'file': {'key': 'file', 'type': 'str'}, 'web': {'key': 'web', 'type': 'str'}, 'dfs': {'key': 'dfs', 'type': 'str'}, - 'blob1': {'key': 'microsoftEndpoints.blob', 'type': 'str'}, - 'queue1': {'key': 'microsoftEndpoints.queue', 'type': 'str'}, - 'table1': {'key': 'microsoftEndpoints.table', 'type': 'str'}, - 'file1': {'key': 'microsoftEndpoints.file', 'type': 'str'}, - 'web1': {'key': 'microsoftEndpoints.web', 'type': 'str'}, - 'dfs1': {'key': 'microsoftEndpoints.dfs', 'type': 'str'}, - 'blob2': {'key': 'internetEndpoints.blob', 'type': 'str'}, - 'file2': {'key': 'internetEndpoints.file', 'type': 'str'}, - 'web2': {'key': 'internetEndpoints.web', 'type': 'str'}, - 'dfs2': {'key': 'internetEndpoints.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 @@ -896,16 +864,8 @@ def __init__(self, **kwargs) -> None: self.file = None self.web = None self.dfs = None - self.blob1 = None - self.queue1 = None - self.table1 = None - self.file1 = None - self.web1 = None - self.dfs1 = None - self.blob2 = None - self.file2 = None - self.web2 = None - self.dfs2 = None + self.microsoft_endpoints = microsoft_endpoints + self.internet_endpoints = internet_endpoints class ErrorResponse(Model): @@ -2288,8 +2248,8 @@ class RoutingPreference(Model): microsoft routing. :param routing_choice: Routing Choice defines the kind of network routing - opted by the user. The default option is microsoft routing. Possible - values include: 'MicrosoftRouting', 'InternetRouting' + 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 @@ -2942,6 +2902,45 @@ def __init__(self, *, sku, kind, location: str, tags=None, identity=None, custom 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): """An access key for the storage account. @@ -3002,6 +3001,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.