diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py index 169f7b0f0f3f..b584ed1dbfaf 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py +++ b/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', diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/active_directories.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/active_directories.py new file mode 100644 index 000000000000..e5c45d425629 --- /dev/null +++ b/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) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/active_directories_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/active_directories_py3.py new file mode 100644 index 000000000000..b128e58daca0 --- /dev/null +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/azure_net_app_files_management_client_enums.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/azure_net_app_files_management_client_enums.py index 70fe875ab01e..f810f336b84a 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/azure_net_app_files_management_client_enums.py +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool.py index 3dced303adca..953dec4c38d1 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool.py +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch.py index 8a9840b47f70..03810e13bf5a 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch.py +++ b/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") diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch_py3.py index 92c38df46b26..0ff013d0ef91 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_patch_py3.py +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_py3.py index c2ad853f9f16..71d59a170bdc 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/capacity_pool_py3.py +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/export_policy_rule.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/export_policy_rule.py new file mode 100644 index 000000000000..12b5fbc66822 --- /dev/null +++ b/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) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/export_policy_rule_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/export_policy_rule_py3.py new file mode 100644 index 000000000000..62f11c226eb7 --- /dev/null +++ b/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 diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target.py index e118f00da392..0bbbbbd78e70 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target.py @@ -36,13 +36,13 @@ class MountTarget(Model): :type file_system_id: str :ivar ip_address: ipAddress. The mount target's IPv4 address :vartype ip_address: str - :param vlan_id: vlanid. Vlan Id - :type vlan_id: int + :param subnet: subnet. The subnet + :type subnet: str :param start_ip: startIp. The start of IPv4 address range to use when creating a new mount target :type start_ip: str - :param end_ip: startIp. The end of IPv4 address range to use when creating - a new mount target + :param end_ip: endIp. The end of IPv4 address range to use when creating a + new mount target :type end_ip: str :param gateway: gateway. The gateway of the IPv4 address range to use when creating a new mount target @@ -50,6 +50,9 @@ class MountTarget(Model): :param netmask: netmask. The netmask of the IPv4 address range to use when creating a new mount target :type netmask: str + :param smb_server_fqdn: smbServerFQDN. The SMB server's Fully Qualified + Domain Name, FQDN + :type smb_server_fqdn: str :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str """ @@ -72,11 +75,12 @@ 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'}, - 'vlan_id': {'key': 'properties.vlanId', 'type': 'int'}, + 'subnet': {'key': 'properties.subnet', 'type': 'str'}, 'start_ip': {'key': 'properties.startIp', 'type': 'str'}, 'end_ip': {'key': 'properties.endIp', 'type': 'str'}, 'gateway': {'key': 'properties.gateway', 'type': 'str'}, 'netmask': {'key': 'properties.netmask', 'type': 'str'}, + 'smb_server_fqdn': {'key': 'properties.smbServerFqdn', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } @@ -89,9 +93,10 @@ def __init__(self, **kwargs): self.mount_target_id = None self.file_system_id = kwargs.get('file_system_id', None) self.ip_address = None - self.vlan_id = kwargs.get('vlan_id', None) + self.subnet = kwargs.get('subnet', None) self.start_ip = kwargs.get('start_ip', None) self.end_ip = kwargs.get('end_ip', None) self.gateway = kwargs.get('gateway', None) self.netmask = kwargs.get('netmask', None) + self.smb_server_fqdn = kwargs.get('smb_server_fqdn', None) self.provisioning_state = None diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target_py3.py index b4191609e626..475cf4105ccc 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/mount_target_py3.py @@ -36,13 +36,13 @@ class MountTarget(Model): :type file_system_id: str :ivar ip_address: ipAddress. The mount target's IPv4 address :vartype ip_address: str - :param vlan_id: vlanid. Vlan Id - :type vlan_id: int + :param subnet: subnet. The subnet + :type subnet: str :param start_ip: startIp. The start of IPv4 address range to use when creating a new mount target :type start_ip: str - :param end_ip: startIp. The end of IPv4 address range to use when creating - a new mount target + :param end_ip: endIp. The end of IPv4 address range to use when creating a + new mount target :type end_ip: str :param gateway: gateway. The gateway of the IPv4 address range to use when creating a new mount target @@ -50,6 +50,9 @@ class MountTarget(Model): :param netmask: netmask. The netmask of the IPv4 address range to use when creating a new mount target :type netmask: str + :param smb_server_fqdn: smbServerFQDN. The SMB server's Fully Qualified + Domain Name, FQDN + :type smb_server_fqdn: str :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str """ @@ -72,15 +75,16 @@ 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'}, - 'vlan_id': {'key': 'properties.vlanId', 'type': 'int'}, + 'subnet': {'key': 'properties.subnet', 'type': 'str'}, 'start_ip': {'key': 'properties.startIp', 'type': 'str'}, 'end_ip': {'key': 'properties.endIp', 'type': 'str'}, 'gateway': {'key': 'properties.gateway', 'type': 'str'}, 'netmask': {'key': 'properties.netmask', 'type': 'str'}, + 'smb_server_fqdn': {'key': 'properties.smbServerFqdn', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } - def __init__(self, *, location: str, file_system_id: str, tags=None, vlan_id: int=None, start_ip: str=None, end_ip: str=None, gateway: str=None, netmask: str=None, **kwargs) -> None: + def __init__(self, *, location: str, file_system_id: str, tags=None, subnet: str=None, start_ip: str=None, end_ip: str=None, gateway: str=None, netmask: str=None, smb_server_fqdn: str=None, **kwargs) -> None: super(MountTarget, self).__init__(**kwargs) self.location = location self.id = None @@ -89,9 +93,10 @@ 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.vlan_id = vlan_id + self.subnet = subnet self.start_ip = start_ip self.end_ip = end_ip self.gateway = gateway self.netmask = netmask + self.smb_server_fqdn = smb_server_fqdn self.provisioning_state = None diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account.py index 3ec70dc97f92..1235eae41c38 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account.py @@ -32,6 +32,8 @@ class NetAppAccount(Model): :type tags: object :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str + :param active_directories: Active Directories + :type active_directories: ~azure.mgmt.netapp.models.ActiveDirectories """ _validation = { @@ -49,6 +51,7 @@ class NetAppAccount(Model): 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': 'object'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'active_directories': {'key': 'properties.activeDirectories', 'type': 'ActiveDirectories'}, } def __init__(self, **kwargs): @@ -59,3 +62,4 @@ def __init__(self, **kwargs): self.type = None self.tags = kwargs.get('tags', None) self.provisioning_state = None + self.active_directories = kwargs.get('active_directories', None) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch.py index 33d4ec3da53c..769bbd473987 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch.py @@ -15,14 +15,48 @@ class NetAppAccountPatch(Model): """NetApp account 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 + :ivar provisioning_state: Azure lifecycle management + :vartype provisioning_state: str + :param active_directories: Active Directories + :type active_directories: ~azure.mgmt.netapp.models.ActiveDirectories """ + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + _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'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'active_directories': {'key': 'properties.activeDirectories', 'type': 'ActiveDirectories'}, } def __init__(self, **kwargs): super(NetAppAccountPatch, 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.provisioning_state = None + self.active_directories = kwargs.get('active_directories', None) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch_py3.py index d42966ff4105..0519b8afd318 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_patch_py3.py @@ -15,14 +15,48 @@ class NetAppAccountPatch(Model): """NetApp account 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 + :ivar provisioning_state: Azure lifecycle management + :vartype provisioning_state: str + :param active_directories: Active Directories + :type active_directories: ~azure.mgmt.netapp.models.ActiveDirectories """ + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + _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'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'active_directories': {'key': 'properties.activeDirectories', 'type': 'ActiveDirectories'}, } - def __init__(self, *, tags=None, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, active_directories=None, **kwargs) -> None: super(NetAppAccountPatch, self).__init__(**kwargs) + self.location = location + self.id = None + self.name = None + self.type = None self.tags = tags + self.provisioning_state = None + self.active_directories = active_directories diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_py3.py index a2d9c5c845a0..1b1a8ba1055e 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/net_app_account_py3.py @@ -32,6 +32,8 @@ class NetAppAccount(Model): :type tags: object :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str + :param active_directories: Active Directories + :type active_directories: ~azure.mgmt.netapp.models.ActiveDirectories """ _validation = { @@ -49,9 +51,10 @@ class NetAppAccount(Model): 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': 'object'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'active_directories': {'key': 'properties.activeDirectories', 'type': 'ActiveDirectories'}, } - def __init__(self, *, location: str, tags=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, active_directories=None, **kwargs) -> None: super(NetAppAccount, self).__init__(**kwargs) self.location = location self.id = None @@ -59,3 +62,4 @@ def __init__(self, *, location: str, tags=None, **kwargs) -> None: self.type = None self.tags = tags self.provisioning_state = None + self.active_directories = active_directories diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py index 2daa2c273f06..0f285eb5c27a 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py @@ -36,7 +36,7 @@ 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: 'Standard', 'Premium', 'Extreme'. + file system. Possible values include: 'Standard', 'Premium', 'Ultra'. Default value: "Premium" . :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel :param usage_threshold: usageThreshold. Maximum storage quota allowed for @@ -44,6 +44,8 @@ class Volume(Model): Minimum size is 100 GiB. Upper limit is 100TiB. Default value: 107374182400 . :type usage_threshold: long + :param export_policy: Export policy rule + :type export_policy: ~azure.mgmt.netapp.models.ExportPolicyRule :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param subnet_id: The Azure Resource URI for a delegated subnet. Must have @@ -73,6 +75,7 @@ class Volume(Model): 'creation_token': {'key': 'properties.creationToken', 'type': 'str'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, + 'export_policy': {'key': 'properties.exportPolicy', 'type': 'ExportPolicyRule'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, } @@ -88,5 +91,6 @@ def __init__(self, **kwargs): self.creation_token = kwargs.get('creation_token', None) self.service_level = kwargs.get('service_level', "Premium") self.usage_threshold = kwargs.get('usage_threshold', 107374182400) + self.export_policy = kwargs.get('export_policy', None) self.provisioning_state = None self.subnet_id = kwargs.get('subnet_id', None) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch.py index a3b5a30bc492..982b8ac80857 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch.py @@ -29,7 +29,7 @@ class VolumePatch(Model): :param tags: Resource tags :type tags: object :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 :param usage_threshold: usageThreshold. Maximum storage quota allowed for @@ -37,6 +37,8 @@ class VolumePatch(Model): Minimum size is 100 GiB. Upper limit is 100TiB. Default value: 107374182400 . :type usage_threshold: long + :param export_policy: Export policy rule + :type export_policy: ~azure.mgmt.netapp.models.ExportPolicyRule """ _validation = { @@ -54,6 +56,7 @@ class VolumePatch(Model): 'tags': {'key': 'tags', 'type': 'object'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, + 'export_policy': {'key': 'properties.exportPolicy', 'type': 'ExportPolicyRule'}, } def __init__(self, **kwargs): @@ -65,3 +68,4 @@ def __init__(self, **kwargs): self.tags = kwargs.get('tags', None) self.service_level = kwargs.get('service_level', "Premium") self.usage_threshold = kwargs.get('usage_threshold', 107374182400) + self.export_policy = kwargs.get('export_policy', None) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch_py3.py index 7d1490e1ef01..132cfe5e5f7c 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_patch_py3.py @@ -29,7 +29,7 @@ class VolumePatch(Model): :param tags: Resource tags :type tags: object :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 :param usage_threshold: usageThreshold. Maximum storage quota allowed for @@ -37,6 +37,8 @@ class VolumePatch(Model): Minimum size is 100 GiB. Upper limit is 100TiB. Default value: 107374182400 . :type usage_threshold: long + :param export_policy: Export policy rule + :type export_policy: ~azure.mgmt.netapp.models.ExportPolicyRule """ _validation = { @@ -54,9 +56,10 @@ class VolumePatch(Model): 'tags': {'key': 'tags', 'type': 'object'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, + 'export_policy': {'key': 'properties.exportPolicy', 'type': 'ExportPolicyRule'}, } - def __init__(self, *, location: str=None, tags=None, service_level="Premium", usage_threshold: int=107374182400, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, service_level="Premium", usage_threshold: int=107374182400, export_policy=None, **kwargs) -> None: super(VolumePatch, self).__init__(**kwargs) self.location = location self.id = None @@ -65,3 +68,4 @@ def __init__(self, *, location: str=None, tags=None, service_level="Premium", us self.tags = tags self.service_level = service_level self.usage_threshold = usage_threshold + self.export_policy = export_policy diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py index 4a282416271f..2813d8bc0738 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py @@ -36,7 +36,7 @@ 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: 'Standard', 'Premium', 'Extreme'. + file system. Possible values include: 'Standard', 'Premium', 'Ultra'. Default value: "Premium" . :type service_level: str or ~azure.mgmt.netapp.models.ServiceLevel :param usage_threshold: usageThreshold. Maximum storage quota allowed for @@ -44,6 +44,8 @@ class Volume(Model): Minimum size is 100 GiB. Upper limit is 100TiB. Default value: 107374182400 . :type usage_threshold: long + :param export_policy: Export policy rule + :type export_policy: ~azure.mgmt.netapp.models.ExportPolicyRule :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param subnet_id: The Azure Resource URI for a delegated subnet. Must have @@ -73,11 +75,12 @@ class Volume(Model): 'creation_token': {'key': 'properties.creationToken', 'type': 'str'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, + 'export_policy': {'key': 'properties.exportPolicy', 'type': 'ExportPolicyRule'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, } - def __init__(self, *, location: str, creation_token: str, tags=None, service_level="Premium", usage_threshold: int=107374182400, subnet_id: str=None, **kwargs) -> None: + def __init__(self, *, location: str, creation_token: str, tags=None, service_level="Premium", usage_threshold: int=107374182400, export_policy=None, subnet_id: str=None, **kwargs) -> None: super(Volume, self).__init__(**kwargs) self.location = location self.id = None @@ -88,5 +91,6 @@ def __init__(self, *, location: str, creation_token: str, tags=None, service_lev self.creation_token = creation_token self.service_level = service_level self.usage_threshold = usage_threshold + self.export_policy = export_policy self.provisioning_state = None self.subnet_id = subnet_id diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py index da73c1444c8b..434999dd747c 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py @@ -167,9 +167,7 @@ def get( def _create_or_update_initial( - self, resource_group_name, account_name, location, tags=None, custom_headers=None, raw=False, **operation_config): - body = models.NetAppAccount(location=location, tags=tags) - + self, body, resource_group_name, account_name, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { @@ -216,17 +214,16 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, account_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): + self, body, resource_group_name, account_name, custom_headers=None, raw=False, polling=True, **operation_config): """Create or update a NetApp account. + :param body: NetApp Account object supplied in the body of the + operation. + :type body: ~azure.mgmt.netapp.models.NetAppAccount :param resource_group_name: The name of the resource group. :type resource_group_name: str :param account_name: The name of the NetApp account :type account_name: str - :param location: Resource location - :type location: str - :param tags: Resource tags - :type tags: object :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -242,10 +239,9 @@ def create_or_update( :class:`ErrorException` """ raw_result = self._create_or_update_initial( + body=body, resource_group_name=resource_group_name, account_name=account_name, - location=location, - tags=tags, custom_headers=custom_headers, raw=True, **operation_config @@ -348,15 +344,16 @@ def get_long_running_output(response): delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'} def update( - self, resource_group_name, account_name, tags=None, custom_headers=None, raw=False, **operation_config): + self, body, resource_group_name, account_name, custom_headers=None, raw=False, **operation_config): """Patch a NetApp account. + :param body: NetApp Account object supplied in the body of the + operation. + :type body: ~azure.mgmt.netapp.models.NetAppAccountPatch :param resource_group_name: The name of the resource group. :type resource_group_name: str :param account_name: The name of the NetApp account :type account_name: str - :param tags: Resource tags - :type tags: object :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -368,8 +365,6 @@ def update( :raises: :class:`ErrorException` """ - body = models.NetAppAccountPatch(tags=tags) - # Construct URL url = self.update.metadata['url'] path_format_arguments = { diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py index 9a523a657aa4..d59181bddf03 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py @@ -278,17 +278,18 @@ def get_long_running_output(response): create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'} def update( - self, resource_group_name, account_name, pool_name, tags=None, custom_headers=None, raw=False, **operation_config): + self, body, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, **operation_config): """Patch a capacity pool. + :param body: Capacity pool object supplied in the body of the + operation. + :type body: ~azure.mgmt.netapp.models.CapacityPoolPatch :param resource_group_name: The name of the resource group. :type resource_group_name: str :param account_name: The name of the NetApp account :type account_name: str :param pool_name: The name of the capacity pool :type pool_name: str - :param tags: Resource tags - :type tags: object :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -300,8 +301,6 @@ def update( :raises: :class:`ErrorException` """ - body = models.CapacityPoolPatch(tags=tags) - # Construct URL url = self.update.metadata['url'] path_format_arguments = { diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py index 1b003e85a6d2..9a05eba64e60 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py @@ -404,7 +404,7 @@ def _delete_initial( request = self._client.delete(url, query_parameters, header_parameters) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [202, 204]: + if response.status_code not in [200, 202, 204]: raise models.ErrorException(self._deserialize, response) if raw: diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/version.py b/azure-mgmt-netapp/azure/mgmt/netapp/version.py index c995f7836cef..a39916c162ce 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/version.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/version.py @@ -9,4 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "1.0.0" +