From 2288561641651e76043efc0cbdcdd957b1d5ffec Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Thu, 7 Nov 2019 07:22:36 +0000 Subject: [PATCH] Generated from 5fb6d44e6933230e3f88c488bdff8b22438b72cf ANF-327 New swagger for 2019-08-01 API With upstream pull and rerun of prettier --- .../_azure_net_app_files_management_client.py | 10 +- .../azure/mgmt/netapp/models/__init__.py | 6 + .../azure/mgmt/netapp/models/_models.py | 111 +++++++++++++---- .../azure/mgmt/netapp/models/_models_py3.py | 113 ++++++++++++++---- .../azure/mgmt/netapp/operations/__init__.py | 4 +- .../netapp/operations/_accounts_operations.py | 4 +- .../operations/_mount_targets_operations.py | 4 +- ...ons.py => _net_app_resource_operations.py} | 28 ++++- .../mgmt/netapp/operations/_operations.py | 4 +- .../netapp/operations/_pools_operations.py | 4 +- .../operations/_snapshots_operations.py | 6 +- .../netapp/operations/_volumes_operations.py | 4 +- 12 files changed, 235 insertions(+), 63 deletions(-) rename sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/{_azure_net_app_files_management_client_operations.py => _net_app_resource_operations.py} (90%) diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py index b9c08cf2d8c..b8bfda44cc7 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py @@ -13,8 +13,8 @@ from msrest import Serializer, Deserializer from ._configuration import AzureNetAppFilesManagementClientConfiguration -from .operations import AzureNetAppFilesManagementClientOperationsMixin from .operations import Operations +from .operations import NetAppResourceOperations from .operations import AccountsOperations from .operations import PoolsOperations from .operations import VolumesOperations @@ -23,7 +23,7 @@ from . import models -class AzureNetAppFilesManagementClient(AzureNetAppFilesManagementClientOperationsMixin, SDKClient): +class AzureNetAppFilesManagementClient(SDKClient): """Microsoft NetApp Azure Resource Provider specification :ivar config: Configuration for client. @@ -31,6 +31,8 @@ class AzureNetAppFilesManagementClient(AzureNetAppFilesManagementClientOperation :ivar operations: Operations operations :vartype operations: azure.mgmt.netapp.operations.Operations + :ivar net_app_resource: NetAppResource operations + :vartype net_app_resource: azure.mgmt.netapp.operations.NetAppResourceOperations :ivar accounts: Accounts operations :vartype accounts: azure.mgmt.netapp.operations.AccountsOperations :ivar pools: Pools operations @@ -59,12 +61,14 @@ 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-07-01' + self.api_version = '2019-08-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self.operations = Operations( self._client, self.config, self._serialize, self._deserialize) + self.net_app_resource = NetAppResourceOperations( + self._client, self.config, self._serialize, self._deserialize) self.accounts = AccountsOperations( self._client, self.config, self._serialize, self._deserialize) self.pools = PoolsOperations( diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py index 13ad7cf4d73..d1b2b67d8a4 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py @@ -21,6 +21,7 @@ from ._models_py3 import NetAppAccountPatch from ._models_py3 import Operation from ._models_py3 import OperationDisplay + from ._models_py3 import ReplicationObject from ._models_py3 import ResourceNameAvailability from ._models_py3 import ResourceNameAvailabilityRequest from ._models_py3 import ServiceSpecification @@ -29,6 +30,7 @@ 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 except (SyntaxError, ImportError): from ._models import ActiveDirectory @@ -42,6 +44,7 @@ from ._models import NetAppAccountPatch from ._models import Operation from ._models import OperationDisplay + from ._models import ReplicationObject from ._models import ResourceNameAvailability from ._models import ResourceNameAvailabilityRequest from ._models import ServiceSpecification @@ -50,6 +53,7 @@ from ._models import Volume from ._models import VolumePatch from ._models import VolumePatchPropertiesExportPolicy + from ._models import VolumePropertiesDataProtection from ._models import VolumePropertiesExportPolicy from ._paged_models import CapacityPoolPaged from ._paged_models import MountTargetPaged @@ -75,6 +79,7 @@ 'NetAppAccountPatch', 'Operation', 'OperationDisplay', + 'ReplicationObject', 'ResourceNameAvailability', 'ResourceNameAvailabilityRequest', 'ServiceSpecification', @@ -83,6 +88,7 @@ 'Volume', 'VolumePatch', 'VolumePatchPropertiesExportPolicy', + 'VolumePropertiesDataProtection', 'VolumePropertiesExportPolicy', 'OperationPaged', 'NetAppAccountPaged', diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models.py index ff26baf9ab0..9edd349d23c 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models.py @@ -24,8 +24,8 @@ class ActiveDirectory(Model): :type password: str :param domain: Name of the Active Directory domain :type domain: str - :param dns: Comma separated list of DNS server IP addresses for the Active - Directory domain + :param dns: Comma separated list of DNS server IP addresses (IPv4 only) + for the Active Directory domain :type dns: str :param status: Status of the Active Directory :type status: str @@ -77,7 +77,7 @@ class CapacityPool(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar pool_id: poolId. UUID v4 used to identify the Pool :vartype pool_id: str :param size: Required. size. Provisioned size of the pool (in bytes). @@ -108,7 +108,7 @@ class CapacityPool(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'pool_id': {'key': 'properties.poolId', 'type': 'str'}, 'size': {'key': 'properties.size', 'type': 'long'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, @@ -143,7 +143,7 @@ class CapacityPoolPatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :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 . @@ -166,7 +166,7 @@ class CapacityPoolPatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'size': {'key': 'properties.size', 'type': 'long'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, } @@ -316,8 +316,10 @@ class MountTarget(Model): :vartype id: str :ivar name: Resource name :vartype name: str + :ivar type: Resource type + :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar mount_target_id: mountTargetId. UUID v4 used to identify the MountTarget :vartype mount_target_id: str @@ -351,6 +353,7 @@ class MountTarget(Model): 'location': {'required': True}, 'id': {'readonly': True}, 'name': {'readonly': True}, + 'type': {'readonly': True}, '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}, @@ -361,7 +364,8 @@ class MountTarget(Model): 'location': {'key': 'location', 'type': 'str'}, 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'mount_target_id': {'key': 'properties.mountTargetId', 'type': 'str'}, 'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, @@ -379,6 +383,7 @@ def __init__(self, **kwargs): self.location = kwargs.get('location', None) self.id = None self.name = None + self.type = None self.tags = kwargs.get('tags', None) self.mount_target_id = None self.file_system_id = kwargs.get('file_system_id', None) @@ -409,7 +414,7 @@ class NetAppAccount(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param active_directories: Active Directories @@ -429,7 +434,7 @@ class NetAppAccount(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'active_directories': {'key': 'properties.activeDirectories', 'type': '[ActiveDirectory]'}, } @@ -460,7 +465,7 @@ class NetAppAccountPatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param active_directories: Active Directories @@ -479,7 +484,7 @@ class NetAppAccountPatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'active_directories': {'key': 'properties.activeDirectories', 'type': '[ActiveDirectory]'}, } @@ -553,6 +558,44 @@ def __init__(self, **kwargs): self.description = kwargs.get('description', None) +class ReplicationObject(Model): + """Replication properties. + + All required parameters must be populated in order to send to Azure. + + :param replication_id: replicationId. Id + :type replication_id: str + :param endpoint_type: Required. endpointType. Indicates whether the local + volume is the source or destination for the Volume Replication + :type endpoint_type: str + :param replication_schedule: Required. replicationSchedule. Schedule + :type replication_schedule: str + :param remote_volume_resource_id: Required. remoteVolumeResourceId. The + resource ID of the remote volume. + :type remote_volume_resource_id: str + """ + + _validation = { + 'endpoint_type': {'required': True}, + 'replication_schedule': {'required': True}, + 'remote_volume_resource_id': {'required': True}, + } + + _attribute_map = { + 'replication_id': {'key': 'replicationId', 'type': 'str'}, + 'endpoint_type': {'key': 'endpointType', 'type': 'str'}, + 'replication_schedule': {'key': 'replicationSchedule', 'type': 'str'}, + 'remote_volume_resource_id': {'key': 'remoteVolumeResourceId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ReplicationObject, self).__init__(**kwargs) + self.replication_id = kwargs.get('replication_id', None) + self.endpoint_type = kwargs.get('endpoint_type', None) + self.replication_schedule = kwargs.get('replication_schedule', None) + self.remote_volume_resource_id = kwargs.get('remote_volume_resource_id', None) + + class ResourceNameAvailability(Model): """Information regarding availability of a resource name. @@ -656,7 +699,7 @@ class Snapshot(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :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 @@ -684,7 +727,7 @@ class Snapshot(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + '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'}, @@ -708,11 +751,11 @@ class SnapshotPatch(Model): """Snapshot patch. :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] """ _attribute_map = { - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, } def __init__(self, **kwargs): @@ -737,7 +780,7 @@ class Volume(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar file_system_id: FileSystem ID. Unique FileSystem Identifier. :vartype file_system_id: str :param creation_token: Required. Creation Token or File Path. A unique @@ -770,6 +813,12 @@ class Volume(Model): :type subnet_id: str :param mount_targets: mountTargets. List of mount targets :type mount_targets: object + :param volume_type: What type of volume is this + :type volume_type: str + :param data_protection: DataProtection. DataProtection volume, can have a + replication object + :type data_protection: + ~azure.mgmt.netapp.models.VolumePropertiesDataProtection """ _validation = { @@ -791,7 +840,7 @@ class Volume(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'}, 'creation_token': {'key': 'properties.creationToken', 'type': 'str'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, @@ -803,6 +852,8 @@ class Volume(Model): 'baremetal_tenant_id': {'key': 'properties.baremetalTenantId', 'type': 'str'}, 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, 'mount_targets': {'key': 'properties.mountTargets', 'type': 'object'}, + 'volume_type': {'key': 'properties.volumeType', 'type': 'str'}, + 'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'}, } def __init__(self, **kwargs): @@ -823,6 +874,8 @@ def __init__(self, **kwargs): self.baremetal_tenant_id = None self.subnet_id = kwargs.get('subnet_id', None) self.mount_targets = kwargs.get('mount_targets', None) + self.volume_type = kwargs.get('volume_type', None) + self.data_protection = kwargs.get('data_protection', None) class VolumePatch(Model): @@ -840,7 +893,7 @@ class VolumePatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :param service_level: serviceLevel. The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'. Default value: "Premium" . @@ -867,7 +920,7 @@ class VolumePatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, 'export_policy': {'key': 'properties.exportPolicy', 'type': 'VolumePatchPropertiesExportPolicy'}, @@ -903,6 +956,24 @@ def __init__(self, **kwargs): self.rules = kwargs.get('rules', None) +class VolumePropertiesDataProtection(Model): + """DataProtection. + + DataProtection volume, can have a replication object. + + :param replication: Replication. Replication properties + :type replication: ~azure.mgmt.netapp.models.ReplicationObject + """ + + _attribute_map = { + 'replication': {'key': 'replication', 'type': 'ReplicationObject'}, + } + + def __init__(self, **kwargs): + super(VolumePropertiesDataProtection, self).__init__(**kwargs) + self.replication = kwargs.get('replication', None) + + class VolumePropertiesExportPolicy(Model): """exportPolicy. diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models_py3.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models_py3.py index b557ff5c738..dfd40377645 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models_py3.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_models_py3.py @@ -24,8 +24,8 @@ class ActiveDirectory(Model): :type password: str :param domain: Name of the Active Directory domain :type domain: str - :param dns: Comma separated list of DNS server IP addresses for the Active - Directory domain + :param dns: Comma separated list of DNS server IP addresses (IPv4 only) + for the Active Directory domain :type dns: str :param status: Status of the Active Directory :type status: str @@ -77,7 +77,7 @@ class CapacityPool(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar pool_id: poolId. UUID v4 used to identify the Pool :vartype pool_id: str :param size: Required. size. Provisioned size of the pool (in bytes). @@ -108,7 +108,7 @@ class CapacityPool(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'pool_id': {'key': 'properties.poolId', 'type': 'str'}, 'size': {'key': 'properties.size', 'type': 'long'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, @@ -143,7 +143,7 @@ class CapacityPoolPatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :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 . @@ -166,7 +166,7 @@ class CapacityPoolPatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'size': {'key': 'properties.size', 'type': 'long'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, } @@ -316,8 +316,10 @@ class MountTarget(Model): :vartype id: str :ivar name: Resource name :vartype name: str + :ivar type: Resource type + :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar mount_target_id: mountTargetId. UUID v4 used to identify the MountTarget :vartype mount_target_id: str @@ -351,6 +353,7 @@ class MountTarget(Model): 'location': {'required': True}, 'id': {'readonly': True}, 'name': {'readonly': True}, + 'type': {'readonly': True}, '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}, @@ -361,7 +364,8 @@ class MountTarget(Model): 'location': {'key': 'location', 'type': 'str'}, 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'mount_target_id': {'key': 'properties.mountTargetId', 'type': 'str'}, 'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, @@ -379,6 +383,7 @@ def __init__(self, *, location: str, file_system_id: str, tags=None, subnet: str self.location = location self.id = None self.name = None + self.type = None self.tags = tags self.mount_target_id = None self.file_system_id = file_system_id @@ -409,7 +414,7 @@ class NetAppAccount(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param active_directories: Active Directories @@ -429,7 +434,7 @@ class NetAppAccount(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'active_directories': {'key': 'properties.activeDirectories', 'type': '[ActiveDirectory]'}, } @@ -460,7 +465,7 @@ class NetAppAccountPatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str :param active_directories: Active Directories @@ -479,7 +484,7 @@ class NetAppAccountPatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'active_directories': {'key': 'properties.activeDirectories', 'type': '[ActiveDirectory]'}, } @@ -553,6 +558,44 @@ def __init__(self, *, provider: str=None, resource: str=None, operation: str=Non self.description = description +class ReplicationObject(Model): + """Replication properties. + + All required parameters must be populated in order to send to Azure. + + :param replication_id: replicationId. Id + :type replication_id: str + :param endpoint_type: Required. endpointType. Indicates whether the local + volume is the source or destination for the Volume Replication + :type endpoint_type: str + :param replication_schedule: Required. replicationSchedule. Schedule + :type replication_schedule: str + :param remote_volume_resource_id: Required. remoteVolumeResourceId. The + resource ID of the remote volume. + :type remote_volume_resource_id: str + """ + + _validation = { + 'endpoint_type': {'required': True}, + 'replication_schedule': {'required': True}, + 'remote_volume_resource_id': {'required': True}, + } + + _attribute_map = { + 'replication_id': {'key': 'replicationId', 'type': 'str'}, + 'endpoint_type': {'key': 'endpointType', 'type': 'str'}, + 'replication_schedule': {'key': 'replicationSchedule', 'type': 'str'}, + 'remote_volume_resource_id': {'key': 'remoteVolumeResourceId', 'type': 'str'}, + } + + def __init__(self, *, endpoint_type: str, replication_schedule: str, remote_volume_resource_id: str, replication_id: str=None, **kwargs) -> None: + super(ReplicationObject, self).__init__(**kwargs) + self.replication_id = replication_id + self.endpoint_type = endpoint_type + self.replication_schedule = replication_schedule + self.remote_volume_resource_id = remote_volume_resource_id + + class ResourceNameAvailability(Model): """Information regarding availability of a resource name. @@ -656,7 +699,7 @@ class Snapshot(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :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 @@ -684,7 +727,7 @@ class Snapshot(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + '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'}, @@ -708,11 +751,11 @@ class SnapshotPatch(Model): """Snapshot patch. :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] """ _attribute_map = { - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, } def __init__(self, *, tags=None, **kwargs) -> None: @@ -737,7 +780,7 @@ class Volume(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :ivar file_system_id: FileSystem ID. Unique FileSystem Identifier. :vartype file_system_id: str :param creation_token: Required. Creation Token or File Path. A unique @@ -770,6 +813,12 @@ class Volume(Model): :type subnet_id: str :param mount_targets: mountTargets. List of mount targets :type mount_targets: object + :param volume_type: What type of volume is this + :type volume_type: str + :param data_protection: DataProtection. DataProtection volume, can have a + replication object + :type data_protection: + ~azure.mgmt.netapp.models.VolumePropertiesDataProtection """ _validation = { @@ -791,7 +840,7 @@ class Volume(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'file_system_id': {'key': 'properties.fileSystemId', 'type': 'str'}, 'creation_token': {'key': 'properties.creationToken', 'type': 'str'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, @@ -803,9 +852,11 @@ class Volume(Model): 'baremetal_tenant_id': {'key': 'properties.baremetalTenantId', 'type': 'str'}, 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, 'mount_targets': {'key': 'properties.mountTargets', 'type': 'object'}, + 'volume_type': {'key': 'properties.volumeType', 'type': 'str'}, + 'data_protection': {'key': 'properties.dataProtection', 'type': 'VolumePropertiesDataProtection'}, } - 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, **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, **kwargs) -> None: super(Volume, self).__init__(**kwargs) self.location = location self.id = None @@ -823,6 +874,8 @@ def __init__(self, *, location: str, creation_token: str, subnet_id: str, tags=N self.baremetal_tenant_id = None self.subnet_id = subnet_id self.mount_targets = mount_targets + self.volume_type = volume_type + self.data_protection = data_protection class VolumePatch(Model): @@ -840,7 +893,7 @@ class VolumePatch(Model): :ivar type: Resource type :vartype type: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :param service_level: serviceLevel. The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'. Default value: "Premium" . @@ -867,7 +920,7 @@ class VolumePatch(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': 'object'}, + 'tags': {'key': 'tags', 'type': '{str}'}, 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, 'export_policy': {'key': 'properties.exportPolicy', 'type': 'VolumePatchPropertiesExportPolicy'}, @@ -903,6 +956,24 @@ def __init__(self, *, rules=None, **kwargs) -> None: self.rules = rules +class VolumePropertiesDataProtection(Model): + """DataProtection. + + DataProtection volume, can have a replication object. + + :param replication: Replication. Replication properties + :type replication: ~azure.mgmt.netapp.models.ReplicationObject + """ + + _attribute_map = { + 'replication': {'key': 'replication', 'type': 'ReplicationObject'}, + } + + def __init__(self, *, replication=None, **kwargs) -> None: + super(VolumePropertiesDataProtection, self).__init__(**kwargs) + self.replication = replication + + class VolumePropertiesExportPolicy(Model): """exportPolicy. diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/__init__.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/__init__.py index 1cc05160eae..4c58026e23e 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/__init__.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/__init__.py @@ -10,19 +10,19 @@ # -------------------------------------------------------------------------- from ._operations import Operations +from ._net_app_resource_operations import NetAppResourceOperations from ._accounts_operations import AccountsOperations from ._pools_operations import PoolsOperations from ._volumes_operations import VolumesOperations from ._mount_targets_operations import MountTargetsOperations from ._snapshots_operations import SnapshotsOperations -from ._azure_net_app_files_management_client_operations import AzureNetAppFilesManagementClientOperationsMixin __all__ = [ 'Operations', + 'NetAppResourceOperations', 'AccountsOperations', 'PoolsOperations', 'VolumesOperations', 'MountTargetsOperations', 'SnapshotsOperations', - 'AzureNetAppFilesManagementClientOperationsMixin', ] diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_accounts_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_accounts_operations.py index 1fbf6995b91..cab47303ddd 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_accounts_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_accounts_operations.py @@ -27,7 +27,7 @@ class AccountsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_mount_targets_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_mount_targets_operations.py index 62d57aa161c..0f9d301cdc0 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_mount_targets_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_mount_targets_operations.py @@ -25,7 +25,7 @@ class MountTargetsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_azure_net_app_files_management_client_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_net_app_resource_operations.py similarity index 90% rename from sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_azure_net_app_files_management_client_operations.py rename to sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_net_app_resource_operations.py index c68b29b3f48..1fb54afe37c 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_azure_net_app_files_management_client_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_net_app_resource_operations.py @@ -9,15 +9,35 @@ # regenerated. # -------------------------------------------------------------------------- +import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.polling import LROPoller, NoPolling -from msrestazure.polling.arm_polling import ARMPolling + from .. import models -import uuid -class AzureNetAppFilesManagementClientOperationsMixin(object): +class NetAppResourceOperations(object): + """NetAppResourceOperations operations. + + You should not instantiate directly this class, but create a Client instance that will create it for you and attach it as attribute. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2019-08-01" + + self.config = config def check_name_availability( self, location, name, type, resource_group, custom_headers=None, raw=False, **operation_config): diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_operations.py index 9110970272c..a931726c178 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_operations.py @@ -25,7 +25,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_pools_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_pools_operations.py index c0c61e0b836..19b47e8b45d 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_pools_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_pools_operations.py @@ -27,7 +27,7 @@ class PoolsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_snapshots_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_snapshots_operations.py index 3f923b0e623..482d61b49eb 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_snapshots_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_snapshots_operations.py @@ -27,7 +27,7 @@ class SnapshotsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config @@ -324,7 +324,7 @@ def update( :param snapshot_name: The name of the mount target :type snapshot_name: str :param tags: Resource tags - :type tags: object + :type tags: dict[str, str] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response diff --git a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_volumes_operations.py b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_volumes_operations.py index 45ad3859c50..cffd7df22b3 100644 --- a/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_volumes_operations.py +++ b/sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/operations/_volumes_operations.py @@ -27,7 +27,7 @@ class VolumesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-07-01". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-08-01". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-07-01" + self.api_version = "2019-08-01" self.config = config