Skip to content

Commit 4ac5439

Browse files
authored
[NetAppFiles] Update to 2020-09-01 api verison (#14003)
* Update to 2020-09-01 api verison * Update SecurityOperator in singular * Depricate -snapshot parameter * fix changelog, test * Apply 2020-11-01 updates * Update docs * Update online link * Update recordings * Update test & recordings * Update recording * remove en-us from url * uppercase changelog * touch * touch comment * Add CmdletOutputBreakingChange attribute to Get-Vault * Add resourceIdParamweterSet, doc fixes Co-authored-by: Audunn Baldvinsson <[email protected]>
1 parent e9683c1 commit 4ac5439

File tree

62 files changed

+33466
-15696
lines changed

Some content is hidden

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

62 files changed

+33466
-15696
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

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

1818
</Project>

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupPolicyTests.ps1

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,19 @@ function Test-BackupPolicyCrud
6161
#returns 0 atm service side issue
6262
#Assert-AreEqual $yearlyBackupsToKeep $retrievedBackupPolicy.YearlyBackupsToKeep
6363

64+
#update with set
65+
$setDailyBackupsToKeep = 3
66+
$retrievedBackupPolicy = Set-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -Name $backupPolicyName1 -Tag @{$newTagName = $newTagValue} -Enabled -DailyBackupsToKeep $setDailyBackupsToKeep -WeeklyBackupsToKeep $weeklyBackupsToKeep -MonthlyBackupsToKeep $monthlyBackupsToKeep -YearlyBackupsToKeep $yearlyBackupsToKeep
67+
68+
$setDailyBackupsToKeep = Get-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -AccountName $accName1 -Name $backupPolicyName1
69+
Assert-AreEqual $updatedDailyBackupsToKeep $getSetBackupPolicy.DailyBackupsToKeep
70+
71+
6472
$updatedDailyBackupsToKeep = 2
6573
$updatedBackupPolicy = Update-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -Name $backupPolicyName1 -DailyBackupsToKeep $updatedDailyBackupsToKeep
66-
Assert-AreEqual $updatedDailyBackupsToKeep $updatedBackupPolicy.DailyBackupsToKeep
74+
$getUpdatedBackupPolicy = Get-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -AccountName $accName1 -Name $backupPolicyName1
75+
76+
Assert-AreEqual $updatedDailyBackupsToKeep $getUpdatedBackupPolicy.DailyBackupsToKeep
6777

6878
#create second BackupPolicy
6979
$secondBackupPolicy = New-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -Name $backupPolicyName2 -Tag @{$newTagName = $newTagValue} -Enabled -DailyBackupsToKeep $dailyBackupsToKeep -WeeklyBackupsToKeep $weeklyBackupsToKeep -MonthlyBackupsToKeep $monthlyBackupsToKeep -YearlyBackupsToKeep $yearlyBackupsToKeep

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

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

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

37-
[Fact]
37+
[Fact(Skip = "Backup service side bug causes this to fail, re-enable when fixed")]
3838
[Trait(Category.AcceptanceType, Category.CheckIn)]
3939
public void TestBackupPipelines()
4040
{

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

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
14+
1415

1516
<#
1617
.SYNOPSIS
@@ -27,8 +28,11 @@ function Test-BackupCrud
2728
$backupName1 = Get-ResourceName
2829
$backupName2 = Get-ResourceName
2930
$backupPolicyName1 = Get-ResourceName
30-
$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
31-
$backupLocation = "southcentralus"
31+
$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
32+
#$backupLocation = "eastus2euap"
33+
$backupLocation = "southcentralusstage"
34+
$backupVNetLocation = "southcentralus"
35+
#$backupLocation = "centralus"
3236
$label = "powershellBackupTest"
3337
$labelUpdate = "powershellBackupTestUpdate"
3438
$label2 = "powershellBackupTest2"
@@ -66,13 +70,34 @@ function Test-BackupCrud
6670
$protocolTypes = New-Object string[] 1
6771
$protocolTypes[0] = "NFSv3"
6872

73+
function WaitForSucceeded #($sourceOnly)
74+
{
75+
$i = 0
76+
do
77+
{
78+
$sourceVolume = Get-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -AccountName $accName1 -PoolName $poolName -VolumeName $volName1
79+
Start-Sleep -Seconds 10.0
80+
$i++
81+
}
82+
until ($sourceVolume.ProvisioningState -eq "Succeeded" -or $i -eq 3);
83+
}
84+
85+
function SleepDuringRecord
86+
{
87+
if ($env:AZURE_TEST_MODE -eq "Record")
88+
{
89+
Write-Output "Sleep in record mode"
90+
Start-Sleep -Seconds 30.0
91+
}
92+
}
93+
6994
try
7095
{
7196
# create the resource group
72-
New-AzResourceGroup -Name $resourceGroup -Location $backupLocation
97+
New-AzResourceGroup -Name $resourceGroup -Location $backupVNetLocation
7398

7499
# create virtual network
75-
$virtualNetwork = New-AzVirtualNetwork -ResourceGroupName $resourceGroup -Location $backupLocation -Name $vnetName -AddressPrefix 10.0.0.0/16
100+
$virtualNetwork = New-AzVirtualNetwork -ResourceGroupName $resourceGroup -Location $backupVNetLocation -Name $vnetName -AddressPrefix 10.0.0.0/16
76101
$delegation = New-AzDelegation -Name "netAppVolumes" -ServiceName "Microsoft.Netapp/volumes"
77102
Add-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork -AddressPrefix "10.0.1.0/24" -Delegation $delegation | Set-AzVirtualNetwork
78103

@@ -84,7 +109,8 @@ function Test-BackupCrud
84109

85110
# create and check BackupPolicy
86111
$retrievedBackupPolicy = New-AzNetAppFilesBackupPolicy -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -Name $backupPolicyName1 -Tag @{$newTagName = $newTagValue} -Enabled -DailyBackupsToKeep $dailyBackupsToKeep -WeeklyBackupsToKeep $weeklyBackupsToKeep -MonthlyBackupsToKeep $monthlyBackupsToKeep -YearlyBackupsToKeep $yearlyBackupsToKeep
87-
112+
Assert-NotNull $retrievedBackupPolicy.Id
113+
88114
# create pool
89115
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -PoolName $poolName -PoolSize $poolSize -ServiceLevel $serviceLevel
90116

@@ -98,17 +124,25 @@ function Test-BackupCrud
98124
Assert-AreEqual "tagValue1" $retrievedVolume.Tags[$newTagName].ToString()
99125
Assert-NotNull $retrievedVolume.ExportPolicy
100126
Assert-AreEqual '0.0.0.0/0' $retrievedVolume.ExportPolicy.Rules[0].AllowedClients
101-
127+
128+
SleepDuringRecord
129+
WaitForSucceeded
130+
102131
# get check Vaults
103132
$retrievedVaultsList = Get-AzNetAppFilesVault -ResourceGroupName $resourceGroup -AccountName $accName1
104133
$backupObject = @{
105134
VaultId = $retrievedVaultsList[0].Id
106135
BackupEnabled = $true
107136
PolicyEnforced = $true
137+
BackupPolicyId = $retrievedBackupPolicy.Id
108138
}
139+
140+
SleepDuringRecord
141+
WaitForSucceeded
142+
109143
# volume update with backup policy
110144
$retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -PoolName $poolName -VolumeName $volName1 -Backup $backupObject
111-
145+
SleepDuringRecord
112146
# create and check Backup
113147
$retrievedBackup = New-AzNetAppFilesBackup -ResourceGroupName $resourceGroup -Location $backupLocation -AccountName $accName1 -PoolName $poolName -VolumeName $volName1 -Name $backupName1 -Label $label
114148
Assert-AreEqual "$accName1/$poolName/$volName1/$backupName1" $retrievedBackup.Name

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/PoolTests.ps1

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ function Test-PoolCrud
2020
{
2121
$resourceGroup = Get-ResourceGroupName
2222
$accName = Get-ResourceName
23-
$poolName1 = Get-ResourceName
24-
$poolName2 = Get-ResourceName
23+
$poolName1 = Get-ResourceName
24+
$poolName2 = Get-ResourceName
25+
$poolName3 = Get-ResourceName
2526
$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
2627
$poolSize = 4398046511104
2728
$serviceLevel = "Premium"
@@ -42,13 +43,21 @@ function Test-PoolCrud
4243
Assert-AreEqual $serviceLevel $retrievedPool.ServiceLevel
4344
Assert-AreEqual True $retrievedPool.Tags.ContainsKey($newTagName)
4445
Assert-AreEqual "tagValue1" $retrievedPool.Tags[$newTagName].ToString()
46+
47+
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName1
48+
Assert-AreEqual "$accName/$poolName1" $retrievedPool.Name
49+
50+
#update with set
51+
$setNewTagValue = "tagValue1-set"
52+
$retrievedPool = Set-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName1 -PoolSize $poolSize -ServiceLevel $serviceLevel -Tag @{$newTagName = $setNewTagValue}
53+
Assert-AreEqual $setNewTagValue $retrievedPool.Tags[$newTagName].ToString()
4554

4655
# create and check pool 2 using the confirm flag
4756
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel $serviceLevel -Confirm:$false
4857
Assert-AreEqual "$accName/$poolName2" $retrievedPool.Name
4958

5059
# create and check pool 3 using the WhatIf - it should not be created
51-
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel $serviceLevel -WhatIf
60+
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName3 -PoolSize $poolSize -ServiceLevel $serviceLevel -WhatIf
5261

5362
# get and check pools by group (list)
5463
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
@@ -134,7 +143,8 @@ function Test-PoolPipelines
134143

135144
# delete a pool by piping from account
136145
Get-AnfAccount -ResourceGroupName $resourceGroup -Name $accName | Remove-AnfPool -Name $poolName1
137-
146+
Start-Sleep -Seconds 20.0
147+
138148
# recreate two pools
139149
New-AnfPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -Name $PoolName1 -PoolSize $poolSize -ServiceLevel $serviceLevel
140150

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotPolicyTests.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@ function Test-SnapshotPolicyCrud
7373
Assert-AreEqual $weeklySchedule["Day"] $getRetrievedSnapshotPolicy.WeeklySchedule.Day
7474
Assert-AreEqual $monthlySchedule["DaysOfMonth"] $getRetrievedSnapshotPolicy.MonthlySchedule.DaysOfMonth
7575

76+
#update with set
77+
$hourlySchedule2 = @{
78+
Minute = 2
79+
SnapshotsToKeep = 3
80+
}
81+
#Check update with set
82+
$setRetrievedSnapshotPolicy = Set-AzNetAppFilesSnapshotPolicy -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -Name $snapshotPolicyName1 -Enabled -HourlySchedule $hourlySchedule -DailySchedule $dailySchedule -WeeklySchedule $weeklySchedule -MonthlySchedule $monthlySchedule
83+
Assert-AreEqual $hourlySchedule["Minute"] $setRetrievedSnapshotPolicy.HourlySchedule.Minute
84+
7685
$hourlySchedule2 = @{
7786
Minute = 1
7887
SnapshotsToKeep = 3

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ function Test-CreateVolumeFromSnapshot
175175
$accName = Get-ResourceName
176176
$poolName = Get-ResourceName
177177
$volName = Get-ResourceName
178+
$volName2 = Get-ResourceName
178179
$snName1 = Get-ResourceName
179180
$snName2 = Get-ResourceName
180181
$gibibyte = 1024 * 1024 * 1024

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,21 @@ function Test-VolumeReplication
290290
{
291291
do
292292
{
293-
$replicationStatus = Get-AnfReplicationStatus -ResourceGroupName $destResourceGroup -AccountName $destAccName -PoolName $destPoolName -VolumeName $destVolName
294-
293+
try
294+
{
295+
$replicationStatus = Get-AnfReplicationStatus -ResourceGroupName $destResourceGroup -AccountName $destAccName -PoolName $destPoolName -VolumeName $destVolName
296+
}
297+
catch [Microsoft.Rest.Azure.CloudException]
298+
{
299+
$ErrorMessage = $_.Exception.Message
300+
#Send-MailMessage -From [email protected] -To [email protected] -Subject "Test Failed!" -SmtpServer localhost -Body "We failed to get replication status. The error message was $ErrorMessage"
301+
if ($ErrorMessage -notlike "*Cannot get replication status, the volume replication is*")
302+
{
303+
# Send-MailMessage -From [email protected] -To [email protected] -Subject "Test Thrown!" -SmtpServer localhost -Body "We Are Throwing the exception to get replication status. The error message was $ErrorMessage"
304+
throw
305+
}
306+
#Send-MailMessage -From [email protected] -To [email protected] -Subject "Test Continued!" -SmtpServer localhost -Body "We Are Continuing from the exception to get replication status. The error message was $ErrorMessage"
307+
}
295308
Start-Sleep -Seconds 1.0
296309
}
297310
while ($replicationStatus.MirrorState -ne $targetState)

0 commit comments

Comments
 (0)