Generated from 164da1fe5b4cdf8db0afd9f55a08ab523e1c3f0e

Merge pull request #4 from leonardbf/netapp-api-update-public

NFSAAS-1505 resource and property changes

azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py

@@ -23,6 +23,7 @@
     from .volume_patch_py3 import VolumePatch
     from .mount_target_py3 import MountTarget
     from .snapshot_py3 import Snapshot
+    from .snapshot_patch_py3 import SnapshotPatch
     from .error_py3 import Error, ErrorException
 except (SyntaxError, ImportError):
     from .operation_display import OperationDisplay
@@ -38,6 +39,7 @@
     from .volume_patch import VolumePatch
     from .mount_target import MountTarget
     from .snapshot import Snapshot
+    from .snapshot_patch import SnapshotPatch
     from .error import Error, ErrorException
 from .operation_paged import OperationPaged
 from .net_app_account_paged import NetAppAccountPaged
@@ -63,6 +65,7 @@
     'VolumePatch',
     'MountTarget',
     'Snapshot',
+    'SnapshotPatch',
     'Error', 'ErrorException',
     'OperationPaged',
     'NetAppAccountPaged',

azure-mgmt-netapp/azure/mgmt/netapp/models/azure_net_app_files_management_client_enums.py

@@ -14,6 +14,6 @@
 
 class ServiceLevel(str, Enum):
 
-    basic = "Basic"  #: Basic service level
     standard = "Standard"  #: Standard service level
     premium = "Premium"  #: Premium service level
+    extreme = "Extreme"  #: Extreme service level

azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool.py

@@ -30,17 +30,15 @@ class CapacityPool(Model):
     :vartype type: str
     :param tags: Resource tags
     :type tags: object
-    :param account_id: Required. accountId. UUID v4 used to identify the
-     Account
-    :type account_id: str
     :ivar pool_id: poolId. UUID v4 used to identify the Pool
     :vartype pool_id: str
-    :param size: size. Provisioned size of the pool (in GB). Default value:
-     4096 .
-    :type size: int
+    :param size: size. Provisioned size of the pool (in bytes). Allowed values
+     are in 4TiB chunks (value must be multiply of 4398046511104). Default
+     value: 4398046511104 .
+    :type size: long
     :param service_level: serviceLevel. The service level of the file system.
-     Possible values include: 'Basic', 'Standard', 'Premium'. Default value:
-     "Standard" .
+     Possible values include: 'Standard', 'Premium', 'Extreme'. Default value:
+     "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
@@ -51,9 +49,8 @@ class CapacityPool(Model):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'account_id': {'required': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'pool_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
-        'size': {'minimum': 4096},
+        'size': {'maximum': 549755813888000, 'minimum': 4398046511104},
         'provisioning_state': {'readonly': True},
     }
 
@@ -63,9 +60,8 @@ class CapacityPool(Model):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': 'object'},
-        'account_id': {'key': 'properties.accountId', 'type': 'str'},
         'pool_id': {'key': 'properties.poolId', 'type': 'str'},
-        'size': {'key': 'properties.size', 'type': 'int'},
+        'size': {'key': 'properties.size', 'type': 'long'},
         'service_level': {'key': 'properties.serviceLevel', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
@@ -77,8 +73,7 @@ def __init__(self, **kwargs):
         self.name = None
         self.type = None
         self.tags = kwargs.get('tags', None)
-        self.account_id = kwargs.get('account_id', None)
         self.pool_id = None
-        self.size = kwargs.get('size', 4096)
-        self.service_level = kwargs.get('service_level', "Standard")
+        self.size = kwargs.get('size', 4398046511104)
+        self.service_level = kwargs.get('service_level', "Premium")
         self.provisioning_state = None

azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_py3.py

@@ -30,17 +30,15 @@ class CapacityPool(Model):
     :vartype type: str
     :param tags: Resource tags
     :type tags: object
-    :param account_id: Required. accountId. UUID v4 used to identify the
-     Account
-    :type account_id: str
     :ivar pool_id: poolId. UUID v4 used to identify the Pool
     :vartype pool_id: str
-    :param size: size. Provisioned size of the pool (in GB). Default value:
-     4096 .
-    :type size: int
+    :param size: size. Provisioned size of the pool (in bytes). Allowed values
+     are in 4TiB chunks (value must be multiply of 4398046511104). Default
+     value: 4398046511104 .
+    :type size: long
     :param service_level: serviceLevel. The service level of the file system.
-     Possible values include: 'Basic', 'Standard', 'Premium'. Default value:
-     "Standard" .
+     Possible values include: 'Standard', 'Premium', 'Extreme'. Default value:
+     "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
@@ -51,9 +49,8 @@ class CapacityPool(Model):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'account_id': {'required': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'pool_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
-        'size': {'minimum': 4096},
+        'size': {'maximum': 549755813888000, 'minimum': 4398046511104},
         'provisioning_state': {'readonly': True},
     }
 
@@ -63,21 +60,19 @@ class CapacityPool(Model):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': 'object'},
-        'account_id': {'key': 'properties.accountId', 'type': 'str'},
         'pool_id': {'key': 'properties.poolId', 'type': 'str'},
-        'size': {'key': 'properties.size', 'type': 'int'},
+        'size': {'key': 'properties.size', 'type': 'long'},
         'service_level': {'key': 'properties.serviceLevel', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str, account_id: str, tags=None, size: int=4096, service_level="Standard", **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, size: int=4398046511104, service_level="Premium", **kwargs) -> None:
         super(CapacityPool, self).__init__(**kwargs)
         self.location = location
         self.id = None
         self.name = None
         self.type = None
         self.tags = tags
-        self.account_id = account_id
         self.pool_id = None
         self.size = size
         self.service_level = service_level

azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target.py

@@ -36,8 +36,6 @@ class MountTarget(Model):
     :type file_system_id: str
     :ivar ip_address: ipAddress. The mount target's IPv4 address
     :vartype ip_address: str
-    :ivar name1: name. The name of the mount target
-    :vartype name1: str
     :param vlan_id: vlanid. Vlan Id
     :type vlan_id: int
     :param start_ip: startIp. The start of IPv4 address range to use when
@@ -63,7 +61,6 @@ class MountTarget(Model):
         'mount_target_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'file_system_id': {'required': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'ip_address': {'readonly': True},
-        'name1': {'readonly': True},
         'provisioning_state': {'readonly': True},
     }
 
@@ -75,7 +72,6 @@ class MountTarget(Model):
         'mount_target_id': {'key': 'properties.mountTargetId', 'type': 'str'},
         'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
         'ip_address': {'key': 'properties.ipAddress', 'type': 'str'},
-        'name1': {'key': 'properties.name', 'type': 'str'},
         'vlan_id': {'key': 'properties.vlanId', 'type': 'int'},
         'start_ip': {'key': 'properties.startIp', 'type': 'str'},
         'end_ip': {'key': 'properties.endIp', 'type': 'str'},
@@ -93,7 +89,6 @@ def __init__(self, **kwargs):
         self.mount_target_id = None
         self.file_system_id = kwargs.get('file_system_id', None)
         self.ip_address = None
-        self.name1 = None
         self.vlan_id = kwargs.get('vlan_id', None)
         self.start_ip = kwargs.get('start_ip', None)
         self.end_ip = kwargs.get('end_ip', None)

azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target_py3.py

@@ -36,8 +36,6 @@ class MountTarget(Model):
     :type file_system_id: str
     :ivar ip_address: ipAddress. The mount target's IPv4 address
     :vartype ip_address: str
-    :ivar name1: name. The name of the mount target
-    :vartype name1: str
     :param vlan_id: vlanid. Vlan Id
     :type vlan_id: int
     :param start_ip: startIp. The start of IPv4 address range to use when
@@ -63,7 +61,6 @@ class MountTarget(Model):
         'mount_target_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'file_system_id': {'required': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'ip_address': {'readonly': True},
-        'name1': {'readonly': True},
         'provisioning_state': {'readonly': True},
     }
 
@@ -75,7 +72,6 @@ class MountTarget(Model):
         'mount_target_id': {'key': 'properties.mountTargetId', 'type': 'str'},
         'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
         'ip_address': {'key': 'properties.ipAddress', 'type': 'str'},
-        'name1': {'key': 'properties.name', 'type': 'str'},
         'vlan_id': {'key': 'properties.vlanId', 'type': 'int'},
         'start_ip': {'key': 'properties.startIp', 'type': 'str'},
         'end_ip': {'key': 'properties.endIp', 'type': 'str'},
@@ -93,7 +89,6 @@ def __init__(self, *, location: str, file_system_id: str, tags=None, vlan_id: in
         self.mount_target_id = None
         self.file_system_id = file_system_id
         self.ip_address = None
-        self.name1 = None
         self.vlan_id = vlan_id
         self.start_ip = start_ip
         self.end_ip = end_ip

azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account.py

@@ -30,8 +30,6 @@ class NetAppAccount(Model):
     :vartype type: str
     :param tags: Resource tags
     :type tags: object
-    :ivar account_id: accountId. UUID v4 used to identify the Account
-    :vartype account_id: str
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
     """
@@ -41,7 +39,6 @@ class NetAppAccount(Model):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'account_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'provisioning_state': {'readonly': True},
     }
 
@@ -51,7 +48,6 @@ class NetAppAccount(Model):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': 'object'},
-        'account_id': {'key': 'properties.accountId', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
@@ -62,5 +58,4 @@ def __init__(self, **kwargs):
         self.name = None
         self.type = None
         self.tags = kwargs.get('tags', None)
-        self.account_id = None
         self.provisioning_state = None

azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_py3.py

@@ -30,8 +30,6 @@ class NetAppAccount(Model):
     :vartype type: str
     :param tags: Resource tags
     :type tags: object
-    :ivar account_id: accountId. UUID v4 used to identify the Account
-    :vartype account_id: str
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
     """
@@ -41,7 +39,6 @@ class NetAppAccount(Model):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'account_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'provisioning_state': {'readonly': True},
     }
 
@@ -51,7 +48,6 @@ class NetAppAccount(Model):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': 'object'},
-        'account_id': {'key': 'properties.accountId', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
@@ -62,5 +58,4 @@ def __init__(self, *, location: str, tags=None, **kwargs) -> None:
         self.name = None
         self.type = None
         self.tags = tags
-        self.account_id = None
         self.provisioning_state = None

azure-mgmt-netapp/azure/mgmt/netapp/models/snapshot.py

@@ -26,15 +26,15 @@ class Snapshot(Model):
     :vartype id: str
     :ivar name: Resource name
     :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param tags: Resource tags
     :type tags: object
     :ivar snapshot_id: snapshotId. UUID v4 used to identify the Snapshot
     :vartype snapshot_id: str
     :param file_system_id: Required. fileSystemId. UUID v4 used to identify
      the FileSystem
     :type file_system_id: str
-    :ivar name1: name. The name of the snapshot
-    :vartype name1: str
     :ivar creation_date: name. The creation date of the snapshot
     :vartype creation_date: datetime
     :ivar provisioning_state: Azure lifecycle management
@@ -45,9 +45,9 @@ class Snapshot(Model):
         'location': {'required': True},
         'id': {'readonly': True},
         'name': {'readonly': True},
+        'type': {'readonly': True},
         'snapshot_id': {'readonly': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
         'file_system_id': {'required': True, 'max_length': 36, 'min_length': 36, 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'},
-        'name1': {'readonly': True},
         'creation_date': {'readonly': True},
         'provisioning_state': {'readonly': True},
     }
@@ -56,10 +56,10 @@ class Snapshot(Model):
         'location': {'key': 'location', 'type': 'str'},
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': 'object'},
         'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
         'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
-        'name1': {'key': 'properties.name', 'type': 'str'},
         'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
@@ -69,9 +69,9 @@ def __init__(self, **kwargs):
         self.location = kwargs.get('location', None)
         self.id = None
         self.name = None
+        self.type = None
         self.tags = kwargs.get('tags', None)
         self.snapshot_id = None
         self.file_system_id = kwargs.get('file_system_id', None)
-        self.name1 = None
         self.creation_date = None
         self.provisioning_state = None

azure-mgmt-netapp/azure/mgmt/netapp/models/snapshot_patch.py

@@ -0,0 +1,28 @@
+# 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 SnapshotPatch(Model):
+    """Snapshot patch.
+
+    :param tags: Resource tags
+    :type tags: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SnapshotPatch, self).__init__(**kwargs)
+        self.tags = kwargs.get('tags', None)

azure-mgmt-netapp/azure/mgmt/netapp/models/snapshot_patch_py3.py

@@ -0,0 +1,28 @@
+# 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 SnapshotPatch(Model):
+    """Snapshot patch.
+
+    :param tags: Resource tags
+    :type tags: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': 'object'},
+    }
+
+    def __init__(self, *, tags=None, **kwargs) -> None:
+        super(SnapshotPatch, self).__init__(**kwargs)
+        self.tags = tags