Update API version to 2020-12-01 (#14742)

* Update to 2020-12-01 * Change exception thrown * BackupStatus name mandatory * Update recordings * Backup fixes * Bump az.account * Update help markdown * Update removebackup * Enable backup tests Co-authored-by: Audunn Baldvinsson <audunn.baldvinsson@netapp.com> Co-authored-by: Yabo Hu <yabhu@microsoft.com>
Azure · Apr 28, 2021 · da124ea · da124ea
1 parent 02236a7
commit da124ea
Show file tree

Hide file tree

Showing 63 changed files with 36,437 additions and 24,421 deletions.
diff --git a/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj b/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.10.0" />
+    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.11.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
   </ItemGroup>
 

diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.cs b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.cs
@@ -27,18 +27,26 @@ public BackupTests(Xunit.Abstractions.ITestOutputHelper output)
             ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
 
-        [Fact(Skip = "Backup service side bug causes this to fail, re-enable when fixed")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestBackupCrud()
         {
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupCrud");
         }
 
-        [Fact(Skip = "Backup service side bug causes this to fail, re-enable when fixed")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestBackupPipelines()
         {
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPipelines");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVolumeBackupStatusCrud()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-VolumeBackupStatus");
+        }
+
     }
 }
diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.ps1
diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotTests.ps1
@@ -31,7 +31,9 @@ function Test-SnapshotCrud
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
     #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus2euap" -UseCanonical
-    $resourceLocation = "eastus2euap"
+    #$resourceLocation = "eastus2euap"
+    $resourceLocation = "eastus"
+
     $subnetName = "default"
     $standardPoolSize = 4398046511104
     $serviceLevel = "Premium"
@@ -119,7 +121,8 @@ function Test-SnapshotPipelines
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
     #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
-    $resourceLocation = "eastus2euap"
+    $resourceLocation = "eastus"
+    #$resourceLocation = "eastus2euap"
     $subnetName = "default"
     $poolSize = 4398046511104
     $serviceLevel = "Premium"
@@ -181,8 +184,9 @@ function Test-CreateVolumeFromSnapshot
     $gibibyte = 1024 * 1024 * 1024
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
-    $resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
-    $resourceLocation = "eastus2euap"
+    #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
+    #$resourceLocation = "eastus2euap"
+    $resourceLocation = "eastus"
     $subnetName = "default"
     $standardPoolSize = 4398046511104
     $serviceLevel = "Premium"
@@ -256,7 +260,8 @@ function Test-RestoreVolumeFromSnapshot
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
     #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
-    $resourceLocation = "eastus2euap"
+    #$resourceLocation = "eastus2euap"
+    $resourceLocation = "eastus"
     $subnetName = "default"
     $standardPoolSize = 4398046511104
     $serviceLevel = "Premium"

diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1
@@ -33,7 +33,9 @@ function Test-VolumeCrud
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
     #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
-    $resourceLocation = "eastus2euap"
+    #$resourceLocation = "eastus2euap"
+    $resourceLocation = "eastus"
+
     $subnetName = "default"
     $poolSize = 4398046511104
     $serviceLevel = "Premium"
@@ -335,7 +337,7 @@ function Test-VolumeReplication
         # create virtual network destination
         $virtualNetwork = New-AzVirtualNetwork -ResourceGroupName $destResourceGroup -Location $destResourceLocation -Name $destVnetName -AddressPrefix 10.0.0.0/16
         $delegation = New-AzDelegation -Name "netAppVolumes" -ServiceName "Microsoft.Netapp/volumes"
-        Add-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork -AddressPrefix "10.0.2.0/24" -Delegation $delegation | Set-AzVirtualNetwork
+        Add-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork -AddressPrefix "10.0.3.0/24" -Delegation $delegation | Set-AzVirtualNetwork
 
         # create accounts for source and destination
         $srcRetrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $srcResourceGroup -Location $srcResourceLocation -AccountName $srcAccName
@@ -601,4 +603,4 @@ function Test-VolumePipelines
         # Cleanup
         Clean-ResourceGroup $resourceGroup
     }
-}
+}