[StorageMgmt] sku list operation + Rename networkAcls to NetworkRuleSet

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/build.json

@@ -1 +1 @@
-{"autorest": "1.2.2", "date": "2017-07-19T21:54:46Z", "version": ""}
+{"autorest": "1.2.2", "date": "2017-09-11T05:17:50Z", "version": ""}

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/__init__.py

@@ -15,16 +15,18 @@
 from .service_specification import ServiceSpecification
 from .operation import Operation
 from .storage_account_check_name_availability_parameters import StorageAccountCheckNameAvailabilityParameters
-from .check_name_availability_result import CheckNameAvailabilityResult
+from .sku_capability import SKUCapability
+from .restriction import Restriction
 from .sku import Sku
+from .check_name_availability_result import CheckNameAvailabilityResult
 from .custom_domain import CustomDomain
 from .encryption_service import EncryptionService
 from .encryption_services import EncryptionServices
 from .key_vault_properties import KeyVaultProperties
 from .encryption import Encryption
 from .virtual_network_rule import VirtualNetworkRule
 from .ip_rule import IPRule
-from .storage_network_acls import StorageNetworkAcls
+from .network_rule_set import NetworkRuleSet
 from .identity import Identity
 from .storage_account_create_parameters import StorageAccountCreateParameters
 from .endpoints import Endpoints
@@ -41,19 +43,21 @@
 from .service_sas_parameters import ServiceSasParameters
 from .list_service_sas_response import ListServiceSasResponse
 from .operation_paged import OperationPaged
+from .sku_paged import SkuPaged
 from .storage_account_paged import StorageAccountPaged
 from .usage_paged import UsagePaged
 from .storage_management_client_enums import (
-    Reason,
+    ReasonCode,
     SkuName,
     SkuTier,
+    Kind,
+    Reason,
     KeySource,
     Action,
     State,
     Bypass,
     DefaultAction,
     AccessTier,
-    Kind,
     ProvisioningState,
     AccountStatus,
     KeyPermission,
@@ -72,16 +76,18 @@
     'ServiceSpecification',
     'Operation',
     'StorageAccountCheckNameAvailabilityParameters',
-    'CheckNameAvailabilityResult',
+    'SKUCapability',
+    'Restriction',
     'Sku',
+    'CheckNameAvailabilityResult',
     'CustomDomain',
     'EncryptionService',
     'EncryptionServices',
     'KeyVaultProperties',
     'Encryption',
     'VirtualNetworkRule',
     'IPRule',
-    'StorageNetworkAcls',
+    'NetworkRuleSet',
     'Identity',
     'StorageAccountCreateParameters',
     'Endpoints',
@@ -98,18 +104,20 @@
     'ServiceSasParameters',
     'ListServiceSasResponse',
     'OperationPaged',
+    'SkuPaged',
     'StorageAccountPaged',
     'UsagePaged',
-    'Reason',
+    'ReasonCode',
     'SkuName',
     'SkuTier',
+    'Kind',
+    'Reason',
     'KeySource',
     'Action',
     'State',
     'Bypass',
     'DefaultAction',
     'AccessTier',
-    'Kind',
     'ProvisioningState',
     'AccountStatus',
     'KeyPermission',

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/dimension.py

@@ -13,7 +13,7 @@
 
 
 class Dimension(Model):
-    """Dimensions.
+    """Dimension of blobs, possiblly be blob type or access tier.
 
     :param name: Display name of dimension.
     :type name: str

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/metric_specification.py

@@ -23,7 +23,8 @@ class MetricSpecification(Model):
     :type display_description: str
     :param unit: Unit could be Bytes or Count.
     :type unit: str
-    :param dimensions: Dimensions.
+    :param dimensions: Dimensions of blobs, including blob type and access
+     tier.
     :type dimensions: list of :class:`Dimension
      <azure.mgmt.storage.v2017_06_01.models.Dimension>`
     :param aggregation_type: Aggregation type could be Average.

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/storage_network_acls.py → azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/network_rule_set.py

@@ -12,8 +12,8 @@
 from msrest.serialization import Model
 
 
-class StorageNetworkAcls(Model):
-    """Network ACL.
+class NetworkRuleSet(Model):
+    """Network rule set.
 
     :param bypass: Specifies whether traffic is bypassed for
      Logging/Metrics/AzureServices. Possible values are any combination of
@@ -22,7 +22,7 @@ class StorageNetworkAcls(Model):
      'Logging', 'Metrics', 'AzureServices'. Default value: "AzureServices" .
     :type bypass: str or :class:`Bypass
      <azure.mgmt.storage.v2017_06_01.models.Bypass>`
-    :param virtual_network_rules: Sets the virtual network ACL rules
+    :param virtual_network_rules: Sets the virtual network rules
     :type virtual_network_rules: list of :class:`VirtualNetworkRule
      <azure.mgmt.storage.v2017_06_01.models.VirtualNetworkRule>`
     :param ip_rules: Sets the IP ACL rules

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction.py

@@ -0,0 +1,50 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class Restriction(Model):
+    """The restriction because of which SKU cannot be used.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar type: The type of restrictions. As of now only possible value for
+     this is location.
+    :vartype type: str
+    :ivar values: The value of restrictions. If the restriction type is set to
+     location. This would be different locations where the SKU is restricted.
+    :vartype values: list of str
+    :param reason_code: The reason for the restriction. As of now this can be
+     “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU
+     has requiredQuotas parameter as the subscription does not belong to that
+     quota. The “NotAvailableForSubscription” is related to capacity at DC.
+     Possible values include: 'QuotaId', 'NotAvailableForSubscription'
+    :type reason_code: str or :class:`ReasonCode
+     <azure.mgmt.storage.v2017_06_01.models.ReasonCode>`
+    """
+
+    _validation = {
+        'type': {'readonly': True},
+        'values': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'values': {'key': 'values', 'type': '[str]'},
+        'reason_code': {'key': 'reasonCode', 'type': 'str'},
+    }
+
+    def __init__(self, reason_code=None):
+        self.type = None
+        self.values = None
+        self.reason_code = reason_code

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/sku.py

@@ -28,18 +28,51 @@ class Sku(Model):
      values include: 'Standard', 'Premium'
     :vartype tier: str or :class:`SkuTier
      <azure.mgmt.storage.v2017_06_01.models.SkuTier>`
+    :ivar resource_type: The type of the resource, usually it is
+     'storageAccounts'.
+    :vartype resource_type: str
+    :ivar kind: Indicates the type of storage account. Possible values
+     include: 'Storage', 'BlobStorage'
+    :vartype kind: str or :class:`Kind
+     <azure.mgmt.storage.v2017_06_01.models.Kind>`
+    :ivar locations: The set of locations that the SKU is available. This will
+     be supported and registered Azure Geo Regions (e.g. West US, East US,
+     Southeast Asia, etc.).
+    :vartype locations: list of str
+    :ivar capabilities: The capability information in the specified sku,
+     including file encryption, network acls, change notification, etc.
+    :vartype capabilities: list of :class:`SKUCapability
+     <azure.mgmt.storage.v2017_06_01.models.SKUCapability>`
+    :param restrictions: The restrictions because of which SKU cannot be used.
+     This is empty if there are no restrictions.
+    :type restrictions: list of :class:`Restriction
+     <azure.mgmt.storage.v2017_06_01.models.Restriction>`
     """
 
     _validation = {
         'name': {'required': True},
         'tier': {'readonly': True},
+        'resource_type': {'readonly': True},
+        'kind': {'readonly': True},
+        'locations': {'readonly': True},
+        'capabilities': {'readonly': True},
     }
 
     _attribute_map = {
         'name': {'key': 'name', 'type': 'SkuName'},
         'tier': {'key': 'tier', 'type': 'SkuTier'},
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'kind': {'key': 'kind', 'type': 'Kind'},
+        'locations': {'key': 'locations', 'type': '[str]'},
+        'capabilities': {'key': 'capabilities', 'type': '[SKUCapability]'},
+        'restrictions': {'key': 'restrictions', 'type': '[Restriction]'},
     }
 
-    def __init__(self, name):
+    def __init__(self, name, restrictions=None):
         self.name = name
         self.tier = None
+        self.resource_type = None
+        self.kind = None
+        self.locations = None
+        self.capabilities = None
+        self.restrictions = restrictions

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/sku_capability.py

@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class 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):
+        self.name = None
+        self.value = None

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/sku_paged.py

@@ -0,0 +1,27 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.paging import Paged
+
+
+class SkuPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Sku <azure.mgmt.storage.v2017_06_01.models.Sku>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Sku]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(SkuPaged, self).__init__(*args, **kwargs)

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/storage_account.py

@@ -96,9 +96,9 @@ class StorageAccount(Resource):
     :param enable_https_traffic_only: Allows https traffic only to storage
      service if sets to true. Default value: False .
     :type enable_https_traffic_only: bool
-    :ivar network_acls: Network ACL
-    :vartype network_acls: :class:`StorageNetworkAcls
-     <azure.mgmt.storage.v2017_06_01.models.StorageNetworkAcls>`
+    :ivar network_rule_set: Network rule set
+    :vartype network_rule_set: :class:`NetworkRuleSet
+     <azure.mgmt.storage.v2017_06_01.models.NetworkRuleSet>`
     """
 
     _validation = {
@@ -119,7 +119,7 @@ class StorageAccount(Resource):
         'secondary_endpoints': {'readonly': True},
         'encryption': {'readonly': True},
         'access_tier': {'readonly': True},
-        'network_acls': {'readonly': True},
+        'network_rule_set': {'readonly': True},
     }
 
     _attribute_map = {
@@ -144,7 +144,7 @@ class StorageAccount(Resource):
         'encryption': {'key': 'properties.encryption', 'type': 'Encryption'},
         'access_tier': {'key': 'properties.accessTier', 'type': 'AccessTier'},
         'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'},
-        'network_acls': {'key': 'properties.networkAcls', 'type': 'StorageNetworkAcls'},
+        'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'},
     }
 
     def __init__(self, location=None, tags=None, identity=None, enable_https_traffic_only=False):
@@ -165,4 +165,4 @@ def __init__(self, location=None, tags=None, identity=None, enable_https_traffic
         self.encryption = None
         self.access_tier = None
         self.enable_https_traffic_only = enable_https_traffic_only
-        self.network_acls = None
+        self.network_rule_set = None

azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/storage_account_create_parameters.py

@@ -47,9 +47,9 @@ class StorageAccountCreateParameters(Model):
      default setting is unencrypted.
     :type encryption: :class:`Encryption
      <azure.mgmt.storage.v2017_06_01.models.Encryption>`
-    :param network_acls: Network ACL
-    :type network_acls: :class:`StorageNetworkAcls
-     <azure.mgmt.storage.v2017_06_01.models.StorageNetworkAcls>`
+    :param network_rule_set: Network rule set
+    :type network_rule_set: :class:`NetworkRuleSet
+     <azure.mgmt.storage.v2017_06_01.models.NetworkRuleSet>`
     :param access_tier: Required for storage accounts where kind =
      BlobStorage. The access tier used for billing. Possible values include:
      'Hot', 'Cool'
@@ -74,19 +74,19 @@ class StorageAccountCreateParameters(Model):
         'identity': {'key': 'identity', 'type': 'Identity'},
         'custom_domain': {'key': 'properties.customDomain', 'type': 'CustomDomain'},
         'encryption': {'key': 'properties.encryption', 'type': 'Encryption'},
-        'network_acls': {'key': 'properties.networkAcls', 'type': 'StorageNetworkAcls'},
+        'network_rule_set': {'key': 'properties.networkAcls', 'type': 'NetworkRuleSet'},
         'access_tier': {'key': 'properties.accessTier', 'type': 'AccessTier'},
         'enable_https_traffic_only': {'key': 'properties.supportsHttpsTrafficOnly', 'type': 'bool'},
     }
 
-    def __init__(self, sku, kind, location, tags=None, identity=None, custom_domain=None, encryption=None, network_acls=None, access_tier=None, enable_https_traffic_only=False):
+    def __init__(self, sku, kind, location, tags=None, identity=None, custom_domain=None, encryption=None, network_rule_set=None, access_tier=None, enable_https_traffic_only=False):
         self.sku = sku
         self.kind = kind
         self.location = location
         self.tags = tags
         self.identity = identity
         self.custom_domain = custom_domain
         self.encryption = encryption
-        self.network_acls = network_acls
+        self.network_rule_set = network_rule_set
         self.access_tier = access_tier
         self.enable_https_traffic_only = enable_https_traffic_only