Skip to content

Commit 99847d2

Browse files
leonardbfleonardbf
authored
Nfsaas 1707 add netapp (#9)
* NFSAAS-1707 update from review comments * NFSAAS-1707 updates from review comments * NFSAAS-1707 updates from review comments * NFSAAS-1707 update from review comments * NFSAAS-1707 update from review comments * NFSAAS-1707 update from review comments
1 parent 992baba commit 99847d2

37 files changed

+75
-23357
lines changed

‎src/Accounts/Accounts/AzureRmAlias/Mappings.json

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,6 @@
6363
"Export-AzAnalysisServicesInstanceLog": "Export-AzureAnalysisServicesInstanceLog",
6464
"Sync-AzAnalysisServicesInstance": "Sync-AzureAnalysisServicesInstance"
6565
},
66-
"Az.NetAppFiles": {
67-
"New-AzNetAppFilesAccount": "New-AzureRmNetAppFilesAccount",
68-
"Remove-AzNetAppFilesAccount": "Remove-AzureRmNetAppFilesAccount",
69-
"Get-AzNetAppFilesAccount": "Get-AzureRmNetAppFilesAccount",
70-
"New-AzNetAppFilesPool": "New-AzureRmNetAppFilesPool",
71-
"Update-AzNetAppFilesPool": "Update-AzureRmNetAppFilesPool",
72-
"Remove-AzNetAppFilesPool": "Remove-AzureRmNetAppFilesPool",
73-
"Get-AzNetAppFilesPool": "Get-AzureRmNetAppFilesPool",
74-
"New-AzNetAppFilesVolume": "New-AzureRmNetAppFilesVolume",
75-
"Update-AzNetAppFilesVolume": "Update-AzureRmNetAppFilesVolume",
76-
"Remove-AzNetAppFilesVolume": "Remove-AzureRmNetAppFilesVolume",
77-
"Get-AzNetAppFilesVolume": "Get-AzureRmNetAppFilesVolume",
78-
"Get-AzNetAppFilesMountTarget": "Get-AzureRmNetAppFilesMountTarget",
79-
"New-AzNetAppFilesSnapshot": "New-AzureRmNetAppFilesSnapshot",
80-
"Remove-AzNetAppFilesSnapshot": "Remove-AzureRmNetAppFilesSnapshot",
81-
"Get-AzNetAppFilesSnapshot": "Get-AzureRmNetAppFilesSnapshot"
82-
},
8366
"Az.ApiManagement": {
8467
"Add-AzApiManagementRegion": "Add-AzureRmApiManagementRegion",
8568
"Get-AzApiManagementSsoToken": "Get-AzureRmApiManagementSsoToken",

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/AccountTests.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,51 @@ function Test-AccountCrud
2323
try
2424
{
2525
# create the resource group
26-
New-AzureRmResourceGroup -Name $resourceGroup -Location $resourceLocation
26+
New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
2727

2828
# create and check account 1
2929
$newTagName = "tag1"
3030
$newTagValue = "tagValue1"
31-
$retrievedAcc = New-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue}
31+
$retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue}
3232
Assert-AreEqual $accName1 $retrievedAcc.Name
3333
Assert-AreEqual True $retrievedAcc.Tags.ContainsKey($newTagName)
3434
Assert-AreEqual "tagValue1" $retrievedAcc.Tags[$newTagName].ToString()
3535

3636
# create and check account 2 using the Confirm flag
37-
$retrievedAcc = New-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName2 -Confirm:$false
37+
$retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName2 -Confirm:$false
3838
Assert-AreEqual $accName2 $retrievedAcc.Name
3939

4040
# create and check account 3 using the WhatIf - it should not be created
41-
$retrievedAcc = New-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName3 -WhatIf
41+
$retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName3 -WhatIf
4242

4343
# get and check accounts by group (list)
44-
$retrievedAcc = Get-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup
44+
$retrievedAcc = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup
4545
Assert-AreEqual $accName1 $retrievedAcc[0].Name
4646
Assert-AreEqual $accName2 $retrievedAcc[1].Name
4747
Assert-AreEqual 2 $retrievedAcc.Length
4848

4949
# get and check an account by name
50-
$retrievedAcc = Get-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1
50+
$retrievedAcc = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1
5151
Assert-AreEqual $accName1 $retrievedAcc.Name
5252

5353
# get and check the account again using the resource id just obtained
54-
$retrievedAccById = Get-AzureRmNetAppFilesAccount -ResourceId $retrievedAcc.Id
54+
$retrievedAccById = Get-AzNetAppFilesAccount -ResourceId $retrievedAcc.Id
5555
Assert-AreEqual $accName1 $retrievedAccById.Name
5656

5757
# update and check the account (tags)
5858
# since only tags can be patched and no other set or update is possible
5959
# there is no implemented cmdlet
6060

6161
# delete one account retrieved by id and one by name and check removed
62-
Remove-AzureRmNetAppFilesAccount -ResourceId $retrievedAccById.Id
62+
Remove-AzNetAppFilesAccount -ResourceId $retrievedAccById.Id
6363

6464
# but test the WhatIf first
65-
Remove-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName2 -WhatIf
66-
$retrievedAcc = Get-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup
65+
Remove-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName2 -WhatIf
66+
$retrievedAcc = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup
6767
Assert-AreEqual 1 $retrievedAcc.Length
6868

69-
Remove-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName2
70-
$retrievedAcc = Get-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup
69+
Remove-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName2
70+
$retrievedAcc = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup
7171
Assert-AreEqual 0 $retrievedAcc.Length
7272
}
7373
finally
@@ -91,7 +91,7 @@ function Test-AccountPipelines
9191
try
9292
{
9393
# create the resource group
94-
New-AzureRmResourceGroup -Name $resourceGroup -Location $resourceLocation
94+
New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
9595

9696
New-AnfAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 | Remove-AnfAccount
9797

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,59 +29,59 @@ function Test-PoolCrud
2929
try
3030
{
3131
# create the resource group
32-
New-AzureRmResourceGroup -Name $resourceGroup -Location $resourceLocation
32+
New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
3333

3434
# create account
35-
$retrievedAcc = New-AzureRmNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName
35+
$retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName
3636

3737
# create pool 1 and check
3838
$newTagName = "tag1"
3939
$newTagValue = "tagValue1"
40-
$retrievedPool = New-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName1 -PoolSize $poolSize -ServiceLevel $serviceLevel -Tag @{$newTagName = $newTagValue}
40+
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName1 -PoolSize $poolSize -ServiceLevel $serviceLevel -Tag @{$newTagName = $newTagValue}
4141
Assert-AreEqual "$accName/$poolName1" $retrievedPool.Name
4242
Assert-AreEqual $serviceLevel $retrievedPool.ServiceLevel
4343
Assert-AreEqual True $retrievedPool.Tags.ContainsKey($newTagName)
4444
Assert-AreEqual "tagValue1" $retrievedPool.Tags[$newTagName].ToString()
4545

4646
# create and check pool 2 using the confirm flag
47-
$retrievedPool = New-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel $serviceLevel -Confirm:$false
47+
$retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel $serviceLevel -Confirm:$false
4848
Assert-AreEqual "$accName/$poolName2" $retrievedPool.Name
4949

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

5353
# get and check pools by group (list)
54-
$retrievedPool = Get-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
54+
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
5555
Assert-AreEqual "$accName/$poolName1" $retrievedPool[0].Name
5656
Assert-AreEqual "$accName/$poolName2" $retrievedPool[1].Name
5757
Assert-AreEqual 2 $retrievedPool.Length
5858

5959
# get and check a pool by name
60-
$retrievedPool = Get-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName1
60+
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName1
6161
Assert-AreEqual "$accName/$poolName1" $retrievedPool.Name
6262

6363
# get and check the account again using the resource id just obtained
64-
$retrievedPoolById = Get-AzureRmNetAppFilesPool -ResourceId $retrievedPool.Id
64+
$retrievedPoolById = Get-AzNetAppFilesPool -ResourceId $retrievedPool.Id
6565
Assert-AreEqual "$accName/$poolName1" $retrievedPoolById.Name
6666

6767
# update (patch) and check the pool
6868
# only tags can currently be patched so there is no implemented cmdlet
6969

7070
# Update and check the Pool
71-
$retrievedPool = Update-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName1 -PoolSize $poolSize -ServiceLevel "Standard"
71+
$retrievedPool = Update-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName1 -PoolSize $poolSize -ServiceLevel "Standard"
7272
Assert-AreEqual "$accName/$poolName1" $retrievedPool.Name
7373
Assert-AreEqual "Standard" $retrievedPool.ServiceLevel
7474

7575
# delete one account retrieved by id and one by name and check removed
76-
Remove-AzureRmNetAppFilesPool -ResourceId $retrievedPoolById.Id
76+
Remove-AzNetAppFilesPool -ResourceId $retrievedPoolById.Id
7777

7878
# but test the WhatIf first
79-
Remove-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName2 -WhatIf
80-
$retrievedPool = Get-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
79+
Remove-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName2 -WhatIf
80+
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
8181
Assert-AreEqual 1 $retrievedPool.Length
8282

83-
Remove-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName2
84-
$retrievedPool = Get-AzureRmNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
83+
Remove-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName2
84+
$retrievedPool = Get-AzNetAppFilesPool -ResourceGroupName $resourceGroup -AccountName $accName
8585
Assert-AreEqual 0 $retrievedPool.Length
8686
}
8787
finally
@@ -109,7 +109,7 @@ function Test-PoolPipelines
109109
try
110110
{
111111
# create the resource group
112-
New-AzureRmResourceGroup -Name $resourceGroup -Location $resourceLocation
112+
New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
113113

114114
# create pool by piping from account
115115
New-AnfAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName | New-AnfPool -Name $poolName1 -PoolSize $poolSize -ServiceLevel $serviceLevel
@@ -131,7 +131,7 @@ function Test-PoolPipelines
131131
New-AnfPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel $serviceLevel
132132

133133
# delete one of the pools by piping from pool get
134-
Get-AnfPool -ResourceGroupName $resourceGroup -AccountName $accName -Name $poolName1 | Remove-AzureRmNetAppFilesPool
134+
Get-AnfPool -ResourceGroupName $resourceGroup -AccountName $accName -Name $poolName1 | Remove-AzNetAppFilesPool
135135

136136
$retrievedPool = Get-AnfAccount -ResourceGroupName $resourceGroup -AccountName $accName | Get-AnfPool
137137
Assert-AreEqual 1 $retrievedPool.Length

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/SnapshotTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16-
using System;
1716
using Xunit;
1817

1918
namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest

0 commit comments

Comments
 (0)