Skip to content

Commit da124ea

Browse files
audunnVeryEarly
andauthored
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 <[email protected]> Co-authored-by: Yabo Hu <[email protected]>
1 parent 02236a7 commit da124ea

File tree

63 files changed

+36437
-24421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+36437
-24421
lines changed

src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.10.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.11.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
1616
</ItemGroup>
1717

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,26 @@ public BackupTests(Xunit.Abstractions.ITestOutputHelper output)
2727
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2828
}
2929

30-
[Fact(Skip = "Backup service side bug causes this to fail, re-enable when fixed")]
30+
[Fact]
3131
[Trait(Category.AcceptanceType, Category.CheckIn)]
3232
public void TestBackupCrud()
3333
{
3434
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupCrud");
3535
}
3636

37-
[Fact(Skip = "Backup service side bug causes this to fail, re-enable when fixed")]
37+
[Fact]
3838
[Trait(Category.AcceptanceType, Category.CheckIn)]
3939
public void TestBackupPipelines()
4040
{
4141
TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPipelines");
4242
}
43+
44+
[Fact]
45+
[Trait(Category.AcceptanceType, Category.CheckIn)]
46+
public void TestVolumeBackupStatusCrud()
47+
{
48+
TestController.NewInstance.RunPowerShellTest(_logger, "Test-VolumeBackupStatus");
49+
}
50+
4351
}
4452
}

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupTests.ps1

Lines changed: 247 additions & 41 deletions
Large diffs are not rendered by default.

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotTests.ps1

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ function Test-SnapshotCrud
3131
$usageThreshold = 100 * $gibibyte
3232
$doubleUsage = 2 * $usageThreshold
3333
#$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus2euap" -UseCanonical
34-
$resourceLocation = "eastus2euap"
34+
#$resourceLocation = "eastus2euap"
35+
$resourceLocation = "eastus"
36+
3537
$subnetName = "default"
3638
$standardPoolSize = 4398046511104
3739
$serviceLevel = "Premium"
@@ -119,7 +121,8 @@ function Test-SnapshotPipelines
119121
$usageThreshold = 100 * $gibibyte
120122
$doubleUsage = 2 * $usageThreshold
121123
#$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
122-
$resourceLocation = "eastus2euap"
124+
$resourceLocation = "eastus"
125+
#$resourceLocation = "eastus2euap"
123126
$subnetName = "default"
124127
$poolSize = 4398046511104
125128
$serviceLevel = "Premium"
@@ -181,8 +184,9 @@ function Test-CreateVolumeFromSnapshot
181184
$gibibyte = 1024 * 1024 * 1024
182185
$usageThreshold = 100 * $gibibyte
183186
$doubleUsage = 2 * $usageThreshold
184-
$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
185-
$resourceLocation = "eastus2euap"
187+
#$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
188+
#$resourceLocation = "eastus2euap"
189+
$resourceLocation = "eastus"
186190
$subnetName = "default"
187191
$standardPoolSize = 4398046511104
188192
$serviceLevel = "Premium"
@@ -256,7 +260,8 @@ function Test-RestoreVolumeFromSnapshot
256260
$usageThreshold = 100 * $gibibyte
257261
$doubleUsage = 2 * $usageThreshold
258262
#$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
259-
$resourceLocation = "eastus2euap"
263+
#$resourceLocation = "eastus2euap"
264+
$resourceLocation = "eastus"
260265
$subnetName = "default"
261266
$standardPoolSize = 4398046511104
262267
$serviceLevel = "Premium"

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ function Test-VolumeCrud
3333
$usageThreshold = 100 * $gibibyte
3434
$doubleUsage = 2 * $usageThreshold
3535
#$resourceLocation = Get-ProviderLocation "Microsoft.NetApp" "eastus" -UseCanonical
36-
$resourceLocation = "eastus2euap"
36+
#$resourceLocation = "eastus2euap"
37+
$resourceLocation = "eastus"
38+
3739
$subnetName = "default"
3840
$poolSize = 4398046511104
3941
$serviceLevel = "Premium"
@@ -335,7 +337,7 @@ function Test-VolumeReplication
335337
# create virtual network destination
336338
$virtualNetwork = New-AzVirtualNetwork -ResourceGroupName $destResourceGroup -Location $destResourceLocation -Name $destVnetName -AddressPrefix 10.0.0.0/16
337339
$delegation = New-AzDelegation -Name "netAppVolumes" -ServiceName "Microsoft.Netapp/volumes"
338-
Add-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork -AddressPrefix "10.0.2.0/24" -Delegation $delegation | Set-AzVirtualNetwork
340+
Add-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork -AddressPrefix "10.0.3.0/24" -Delegation $delegation | Set-AzVirtualNetwork
339341

340342
# create accounts for source and destination
341343
$srcRetrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $srcResourceGroup -Location $srcResourceLocation -AccountName $srcAccName
@@ -601,4 +603,4 @@ function Test-VolumePipelines
601603
# Cleanup
602604
Clean-ResourceGroup $resourceGroup
603605
}
604-
}
606+
}

0 commit comments

Comments
 (0)