Generated from d6ce7d9460911bf6784529720bc138891f2d6c90

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

NFSAAS-1505 bring in line with RP

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

@@ -35,12 +35,13 @@ class CapacityPool(Model):
     :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 .
+    :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: int
     :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
@@ -53,7 +54,7 @@ class CapacityPool(Model):
         '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},
     }
 
@@ -79,6 +80,6 @@ def __init__(self, **kwargs):
         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

@@ -35,12 +35,13 @@ class CapacityPool(Model):
     :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 .
+    :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: int
     :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
@@ -53,7 +54,7 @@ class CapacityPool(Model):
         '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},
     }
 
@@ -70,7 +71,7 @@ class CapacityPool(Model):
         '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, account_id: str, tags=None, size: int=4398046511104, service_level="Premium", **kwargs) -> None:
         super(CapacityPool, self).__init__(**kwargs)
         self.location = location
         self.id = None

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

@@ -26,6 +26,8 @@ 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
@@ -45,6 +47,7 @@ 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},
@@ -56,6 +59,7 @@ 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'},
@@ -69,6 +73,7 @@ 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)

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

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

@@ -26,6 +26,8 @@ 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
@@ -45,6 +47,7 @@ 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},
@@ -56,6 +59,7 @@ 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'},
@@ -69,6 +73,7 @@ def __init__(self, *, location: str, file_system_id: str, tags=None, **kwargs) -
         self.location = location
         self.id = None
         self.name = None
+        self.type = None
         self.tags = tags
         self.snapshot_id = None
         self.file_system_id = file_system_id

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

@@ -38,12 +38,13 @@ class Volume(Model):
      file path for the volume. Used when creating mount targets
     :type creation_token: str
     :param service_level: Required. serviceLevel. The service level of the
-     file system. Possible values include: 'Basic', 'Standard', 'Premium'.
-     Default value: "Standard" .
+     file system. Possible values include: 'Standard', 'Premium', 'Extreme'.
+     Default value: "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :param usage_threshold: usageThreshold. Maximum storage quota allowed for
-     a file system in bytes. This is a soft quota used for alerting only. Upper
-     limit is 100TB. Default value: 0 .
+     a file system in bytes. This is a soft quota used for alerting only.
+     Minimum size is 100 GiB. Upper limit is 100TiB. Default value:
+     107374182400 .
     :type usage_threshold: long
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
@@ -60,7 +61,7 @@ class Volume(Model):
         'file_system_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}$'},
         'creation_token': {'required': True},
         'service_level': {'required': True},
-        'usage_threshold': {'maximum': 109951162777600, 'minimum': 0},
+        'usage_threshold': {'maximum': 109951162777600, 'minimum': 107374182400},
         'provisioning_state': {'readonly': True},
     }
 
@@ -89,7 +90,7 @@ def __init__(self, **kwargs):
         self.file_system_id = None
         self.name1 = kwargs.get('name1', None)
         self.creation_token = kwargs.get('creation_token', None)
-        self.service_level = kwargs.get('service_level', "Standard")
-        self.usage_threshold = kwargs.get('usage_threshold', 0)
+        self.service_level = kwargs.get('service_level', "Premium")
+        self.usage_threshold = kwargs.get('usage_threshold', 107374182400)
         self.provisioning_state = None
         self.subnet_id = kwargs.get('subnet_id', None)

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

@@ -31,20 +31,21 @@ class VolumePatch(Model):
     :param name1: FileSystem name. FileSystem name
     :type name1: str
     :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
     :param usage_threshold: usageThreshold. Maximum storage quota allowed for
-     a file system in bytes. This is a soft quota used for alerting only. Upper
-     limit is 100TB. Default value: 0 .
+     a file system in bytes. This is a soft quota used for alerting only.
+     Minimum size is 100 GiB. Upper limit is 100TiB. Default value:
+     107374182400 .
     :type usage_threshold: long
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'usage_threshold': {'maximum': 109951162777600, 'minimum': 0},
+        'usage_threshold': {'maximum': 109951162777600, 'minimum': 107374182400},
     }
 
     _attribute_map = {
@@ -66,5 +67,5 @@ def __init__(self, **kwargs):
         self.type = None
         self.tags = kwargs.get('tags', None)
         self.name1 = kwargs.get('name1', None)
-        self.service_level = kwargs.get('service_level', "Standard")
-        self.usage_threshold = kwargs.get('usage_threshold', 0)
+        self.service_level = kwargs.get('service_level', "Premium")
+        self.usage_threshold = kwargs.get('usage_threshold', 107374182400)

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

@@ -31,20 +31,21 @@ class VolumePatch(Model):
     :param name1: FileSystem name. FileSystem name
     :type name1: str
     :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
     :param usage_threshold: usageThreshold. Maximum storage quota allowed for
-     a file system in bytes. This is a soft quota used for alerting only. Upper
-     limit is 100TB. Default value: 0 .
+     a file system in bytes. This is a soft quota used for alerting only.
+     Minimum size is 100 GiB. Upper limit is 100TiB. Default value:
+     107374182400 .
     :type usage_threshold: long
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'usage_threshold': {'maximum': 109951162777600, 'minimum': 0},
+        'usage_threshold': {'maximum': 109951162777600, 'minimum': 107374182400},
     }
 
     _attribute_map = {
@@ -58,7 +59,7 @@ class VolumePatch(Model):
         'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'},
     }
 
-    def __init__(self, *, location: str=None, tags=None, name1: str=None, service_level="Standard", usage_threshold: int=0, **kwargs) -> None:
+    def __init__(self, *, location: str=None, tags=None, name1: str=None, service_level="Premium", usage_threshold: int=107374182400, **kwargs) -> None:
         super(VolumePatch, self).__init__(**kwargs)
         self.location = location
         self.id = None

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

@@ -38,12 +38,13 @@ class Volume(Model):
      file path for the volume. Used when creating mount targets
     :type creation_token: str
     :param service_level: Required. serviceLevel. The service level of the
-     file system. Possible values include: 'Basic', 'Standard', 'Premium'.
-     Default value: "Standard" .
+     file system. Possible values include: 'Standard', 'Premium', 'Extreme'.
+     Default value: "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :param usage_threshold: usageThreshold. Maximum storage quota allowed for
-     a file system in bytes. This is a soft quota used for alerting only. Upper
-     limit is 100TB. Default value: 0 .
+     a file system in bytes. This is a soft quota used for alerting only.
+     Minimum size is 100 GiB. Upper limit is 100TiB. Default value:
+     107374182400 .
     :type usage_threshold: long
     :ivar provisioning_state: Azure lifecycle management
     :vartype provisioning_state: str
@@ -60,7 +61,7 @@ class Volume(Model):
         'file_system_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}$'},
         'creation_token': {'required': True},
         'service_level': {'required': True},
-        'usage_threshold': {'maximum': 109951162777600, 'minimum': 0},
+        'usage_threshold': {'maximum': 109951162777600, 'minimum': 107374182400},
         'provisioning_state': {'readonly': True},
     }
 
@@ -79,7 +80,7 @@ class Volume(Model):
         'subnet_id': {'key': 'properties.subnetId', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str, creation_token: str, tags=None, name1: str=None, service_level="Standard", usage_threshold: int=0, subnet_id: str=None, **kwargs) -> None:
+    def __init__(self, *, location: str, creation_token: str, tags=None, name1: str=None, service_level="Premium", usage_threshold: int=107374182400, subnet_id: str=None, **kwargs) -> None:
         super(Volume, self).__init__(**kwargs)
         self.location = location
         self.id = None