CodeGen from PR 13814 in Azure/azure-rest-api-specs

Merge d72c9fff3ad979a09f78709e449ce251710fee4e into a9bba35

sdk/netapp/azure-mgmt-netapp/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/netapp/azure-mgmt-netapp/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "f119944c290142d0ea71fbfab759c4ec468a0973",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/netapp/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
+  "readme": "specification/netapp/resource-manager/readme.md"
+}

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_azure_net_app_files_management_client.py

@@ -20,8 +20,8 @@
 from .operations import VolumesOperations
 from .operations import SnapshotsOperations
 from .operations import SnapshotPoliciesOperations
-from .operations import AccountBackupsOperations
 from .operations import BackupsOperations
+from .operations import AccountBackupsOperations
 from .operations import BackupPoliciesOperations
 from .operations import VaultsOperations
 from . import models
@@ -47,10 +47,10 @@ class AzureNetAppFilesManagementClient(SDKClient):
     :vartype snapshots: azure.mgmt.netapp.operations.SnapshotsOperations
     :ivar snapshot_policies: SnapshotPolicies operations
     :vartype snapshot_policies: azure.mgmt.netapp.operations.SnapshotPoliciesOperations
-    :ivar account_backups: AccountBackups operations
-    :vartype account_backups: azure.mgmt.netapp.operations.AccountBackupsOperations
     :ivar backups: Backups operations
     :vartype backups: azure.mgmt.netapp.operations.BackupsOperations
+    :ivar account_backups: AccountBackups operations
+    :vartype account_backups: azure.mgmt.netapp.operations.AccountBackupsOperations
     :ivar backup_policies: BackupPolicies operations
     :vartype backup_policies: azure.mgmt.netapp.operations.BackupPoliciesOperations
     :ivar vaults: Vaults operations
@@ -73,7 +73,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 = '2020-11-01'
+        self.api_version = '2021-02-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -91,10 +91,10 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.snapshot_policies = SnapshotPoliciesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.account_backups = AccountBackupsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.backups = BackupsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.account_backups = AccountBackupsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.backup_policies = BackupPoliciesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.vaults = VaultsOperations(

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/__init__.py

@@ -18,7 +18,7 @@
     from ._models_py3 import BackupPolicy
     from ._models_py3 import BackupPolicyDetails
     from ._models_py3 import BackupPolicyPatch
-    from ._models_py3 import BackupsList
+    from ._models_py3 import BackupStatus
     from ._models_py3 import BreakReplicationRequest
     from ._models_py3 import CapacityPool
     from ._models_py3 import CapacityPoolPatch
@@ -39,6 +39,7 @@
     from ._models_py3 import QuotaAvailabilityRequest
     from ._models_py3 import ReplicationObject
     from ._models_py3 import ReplicationStatus
+    from ._models_py3 import ResourceIdentity
     from ._models_py3 import ResourceNameAvailabilityRequest
     from ._models_py3 import ServiceSpecification
     from ._models_py3 import Snapshot
@@ -68,7 +69,7 @@
     from ._models import BackupPolicy
     from ._models import BackupPolicyDetails
     from ._models import BackupPolicyPatch
-    from ._models import BackupsList
+    from ._models import BackupStatus
     from ._models import BreakReplicationRequest
     from ._models import CapacityPool
     from ._models import CapacityPoolPatch
@@ -89,6 +90,7 @@
     from ._models import QuotaAvailabilityRequest
     from ._models import ReplicationObject
     from ._models import ReplicationStatus
+    from ._models import ResourceIdentity
     from ._models import ResourceNameAvailabilityRequest
     from ._models import ServiceSpecification
     from ._models import Snapshot
@@ -123,7 +125,6 @@
     CheckNameResourceTypes,
     CheckQuotaNameResourceTypes,
     ActiveDirectoryStatus,
-    KeySource,
     CreatedByType,
     ServiceLevel,
     QosType,
@@ -132,6 +133,7 @@
     SecurityStyle,
     RelationshipStatus,
     MirrorState,
+    BackupType,
 )
 
 __all__ = [
@@ -143,7 +145,7 @@
     'BackupPolicy',
     'BackupPolicyDetails',
     'BackupPolicyPatch',
-    'BackupsList',
+    'BackupStatus',
     'BreakReplicationRequest',
     'CapacityPool',
     'CapacityPoolPatch',
@@ -164,6 +166,7 @@
     'QuotaAvailabilityRequest',
     'ReplicationObject',
     'ReplicationStatus',
+    'ResourceIdentity',
     'ResourceNameAvailabilityRequest',
     'ServiceSpecification',
     'Snapshot',
@@ -197,7 +200,6 @@
     'CheckNameResourceTypes',
     'CheckQuotaNameResourceTypes',
     'ActiveDirectoryStatus',
-    'KeySource',
     'CreatedByType',
     'ServiceLevel',
     'QosType',
@@ -206,4 +208,5 @@
     'SecurityStyle',
     'RelationshipStatus',
     'MirrorState',
+    'BackupType',
 ]

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/models/_azure_net_app_files_management_client_enums.py

@@ -43,11 +43,6 @@ class ActiveDirectoryStatus(str, Enum):
     updating = "Updating"  #: Active Directory Updating
 
 
-class KeySource(str, Enum):
-
-    microsoft_net_app = "Microsoft.NetApp"  #: The service manages the keys.
-
-
 class CreatedByType(str, Enum):
 
     user = "User"
@@ -99,3 +94,9 @@ class MirrorState(str, Enum):
     uninitialized = "Uninitialized"
     mirrored = "Mirrored"
     broken = "Broken"
+
+
+class BackupType(str, Enum):
+
+    manual = "Manual"  #: Manual backup
+    scheduled = "Scheduled"  #: Scheduled backup