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.

Sign up for GitHub

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

[ReleasePR azure-mgmt-netapp] Anf 567 anf swagger restapi to2020 02 01 no snapshotpolicy #12715

Closed
wants to merge 1 commit into from
Closed

[ReleasePR azure-mgmt-netapp] Anf 567 anf swagger restapi to2020 02 01 no snapshotpolicy #12715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(
super(AzureNetAppFilesManagementClient, self).__init__(self.config.credentials, self.config)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
self.api_version = '2019-11-01'
self.api_version = '2020-02-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

Expand Down
3 changes: 3 additions & 0 deletions sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from ._models_py3 import VolumePropertiesDataProtection
from ._models_py3 import VolumePropertiesExportPolicy
from ._models_py3 import VolumeRevert
from ._models_py3 import VolumeSnapshotProperties
except (SyntaxError, ImportError):
from ._models import ActiveDirectory
from ._models import AuthorizeRequest
Expand All @@ -61,6 +62,7 @@
from ._models import VolumePropertiesDataProtection
from ._models import VolumePropertiesExportPolicy
from ._models import VolumeRevert
from ._models import VolumeSnapshotProperties
from ._paged_models import CapacityPoolPaged
from ._paged_models import NetAppAccountPaged
from ._paged_models import OperationPaged
Expand Down Expand Up @@ -102,6 +104,7 @@
'VolumePropertiesDataProtection',
'VolumePropertiesExportPolicy',
'VolumeRevert',
'VolumeSnapshotProperties',
'OperationPaged',
'NetAppAccountPaged',
'CapacityPoolPaged',
Expand Down
43 changes: 35 additions & 8 deletions sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ class ActiveDirectory(Model):
:param site: The Active Directory site the service will limit Domain
Controller discovery to
:type site: str
:param backup_operators: Users to be added to the Built-in Backup Operator
active directory group. A list of unique usernames without domain
specifier
:type backup_operators: list[str]
"""

_attribute_map = {
Expand All @@ -50,6 +54,7 @@ class ActiveDirectory(Model):
'smb_server_name': {'key': 'smbServerName', 'type': 'str'},
'organizational_unit': {'key': 'organizationalUnit', 'type': 'str'},
'site': {'key': 'site', 'type': 'str'},
'backup_operators': {'key': 'backupOperators', 'type': '[str]'},
}

def __init__(self, **kwargs):
Expand All @@ -63,6 +68,7 @@ def __init__(self, **kwargs):
self.smb_server_name = kwargs.get('smb_server_name', None)
self.organizational_unit = kwargs.get('organizational_unit', None)
self.site = kwargs.get('site', None)
self.backup_operators = kwargs.get('backup_operators', None)


class AuthorizeRequest(Model):
Expand Down Expand Up @@ -242,9 +248,10 @@ class ExportPolicyRule(Model):
:type unix_read_write: bool
:param cifs: Allows CIFS protocol
:type cifs: bool
:param nfsv3: Allows NFSv3 protocol
:param nfsv3: Allows NFSv3 protocol. Enable only for NFSv3 type volumes
:type nfsv3: bool
:param nfsv41: Allows NFSv4.1 protocol
:param nfsv41: Allows NFSv4.1 protocol. Enable only for NFSv4.1 type
volumes
:type nfsv41: bool
:param allowed_clients: Client ingress specification as comma separated
string with IPv4 CIDRs, IPv4 host addresses and host names
Expand Down Expand Up @@ -825,9 +832,6 @@ class Snapshot(Model):
:vartype type: str
:ivar snapshot_id: snapshotId. UUID v4 used to identify the Snapshot
:vartype snapshot_id: str
:param file_system_id: fileSystemId. UUID v4 used to identify the
FileSystem
:type file_system_id: str
:ivar created: name. The creation date of the snapshot
:vartype created: datetime
:ivar provisioning_state: Azure lifecycle management
Expand All @@ -840,7 +844,6 @@ class Snapshot(Model):
'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': {'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}$'},
'created': {'readonly': True},
'provisioning_state': {'readonly': True},
}
Expand All @@ -851,7 +854,6 @@ class Snapshot(Model):
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
'created': {'key': 'properties.created', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
}
Expand All @@ -863,7 +865,6 @@ def __init__(self, **kwargs):
self.name = None
self.type = None
self.snapshot_id = None
self.file_system_id = kwargs.get('file_system_id', None)
self.created = None
self.provisioning_state = None

Expand Down Expand Up @@ -926,6 +927,10 @@ class Volume(Model):
~azure.mgmt.netapp.models.VolumePropertiesDataProtection
:param is_restoring: Restoring
:type is_restoring: bool
:param snapshot_directory_visible: If enabled (true) the volume will
contain a read-only .snapshot directory which provides access to each of
the volume's snapshots (default to true).
:type snapshot_directory_visible: bool
"""

_validation = {
Expand Down Expand Up @@ -962,6 +967,7 @@ class Volume(Model):
'volume_type': {'key': 'properties.volumeType', 'type': 'str'},
'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'},
'is_restoring': {'key': 'properties.isRestoring', 'type': 'bool'},
'snapshot_directory_visible': {'key': 'properties.snapshotDirectoryVisible', 'type': 'bool'},
}

def __init__(self, **kwargs):
Expand All @@ -985,6 +991,7 @@ def __init__(self, **kwargs):
self.volume_type = kwargs.get('volume_type', None)
self.data_protection = kwargs.get('data_protection', None)
self.is_restoring = kwargs.get('is_restoring', None)
self.snapshot_directory_visible = kwargs.get('snapshot_directory_visible', None)


class VolumePatch(Model):
Expand Down Expand Up @@ -1073,15 +1080,19 @@ class VolumePropertiesDataProtection(Model):

:param replication: Replication. Replication properties
:type replication: ~azure.mgmt.netapp.models.ReplicationObject
:param snapshot: Snapshot. Snapshot properties.
:type snapshot: ~azure.mgmt.netapp.models.VolumeSnapshotProperties
"""

_attribute_map = {
'replication': {'key': 'replication', 'type': 'ReplicationObject'},
'snapshot': {'key': 'snapshot', 'type': 'VolumeSnapshotProperties'},
}

def __init__(self, **kwargs):
super(VolumePropertiesDataProtection, self).__init__(**kwargs)
self.replication = kwargs.get('replication', None)
self.snapshot = kwargs.get('snapshot', None)


class VolumePropertiesExportPolicy(Model):
Expand Down Expand Up @@ -1116,3 +1127,19 @@ class VolumeRevert(Model):
def __init__(self, **kwargs):
super(VolumeRevert, self).__init__(**kwargs)
self.snapshot_id = kwargs.get('snapshot_id', None)


class VolumeSnapshotProperties(Model):
"""Volume Snapshot Properties.

:param snapshot_policy_id: Snapshot Policy ResourceId
:type snapshot_policy_id: str
"""

_attribute_map = {
'snapshot_policy_id': {'key': 'snapshotPolicyId', 'type': 'str'},
}

def __init__(self, **kwargs):
super(VolumeSnapshotProperties, self).__init__(**kwargs)
self.snapshot_policy_id = kwargs.get('snapshot_policy_id', None)
51 changes: 39 additions & 12 deletions sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ class ActiveDirectory(Model):
:param site: The Active Directory site the service will limit Domain
Controller discovery to
:type site: str
:param backup_operators: Users to be added to the Built-in Backup Operator
active directory group. A list of unique usernames without domain
specifier
:type backup_operators: list[str]
"""

_attribute_map = {
Expand All @@ -50,9 +54,10 @@ class ActiveDirectory(Model):
'smb_server_name': {'key': 'smbServerName', 'type': 'str'},
'organizational_unit': {'key': 'organizationalUnit', 'type': 'str'},
'site': {'key': 'site', 'type': 'str'},
'backup_operators': {'key': 'backupOperators', 'type': '[str]'},
}

def __init__(self, *, active_directory_id: str=None, username: str=None, password: str=None, domain: str=None, dns: str=None, status: str=None, smb_server_name: str=None, organizational_unit: str=None, site: str=None, **kwargs) -> None:
def __init__(self, *, active_directory_id: str=None, username: str=None, password: str=None, domain: str=None, dns: str=None, status: str=None, smb_server_name: str=None, organizational_unit: str=None, site: str=None, backup_operators=None, **kwargs) -> None:
super(ActiveDirectory, self).__init__(**kwargs)
self.active_directory_id = active_directory_id
self.username = username
Expand All @@ -63,6 +68,7 @@ def __init__(self, *, active_directory_id: str=None, username: str=None, passwor
self.smb_server_name = smb_server_name
self.organizational_unit = organizational_unit
self.site = site
self.backup_operators = backup_operators


class AuthorizeRequest(Model):
Expand Down Expand Up @@ -242,9 +248,10 @@ class ExportPolicyRule(Model):
:type unix_read_write: bool
:param cifs: Allows CIFS protocol
:type cifs: bool
:param nfsv3: Allows NFSv3 protocol
:param nfsv3: Allows NFSv3 protocol. Enable only for NFSv3 type volumes
:type nfsv3: bool
:param nfsv41: Allows NFSv4.1 protocol
:param nfsv41: Allows NFSv4.1 protocol. Enable only for NFSv4.1 type
volumes
:type nfsv41: bool
:param allowed_clients: Client ingress specification as comma separated
string with IPv4 CIDRs, IPv4 host addresses and host names
Expand Down Expand Up @@ -825,9 +832,6 @@ class Snapshot(Model):
:vartype type: str
:ivar snapshot_id: snapshotId. UUID v4 used to identify the Snapshot
:vartype snapshot_id: str
:param file_system_id: fileSystemId. UUID v4 used to identify the
FileSystem
:type file_system_id: str
:ivar created: name. The creation date of the snapshot
:vartype created: datetime
:ivar provisioning_state: Azure lifecycle management
Expand All @@ -840,7 +844,6 @@ class Snapshot(Model):
'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': {'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}$'},
'created': {'readonly': True},
'provisioning_state': {'readonly': True},
}
Expand All @@ -851,19 +854,17 @@ class Snapshot(Model):
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
'created': {'key': 'properties.created', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
}

def __init__(self, *, location: str, file_system_id: str=None, **kwargs) -> None:
def __init__(self, *, location: str, **kwargs) -> None:
super(Snapshot, self).__init__(**kwargs)
self.location = location
self.id = None
self.name = None
self.type = None
self.snapshot_id = None
self.file_system_id = file_system_id
self.created = None
self.provisioning_state = None

Expand Down Expand Up @@ -926,6 +927,10 @@ class Volume(Model):
~azure.mgmt.netapp.models.VolumePropertiesDataProtection
:param is_restoring: Restoring
:type is_restoring: bool
:param snapshot_directory_visible: If enabled (true) the volume will
contain a read-only .snapshot directory which provides access to each of
the volume's snapshots (default to true).
:type snapshot_directory_visible: bool
"""

_validation = {
Expand Down Expand Up @@ -962,9 +967,10 @@ class Volume(Model):
'volume_type': {'key': 'properties.volumeType', 'type': 'str'},
'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'},
'is_restoring': {'key': 'properties.isRestoring', 'type': 'bool'},
'snapshot_directory_visible': {'key': 'properties.snapshotDirectoryVisible', 'type': 'bool'},
}

def __init__(self, *, location: str, creation_token: str, subnet_id: str, tags=None, service_level="Premium", usage_threshold: int=107374182400, export_policy=None, protocol_types=None, snapshot_id: str=None, mount_targets=None, volume_type: str=None, data_protection=None, is_restoring: bool=None, **kwargs) -> None:
def __init__(self, *, location: str, creation_token: str, subnet_id: str, tags=None, service_level="Premium", usage_threshold: int=107374182400, export_policy=None, protocol_types=None, snapshot_id: str=None, mount_targets=None, volume_type: str=None, data_protection=None, is_restoring: bool=None, snapshot_directory_visible: bool=None, **kwargs) -> None:
super(Volume, self).__init__(**kwargs)
self.location = location
self.id = None
Expand All @@ -985,6 +991,7 @@ def __init__(self, *, location: str, creation_token: str, subnet_id: str, tags=N
self.volume_type = volume_type
self.data_protection = data_protection
self.is_restoring = is_restoring
self.snapshot_directory_visible = snapshot_directory_visible


class VolumePatch(Model):
Expand Down Expand Up @@ -1073,15 +1080,19 @@ class VolumePropertiesDataProtection(Model):

:param replication: Replication. Replication properties
:type replication: ~azure.mgmt.netapp.models.ReplicationObject
:param snapshot: Snapshot. Snapshot properties.
:type snapshot: ~azure.mgmt.netapp.models.VolumeSnapshotProperties
"""

_attribute_map = {
'replication': {'key': 'replication', 'type': 'ReplicationObject'},
'snapshot': {'key': 'snapshot', 'type': 'VolumeSnapshotProperties'},
}

def __init__(self, *, replication=None, **kwargs) -> None:
def __init__(self, *, replication=None, snapshot=None, **kwargs) -> None:
super(VolumePropertiesDataProtection, self).__init__(**kwargs)
self.replication = replication
self.snapshot = snapshot


class VolumePropertiesExportPolicy(Model):
Expand Down Expand Up @@ -1116,3 +1127,19 @@ class VolumeRevert(Model):
def __init__(self, *, snapshot_id: str=None, **kwargs) -> None:
super(VolumeRevert, self).__init__(**kwargs)
self.snapshot_id = snapshot_id


class VolumeSnapshotProperties(Model):
"""Volume Snapshot Properties.

:param snapshot_policy_id: Snapshot Policy ResourceId
:type snapshot_policy_id: str
"""

_attribute_map = {
'snapshot_policy_id': {'key': 'snapshotPolicyId', 'type': 'str'},
}

def __init__(self, *, snapshot_policy_id: str=None, **kwargs) -> None:
super(VolumeSnapshotProperties, self).__init__(**kwargs)
self.snapshot_policy_id = snapshot_policy_id
Loading