[StorageMgmt] 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-08-22T16:08:14Z", "version": ""}

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

@@ -24,7 +24,7 @@
 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
@@ -81,7 +81,7 @@
     'Encryption',
     'VirtualNetworkRule',
     'IPRule',
-    'StorageNetworkAcls',
+    'NetworkRuleSet',
     'Identity',
     'StorageAccountCreateParameters',
     'Endpoints',

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/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

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

@@ -47,9 +47,9 @@ class StorageAccountUpdateParameters(Model):
     :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
-    :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>`
     """
 
     _attribute_map = {
@@ -60,15 +60,15 @@ class StorageAccountUpdateParameters(Model):
         '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, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, enable_https_traffic_only=False, network_acls=None):
+    def __init__(self, sku=None, tags=None, identity=None, custom_domain=None, encryption=None, access_tier=None, enable_https_traffic_only=False, network_rule_set=None):
         self.sku = sku
         self.tags = tags
         self.identity = identity
         self.custom_domain = custom_domain
         self.encryption = encryption
         self.access_tier = access_tier
         self.enable_https_traffic_only = enable_https_traffic_only
-        self.network_acls = network_acls
+        self.network_rule_set = network_rule_set

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

@@ -18,11 +18,11 @@ class VirtualNetworkRule(Model):
     :param virtual_network_resource_id: A URL of vnet, subnet, classicVnet or
      classicSubnet.
     :type virtual_network_resource_id: str
-    :param action: The action of virtual network ACL rule. Possible values
+    :param action: The action of virtual network rule. Possible values
      include: 'Allow'. Default value: "Allow" .
     :type action: str or :class:`Action
      <azure.mgmt.storage.v2017_06_01.models.Action>`
-    :param state: Gets the state of virtual network ACL rule. Possible values
+    :param state: Gets the state of virtual network rule. Possible values
      include: 'provisioning', 'deprovisioning', 'succeeded', 'failed',
      'networkSourceDeleted'
     :type state: str or :class:`State