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

[AutoPR azure-mgmt-netapp] Fix missing type in netapp, update on PR 8170 - ANF-4290ClarifyMsftChangeToANFSwagger #649

Closed
wants to merge 1 commit into from
Closed

[AutoPR azure-mgmt-netapp] Fix missing type in netapp, update on PR 8170 - ANF-4290ClarifyMsftChangeToANFSwagger #649

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
7 changes: 1 addition & 6 deletions 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 @@ -18,7 +18,6 @@
from .operations import AccountsOperations
from .operations import PoolsOperations
from .operations import VolumesOperations
from .operations import MountTargetsOperations
from .operations import SnapshotsOperations
from . import models

Expand All @@ -39,8 +38,6 @@ class AzureNetAppFilesManagementClient(SDKClient):
:vartype pools: azure.mgmt.netapp.operations.PoolsOperations
:ivar volumes: Volumes operations
:vartype volumes: azure.mgmt.netapp.operations.VolumesOperations
:ivar mount_targets: MountTargets operations
:vartype mount_targets: azure.mgmt.netapp.operations.MountTargetsOperations
:ivar snapshots: Snapshots operations
:vartype snapshots: azure.mgmt.netapp.operations.SnapshotsOperations

Expand All @@ -61,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-10-01'
self.api_version = '2019-11-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

Expand All @@ -75,7 +72,5 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.volumes = VolumesOperations(
self._client, self.config, self._serialize, self._deserialize)
self.mount_targets = MountTargetsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.snapshots = SnapshotsOperations(
self._client, self.config, self._serialize, self._deserialize)
11 changes: 6 additions & 5 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 @@ -18,6 +18,7 @@
from ._models_py3 import ExportPolicyRule
from ._models_py3 import MetricSpecification
from ._models_py3 import MountTarget
from ._models_py3 import MountTargetList
from ._models_py3 import NetAppAccount
from ._models_py3 import NetAppAccountPatch
from ._models_py3 import Operation
Expand All @@ -28,12 +29,12 @@
from ._models_py3 import ResourceNameAvailabilityRequest
from ._models_py3 import ServiceSpecification
from ._models_py3 import Snapshot
from ._models_py3 import SnapshotPatch
from ._models_py3 import Volume
from ._models_py3 import VolumePatch
from ._models_py3 import VolumePatchPropertiesExportPolicy
from ._models_py3 import VolumePropertiesDataProtection
from ._models_py3 import VolumePropertiesExportPolicy
from ._models_py3 import VolumeRevert
except (SyntaxError, ImportError):
from ._models import ActiveDirectory
from ._models import AuthorizeRequest
Expand All @@ -43,6 +44,7 @@
from ._models import ExportPolicyRule
from ._models import MetricSpecification
from ._models import MountTarget
from ._models import MountTargetList
from ._models import NetAppAccount
from ._models import NetAppAccountPatch
from ._models import Operation
Expand All @@ -53,14 +55,13 @@
from ._models import ResourceNameAvailabilityRequest
from ._models import ServiceSpecification
from ._models import Snapshot
from ._models import SnapshotPatch
from ._models import Volume
from ._models import VolumePatch
from ._models import VolumePatchPropertiesExportPolicy
from ._models import VolumePropertiesDataProtection
from ._models import VolumePropertiesExportPolicy
from ._models import VolumeRevert
from ._paged_models import CapacityPoolPaged
from ._paged_models import MountTargetPaged
from ._paged_models import NetAppAccountPaged
from ._paged_models import OperationPaged
from ._paged_models import SnapshotPaged
Expand All @@ -84,6 +85,7 @@
'ExportPolicyRule',
'MetricSpecification',
'MountTarget',
'MountTargetList',
'NetAppAccount',
'NetAppAccountPatch',
'Operation',
Expand All @@ -94,17 +96,16 @@
'ResourceNameAvailabilityRequest',
'ServiceSpecification',
'Snapshot',
'SnapshotPatch',
'Volume',
'VolumePatch',
'VolumePatchPropertiesExportPolicy',
'VolumePropertiesDataProtection',
'VolumePropertiesExportPolicy',
'VolumeRevert',
'OperationPaged',
'NetAppAccountPaged',
'CapacityPoolPaged',
'VolumePaged',
'MountTargetPaged',
'SnapshotPaged',
'InAvailabilityReasonType',
'CheckNameResourceTypes',
Expand Down
94 changes: 41 additions & 53 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 @@ -35,6 +35,9 @@ class ActiveDirectory(Model):
:param organizational_unit: The Organizational Unit (OU) within the
Windows Active Directory
:type organizational_unit: str
:param site: The Active Directory site the service will limit Domain
Controller discovery to
:type site: str
"""

_attribute_map = {
Expand All @@ -46,6 +49,7 @@ class ActiveDirectory(Model):
'status': {'key': 'status', 'type': 'str'},
'smb_server_name': {'key': 'smbServerName', 'type': 'str'},
'organizational_unit': {'key': 'organizationalUnit', 'type': 'str'},
'site': {'key': 'site', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand All @@ -58,12 +62,13 @@ def __init__(self, **kwargs):
self.status = kwargs.get('status', None)
self.smb_server_name = kwargs.get('smb_server_name', None)
self.organizational_unit = kwargs.get('organizational_unit', None)
self.site = kwargs.get('site', None)


class AuthorizeRequest(Model):
"""Authorize request.

:param remote_volume_resource_id: Resource id
:param remote_volume_resource_id: Resource id of the remote volume
:type remote_volume_resource_id: str
"""

Expand Down Expand Up @@ -344,25 +349,9 @@ class MountTarget(Model):
: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
:ivar provisioning_state: Azure lifecycle management
:vartype provisioning_state: str
"""

_validation = {
Expand All @@ -373,7 +362,6 @@ class MountTarget(Model):
'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},
'provisioning_state': {'readonly': True},
}

_attribute_map = {
Expand All @@ -385,13 +373,7 @@ 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'},
'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, **kwargs):
Expand All @@ -404,13 +386,23 @@ def __init__(self, **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)
self.provisioning_state = None


class MountTargetList(Model):
"""List of Mount Targets.

:param value: A list of Mount targets
:type value: list[~azure.mgmt.netapp.models.MountTarget]
"""

_attribute_map = {
'value': {'key': 'value', 'type': '[MountTarget]'},
}

def __init__(self, **kwargs):
super(MountTargetList, self).__init__(**kwargs)
self.value = kwargs.get('value', None)


class NetAppAccount(Model):
Expand Down Expand Up @@ -757,8 +749,6 @@ class Snapshot(Model):
:vartype name: str
:ivar type: Resource type
:vartype type: str
:param tags: Resource tags
:type tags: dict[str, 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
Expand Down Expand Up @@ -786,7 +776,6 @@ class Snapshot(Model):
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'snapshot_id': {'key': 'properties.snapshotId', 'type': 'str'},
'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'},
'created': {'key': 'properties.created', 'type': 'iso-8601'},
Expand All @@ -799,29 +788,12 @@ def __init__(self, **kwargs):
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)
self.created = None
self.provisioning_state = None


class SnapshotPatch(Model):
"""Snapshot patch.

:param tags: Resource tags
:type tags: dict[str, str]
"""

_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
}

def __init__(self, **kwargs):
super(SnapshotPatch, self).__init__(**kwargs)
self.tags = kwargs.get('tags', None)


class Volume(Model):
"""Volume resource.

Expand Down Expand Up @@ -871,7 +843,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: object
:type mount_targets: list[~azure.mgmt.netapp.models.MountTargetList]
:param volume_type: What type of volume is this
:type volume_type: str
:param data_protection: DataProtection. DataProtection type volumes
Expand All @@ -888,7 +860,7 @@ class Volume(Model):
'name': {'readonly': True},
'type': {'readonly': True},
'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},
'creation_token': {'required': True, 'max_length': 80, 'min_length': 1, 'pattern': r'^[a-zA-Z][a-zA-Z0-9\-]{0,79}$'},
'usage_threshold': {'required': True, 'maximum': 109951162777600, 'minimum': 107374182400},
'provisioning_state': {'readonly': True},
'snapshot_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}|(\\?([^\/]*[\/])*)([^\/]+)$'},
Expand All @@ -912,7 +884,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': 'object'},
'mount_targets': {'key': 'properties.mountTargets', 'type': '[MountTargetList]'},
'volume_type': {'key': 'properties.volumeType', 'type': 'str'},
'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'},
'is_restoring': {'key': 'properties.isRestoring', 'type': 'bool'},
Expand Down Expand Up @@ -1054,3 +1026,19 @@ class VolumePropertiesExportPolicy(Model):
def __init__(self, **kwargs):
super(VolumePropertiesExportPolicy, self).__init__(**kwargs)
self.rules = kwargs.get('rules', None)


class VolumeRevert(Model):
"""revert a volume to the snapshot.

:param snapshot_id: Resource id of the snapshot
:type snapshot_id: str
"""

_attribute_map = {
'snapshot_id': {'key': 'snapshotId', 'type': 'str'},
}

def __init__(self, **kwargs):
super(VolumeRevert, self).__init__(**kwargs)
self.snapshot_id = kwargs.get('snapshot_id', None)
Loading