[AutoPR netapp/resource-manager] Update to Release 3.5 standard (pre …

…GA) (#4556)

* Generated from 46f3cb6030777135484c1bdc4b1d2146053172f9

NFSAAS-1875 Update to R3.5 Standard (#11)

* Generated from 084552639aef23de670f0dc26ba5c9496eb6daff

Nfsaas 1875 swagger update (#12)

* NFSAAS-1875 Update to R3.5 Standard

* NFSAAS-1875 update to R3.5 standard

* Generated from 0af27c76c27c57415609e59ba20027b3808ba30e

Nfsaas 1875 swagger update (#13)

* NFSAAS-1875 Update to R3.5 Standard

* NFSAAS-1875 update to R3.5 standard

* NFSAAS-1875 updated from review comments

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

@@ -15,10 +15,12 @@
     from .metric_specification_py3 import MetricSpecification
     from .service_specification_py3 import ServiceSpecification
     from .operation_py3 import Operation
+    from .active_directories_py3 import ActiveDirectories
     from .net_app_account_py3 import NetAppAccount
     from .net_app_account_patch_py3 import NetAppAccountPatch
     from .capacity_pool_py3 import CapacityPool
     from .capacity_pool_patch_py3 import CapacityPoolPatch
+    from .export_policy_rule_py3 import ExportPolicyRule
     from .volume_py3 import Volume
     from .volume_patch_py3 import VolumePatch
     from .mount_target_py3 import MountTarget
@@ -31,10 +33,12 @@
     from .metric_specification import MetricSpecification
     from .service_specification import ServiceSpecification
     from .operation import Operation
+    from .active_directories import ActiveDirectories
     from .net_app_account import NetAppAccount
     from .net_app_account_patch import NetAppAccountPatch
     from .capacity_pool import CapacityPool
     from .capacity_pool_patch import CapacityPoolPatch
+    from .export_policy_rule import ExportPolicyRule
     from .volume import Volume
     from .volume_patch import VolumePatch
     from .mount_target import MountTarget
@@ -57,10 +61,12 @@
     'MetricSpecification',
     'ServiceSpecification',
     'Operation',
+    'ActiveDirectories',
     'NetAppAccount',
     'NetAppAccountPatch',
     'CapacityPool',
     'CapacityPoolPatch',
+    'ExportPolicyRule',
     'Volume',
     'VolumePatch',
     'MountTarget',

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

@@ -0,0 +1,60 @@
+# 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 ActiveDirectories(Model):
+    """Active Directories.
+
+    :param active_directory_id: Id of the Active Directory
+    :type active_directory_id: str
+    :param username: Username of Active Directory domain administrator
+    :type username: str
+    :param password: Plain text password of Active Directory domain
+     administrator
+    :type password: str
+    :param domain: Name of the Active Directory domain
+    :type domain: str
+    :param d_ns: Comma separated list of DNS server IP addresses for the
+     Active Directory domain
+    :type d_ns: str
+    :param status: Status of the Active Directory
+    :type status: str
+    :param s_mb_server_name: NetBIOS name of the SMB server. This name will be
+     registered as a computer account in the AD and used to mount volumes
+    :type s_mb_server_name: str
+    :param organizational_unit: The Organizational Unit (OU) within the
+     Windows Active Directory
+    :type organizational_unit: str
+    """
+
+    _attribute_map = {
+        'active_directory_id': {'key': 'activeDirectoryId', 'type': 'str'},
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+        'domain': {'key': 'domain', 'type': 'str'},
+        'd_ns': {'key': 'dNS', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        's_mb_server_name': {'key': 'sMBServerName', 'type': 'str'},
+        'organizational_unit': {'key': 'organizationalUnit', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ActiveDirectories, self).__init__(**kwargs)
+        self.active_directory_id = kwargs.get('active_directory_id', None)
+        self.username = kwargs.get('username', None)
+        self.password = kwargs.get('password', None)
+        self.domain = kwargs.get('domain', None)
+        self.d_ns = kwargs.get('d_ns', None)
+        self.status = kwargs.get('status', None)
+        self.s_mb_server_name = kwargs.get('s_mb_server_name', None)
+        self.organizational_unit = kwargs.get('organizational_unit', None)

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

@@ -0,0 +1,60 @@
+# 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 ActiveDirectories(Model):
+    """Active Directories.
+
+    :param active_directory_id: Id of the Active Directory
+    :type active_directory_id: str
+    :param username: Username of Active Directory domain administrator
+    :type username: str
+    :param password: Plain text password of Active Directory domain
+     administrator
+    :type password: str
+    :param domain: Name of the Active Directory domain
+    :type domain: str
+    :param d_ns: Comma separated list of DNS server IP addresses for the
+     Active Directory domain
+    :type d_ns: str
+    :param status: Status of the Active Directory
+    :type status: str
+    :param s_mb_server_name: NetBIOS name of the SMB server. This name will be
+     registered as a computer account in the AD and used to mount volumes
+    :type s_mb_server_name: str
+    :param organizational_unit: The Organizational Unit (OU) within the
+     Windows Active Directory
+    :type organizational_unit: str
+    """
+
+    _attribute_map = {
+        'active_directory_id': {'key': 'activeDirectoryId', 'type': 'str'},
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+        'domain': {'key': 'domain', 'type': 'str'},
+        'd_ns': {'key': 'dNS', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        's_mb_server_name': {'key': 'sMBServerName', 'type': 'str'},
+        'organizational_unit': {'key': 'organizationalUnit', 'type': 'str'},
+    }
+
+    def __init__(self, *, active_directory_id: str=None, username: str=None, password: str=None, domain: str=None, d_ns: str=None, status: str=None, s_mb_server_name: str=None, organizational_unit: str=None, **kwargs) -> None:
+        super(ActiveDirectories, self).__init__(**kwargs)
+        self.active_directory_id = active_directory_id
+        self.username = username
+        self.password = password
+        self.domain = domain
+        self.d_ns = d_ns
+        self.status = status
+        self.s_mb_server_name = s_mb_server_name
+        self.organizational_unit = organizational_unit

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

@@ -16,4 +16,4 @@ class ServiceLevel(str, Enum):
 
     standard = "Standard"  #: Standard service level
     premium = "Premium"  #: Premium service level
-    extreme = "Extreme"  #: Extreme service level
+    ultra = "Ultra"  #: Ultra service level

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

@@ -37,7 +37,7 @@ class CapacityPool(Model):
      value: 4398046511104 .
     :type size: long
     :param service_level: serviceLevel. The service level of the file system.
-     Possible values include: 'Standard', 'Premium', 'Extreme'. Default value:
+     Possible values include: 'Standard', 'Premium', 'Ultra'. Default value:
      "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :ivar provisioning_state: Azure lifecycle management

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

@@ -15,14 +15,52 @@
 class CapacityPoolPatch(Model):
     """Capacity pool patch resource.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param location: Resource location
+    :type location: str
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param tags: Resource tags
     :type tags: object
+    :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: 'Standard', 'Premium', 'Ultra'. Default value:
+     "Premium" .
+    :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     """
 
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'size': {'maximum': 549755813888000, 'minimum': 4398046511104},
+    }
+
     _attribute_map = {
+        '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'},
+        'size': {'key': 'properties.size', 'type': 'long'},
+        'service_level': {'key': 'properties.serviceLevel', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(CapacityPoolPatch, self).__init__(**kwargs)
+        self.location = kwargs.get('location', None)
+        self.id = None
+        self.name = None
+        self.type = None
         self.tags = kwargs.get('tags', None)
+        self.size = kwargs.get('size', 4398046511104)
+        self.service_level = kwargs.get('service_level', "Premium")

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

@@ -15,14 +15,52 @@
 class CapacityPoolPatch(Model):
     """Capacity pool patch resource.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param location: Resource location
+    :type location: str
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param tags: Resource tags
     :type tags: object
+    :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: 'Standard', 'Premium', 'Ultra'. Default value:
+     "Premium" .
+    :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     """
 
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'size': {'maximum': 549755813888000, 'minimum': 4398046511104},
+    }
+
     _attribute_map = {
+        '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'},
+        'size': {'key': 'properties.size', 'type': 'long'},
+        'service_level': {'key': 'properties.serviceLevel', 'type': 'str'},
     }
 
-    def __init__(self, *, tags=None, **kwargs) -> None:
+    def __init__(self, *, location: str=None, tags=None, size: int=4398046511104, service_level="Premium", **kwargs) -> None:
         super(CapacityPoolPatch, self).__init__(**kwargs)
+        self.location = location
+        self.id = None
+        self.name = None
+        self.type = None
         self.tags = tags
+        self.size = size
+        self.service_level = service_level

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

@@ -37,7 +37,7 @@ class CapacityPool(Model):
      value: 4398046511104 .
     :type size: long
     :param service_level: serviceLevel. The service level of the file system.
-     Possible values include: 'Standard', 'Premium', 'Extreme'. Default value:
+     Possible values include: 'Standard', 'Premium', 'Ultra'. Default value:
      "Premium" .
     :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel
     :ivar provisioning_state: Azure lifecycle management

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

@@ -0,0 +1,53 @@
+# 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 ExportPolicyRule(Model):
+    """Volume Export Policy Rule.
+
+    :param rule_index: Order index
+    :type rule_index: int
+    :param unix_read_only: Read only access
+    :type unix_read_only: bool
+    :param unix_read_write: Read and write access
+    :type unix_read_write: bool
+    :param cifs: Allows CIFS protocol
+    :type cifs: bool
+    :param nfsv3: Allows NFSv3 protocol
+    :type nfsv3: bool
+    :param nfsv4: Allows NFSv4 protocol
+    :type nfsv4: bool
+    :param allowed_clients: Client ingress specification as comma separated
+     string with IPv4 CIDRs, IPv4 host addresses and host names
+    :type allowed_clients: str
+    """
+
+    _attribute_map = {
+        'rule_index': {'key': 'ruleIndex', 'type': 'int'},
+        'unix_read_only': {'key': 'unixReadOnly', 'type': 'bool'},
+        'unix_read_write': {'key': 'unixReadWrite', 'type': 'bool'},
+        'cifs': {'key': 'cifs', 'type': 'bool'},
+        'nfsv3': {'key': 'nfsv3', 'type': 'bool'},
+        'nfsv4': {'key': 'nfsv4', 'type': 'bool'},
+        'allowed_clients': {'key': 'allowedClients', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ExportPolicyRule, self).__init__(**kwargs)
+        self.rule_index = kwargs.get('rule_index', None)
+        self.unix_read_only = kwargs.get('unix_read_only', None)
+        self.unix_read_write = kwargs.get('unix_read_write', None)
+        self.cifs = kwargs.get('cifs', None)
+        self.nfsv3 = kwargs.get('nfsv3', None)
+        self.nfsv4 = kwargs.get('nfsv4', None)
+        self.allowed_clients = kwargs.get('allowed_clients', None)

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

@@ -0,0 +1,53 @@
+# 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 ExportPolicyRule(Model):
+    """Volume Export Policy Rule.
+
+    :param rule_index: Order index
+    :type rule_index: int
+    :param unix_read_only: Read only access
+    :type unix_read_only: bool
+    :param unix_read_write: Read and write access
+    :type unix_read_write: bool
+    :param cifs: Allows CIFS protocol
+    :type cifs: bool
+    :param nfsv3: Allows NFSv3 protocol
+    :type nfsv3: bool
+    :param nfsv4: Allows NFSv4 protocol
+    :type nfsv4: bool
+    :param allowed_clients: Client ingress specification as comma separated
+     string with IPv4 CIDRs, IPv4 host addresses and host names
+    :type allowed_clients: str
+    """
+
+    _attribute_map = {
+        'rule_index': {'key': 'ruleIndex', 'type': 'int'},
+        'unix_read_only': {'key': 'unixReadOnly', 'type': 'bool'},
+        'unix_read_write': {'key': 'unixReadWrite', 'type': 'bool'},
+        'cifs': {'key': 'cifs', 'type': 'bool'},
+        'nfsv3': {'key': 'nfsv3', 'type': 'bool'},
+        'nfsv4': {'key': 'nfsv4', 'type': 'bool'},
+        'allowed_clients': {'key': 'allowedClients', 'type': 'str'},
+    }
+
+    def __init__(self, *, rule_index: int=None, unix_read_only: bool=None, unix_read_write: bool=None, cifs: bool=None, nfsv3: bool=None, nfsv4: bool=None, allowed_clients: str=None, **kwargs) -> None:
+        super(ExportPolicyRule, self).__init__(**kwargs)
+        self.rule_index = rule_index
+        self.unix_read_only = unix_read_only
+        self.unix_read_write = unix_read_write
+        self.cifs = cifs
+        self.nfsv3 = nfsv3
+        self.nfsv4 = nfsv4
+        self.allowed_clients = allowed_clients