Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sdk automation/azure mgmt netapp #11678

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions sdk/netapp/azure-mgmt-netapp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## 0.11.0 (2020-07-09)

**Breaking changes**

- Volume parameter mount_targets changes type from MountTarget to MountTargetProperties

## 0.10.0 (2020-04-21)

**Features**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from ._models_py3 import ExportPolicyRule
from ._models_py3 import MetricSpecification
from ._models_py3 import MountTarget
from ._models_py3 import MountTargetProperties
from ._models_py3 import NetAppAccount
from ._models_py3 import NetAppAccountPatch
from ._models_py3 import Operation
Expand All @@ -43,6 +44,7 @@
from ._models import ExportPolicyRule
from ._models import MetricSpecification
from ._models import MountTarget
from ._models import MountTargetProperties
from ._models import NetAppAccount
from ._models import NetAppAccountPatch
from ._models import Operation
Expand Down Expand Up @@ -83,6 +85,7 @@
'ExportPolicyRule',
'MetricSpecification',
'MountTarget',
'MountTargetProperties',
'NetAppAccount',
'NetAppAccountPatch',
'Operation',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,72 @@ def __init__(self, **kwargs):
self.smb_server_fqdn = kwargs.get('smb_server_fqdn', None)


class MountTargetProperties(Model):
"""Mount target properties.

Variables are only populated by the server, and will be ignored when
sending a request.

All required parameters must be populated in order to send to Azure.

:ivar mount_target_id: mountTargetId. UUID v4 used to identify the
MountTarget
:vartype mount_target_id: str
:param file_system_id: Required. fileSystemId. UUID v4 used to identify
the MountTarget
:type file_system_id: str
:ivar ip_address: ipAddress. The mount target's IPv4 address
:vartype ip_address: str
: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: 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
:type gateway: str
: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
"""

_validation = {
'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},
}

_attribute_map = {
'mount_target_id': {'key': 'mountTargetId', 'type': 'str'},
'file_system_id': {'key': 'fileSystemId', 'type': 'str'},
'ip_address': {'key': 'ipAddress', 'type': 'str'},
'subnet': {'key': 'subnet', 'type': 'str'},
'start_ip': {'key': 'startIp', 'type': 'str'},
'end_ip': {'key': 'endIp', 'type': 'str'},
'gateway': {'key': 'gateway', 'type': 'str'},
'netmask': {'key': 'netmask', 'type': 'str'},
'smb_server_fqdn': {'key': 'smbServerFqdn', 'type': 'str'},
}

def __init__(self, **kwargs):
super(MountTargetProperties, self).__init__(**kwargs)
self.mount_target_id = None
self.file_system_id = kwargs.get('file_system_id', None)
self.ip_address = 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)


class NetAppAccount(Model):
"""NetApp account resource.

Expand Down Expand Up @@ -851,7 +917,7 @@ class Volume(Model):
Must have the delegation Microsoft.NetApp/volumes
:type subnet_id: str
:param mount_targets: mountTargets. List of mount targets
:type mount_targets: list[~azure.mgmt.netapp.models.MountTarget]
:type mount_targets: list[~azure.mgmt.netapp.models.MountTargetProperties]
:param volume_type: What type of volume is this
:type volume_type: str
:param data_protection: DataProtection. DataProtection type volumes
Expand Down Expand Up @@ -892,7 +958,7 @@ class Volume(Model):
'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
'baremetal_tenant_id': {'key': 'properties.baremetalTenantId', 'type': 'str'},
'subnet_id': {'key': 'properties.subnetId', 'type': 'str'},
'mount_targets': {'key': 'properties.mountTargets', 'type': '[MountTarget]'},
'mount_targets': {'key': 'properties.mountTargets', 'type': '[MountTargetProperties]'},
'volume_type': {'key': 'properties.volumeType', 'type': 'str'},
'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'},
'is_restoring': {'key': 'properties.isRestoring', 'type': 'bool'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,72 @@ def __init__(self, *, location: str, file_system_id: str, tags=None, subnet: str
self.smb_server_fqdn = smb_server_fqdn


class MountTargetProperties(Model):
"""Mount target properties.

Variables are only populated by the server, and will be ignored when
sending a request.

All required parameters must be populated in order to send to Azure.

:ivar mount_target_id: mountTargetId. UUID v4 used to identify the
MountTarget
:vartype mount_target_id: str
:param file_system_id: Required. fileSystemId. UUID v4 used to identify
the MountTarget
:type file_system_id: str
:ivar ip_address: ipAddress. The mount target's IPv4 address
:vartype ip_address: str
: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: 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
:type gateway: str
: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
"""

_validation = {
'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},
}

_attribute_map = {
'mount_target_id': {'key': 'mountTargetId', 'type': 'str'},
'file_system_id': {'key': 'fileSystemId', 'type': 'str'},
'ip_address': {'key': 'ipAddress', 'type': 'str'},
'subnet': {'key': 'subnet', 'type': 'str'},
'start_ip': {'key': 'startIp', 'type': 'str'},
'end_ip': {'key': 'endIp', 'type': 'str'},
'gateway': {'key': 'gateway', 'type': 'str'},
'netmask': {'key': 'netmask', 'type': 'str'},
'smb_server_fqdn': {'key': 'smbServerFqdn', 'type': 'str'},
}

def __init__(self, *, file_system_id: str, 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(MountTargetProperties, self).__init__(**kwargs)
self.mount_target_id = None
self.file_system_id = file_system_id
self.ip_address = None
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


class NetAppAccount(Model):
"""NetApp account resource.

Expand Down Expand Up @@ -851,7 +917,7 @@ class Volume(Model):
Must have the delegation Microsoft.NetApp/volumes
:type subnet_id: str
:param mount_targets: mountTargets. List of mount targets
:type mount_targets: list[~azure.mgmt.netapp.models.MountTarget]
:type mount_targets: list[~azure.mgmt.netapp.models.MountTargetProperties]
:param volume_type: What type of volume is this
:type volume_type: str
:param data_protection: DataProtection. DataProtection type volumes
Expand Down Expand Up @@ -892,7 +958,7 @@ class Volume(Model):
'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
'baremetal_tenant_id': {'key': 'properties.baremetalTenantId', 'type': 'str'},
'subnet_id': {'key': 'properties.subnetId', 'type': 'str'},
'mount_targets': {'key': 'properties.mountTargets', 'type': '[MountTarget]'},
'mount_targets': {'key': 'properties.mountTargets', 'type': '[MountTargetProperties]'},
'volume_type': {'key': 'properties.volumeType', 'type': 'str'},
'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'},
'is_restoring': {'key': 'properties.isRestoring', 'type': 'bool'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "0.10.0"
VERSION = "0.11.0"

4 changes: 3 additions & 1 deletion sdk/netapp/azure-mgmt-netapp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
pass

# Version extraction inspired from 'requests'
with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd:
with open(os.path.join(package_folder_path, 'version.py')
if os.path.exists(os.path.join(package_folder_path, 'version.py'))
else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
fd.read(), re.MULTILINE).group(1)

Expand Down
Loading