Skip to content

Commit f7382d9

Browse files
leonardbfwyunchi-ms
leonardbf
authored and
wyunchi-ms
committed
Update to R5 RP 2019-07-01 API (#10445)
* ANF-243 update to R5 RP 2019-07-01 API (#28) - nfsv4 renamed to nfsv4.1 - snapshot cration date renamed to created * ANF-243 update to 2019-07-01 remove record
1 parent 794c763 commit f7382d9

File tree

24 files changed

+5805
-6287
lines changed

24 files changed

+5805
-6287
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.1.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.2.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
1616
</ItemGroup>
1717

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ function Test-AccountActiveDirectory
3636
Username = "sdkuser1"
3737
<#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="...")]#>
3838
Password = "sdkpass1"
39-
Domain = "sdkdomain1"
40-
Dns = "127.0.0.2"
41-
SmbServerName = "PSSMBSNam1"
39+
Domain = "sdkdomain"
40+
Dns = "127.0.0.1"
41+
SmbServerName = "PSSMBSName"
4242
}
43-
4443

4544
try
4645
{
@@ -79,7 +78,7 @@ function Test-AccountActiveDirectory
7978
Assert-AreEqual $activeDirectory1.Username $retrievedAcc.ActiveDirectories[0].Username
8079

8180
# patch an Active Directory with no active directory. Should be no change
82-
# create and check account 1
81+
# except for the tag update
8382
$newTagName = "tag1"
8483
$newTagValue = "tagValue2"
8584
$retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -Tag @{$newTagName = $newTagValue}
@@ -89,20 +88,21 @@ function Test-AccountActiveDirectory
8988
Assert-AreEqual 1 $retrievedAcc.ActiveDirectories.Length
9089
Assert-AreEqual "tagValue2" $retrievedAcc.Tags[$newTagName].ToString()
9190

91+
# update (put) the account. The absence of an active directory should result in the removal of any currently associated. Also tags
92+
$retrievedAcc = Set-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName1 -Location $resourceLocation
93+
Assert-AreEqual $accName1 $retrievedAcc.Name
94+
Assert-Null $retrievedAcc.Tags
95+
Assert-Null $retrievedAcc.ActiveDirectories
96+
9297
# patch an Active Directory. Should be updated to contain only the new one
9398
$activedirectories = @( $activeDirectory2 )
9499
$retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -ActiveDirectory $activedirectories
95100
Assert-AreEqual $accName1 $retrievedAcc.Name
96-
Assert-AreEqual $activeDirectory2.SmbServerName $retrievedAcc.ActiveDirectories[0].SmbServerName
101+
# correction to (wildcard values in) returned password expected in RP
102+
# add this check back in at that time since username/password are the two fields of concern
103+
# Assert-AreEqual $activeDirectory2.Password $retrievedAcc.ActiveDirectories[0].Password
97104
Assert-AreEqual $activeDirectory2.Username $retrievedAcc.ActiveDirectories[0].Username
98105
Assert-AreEqual 1 $retrievedAcc.ActiveDirectories.Length
99-
Assert-AreEqual "tagValue2" $retrievedAcc.Tags[$newTagName].ToString()
100-
101-
# update (put) the account. The absence of an active directory should result in the removal of any currently associated. Also tags
102-
$retrievedAcc = Set-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName1 -Location $resourceLocation
103-
Assert-AreEqual $accName1 $retrievedAcc.Name
104-
Assert-Null $retrievedAcc.Tags
105-
Assert-Null $retrievedAcc.ActiveDirectories
106106
}
107107
finally
108108
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ function Get-ProviderLocation($provider)
4646

4747
if ($location -eq $null)
4848
{
49-
return "eastus2"
49+
return "westcentralus"
5050
} else
5151
{
5252
return $location.Locations[0]
5353
}
5454
}
5555

56-
return "eastus2"
56+
return "westcentralus"
5757
}
5858

59-
return "eastus2"
59+
return "westcentralus"
6060
}
6161

6262
<#

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ function Test-SnapshotCrud
6363
# create two snapshots and check
6464
$retrieveSn = New-AzNetAppFilesSnapshot -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName -SnapshotName $snName1 -FileSystemId $retrievedVolume.FileSystemId
6565
Assert-AreEqual "$accName/$poolName/$volName/$snName1" $retrieveSn.Name
66+
# check created date has been populated
67+
Assert-NotNull $retrieveSn.Created
6668

6769
# one without using the filesystem id
6870
$retrieveSn = New-AzNetAppFilesSnapshot -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName -SnapshotName $snName2

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

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,48 +42,61 @@ function Test-VolumeCrud
4242

4343
$rule1 = @{
4444
RuleIndex = 1
45-
UnixReadOnly = 'false'
46-
UnixReadWrite = 'true'
47-
Cifs = 'false'
48-
Nfsv3 = 'true'
49-
Nfsv4 = 'false'
45+
UnixReadOnly = $false
46+
UnixReadWrite = $true
47+
Cifs = $false
48+
Nfsv3 = $true
49+
Nfsv41 = $false
5050
AllowedClients = '0.0.0.0/0'
5151
}
5252
$rule2 = @{
5353
RuleIndex = 2
54-
UnixReadOnly = 'false'
55-
UnixReadWrite = 'true'
56-
Cifs = 'false'
57-
Nfsv3 = 'true'
58-
Nfsv4 = 'false'
54+
UnixReadOnly = $false
55+
UnixReadWrite = $true
56+
Cifs = $false
57+
Nfsv3 = $false
58+
Nfsv41 = $true
5959
AllowedClients = '1.2.3.0/24'
6060
}
6161
$rule3 = @{
6262
RuleIndex = 2
63-
UnixReadOnly = 'false'
64-
UnixReadWrite = 'true'
65-
Cifs = 'false'
66-
Nfsv3 = 'true'
67-
Nfsv4 = 'false'
63+
UnixReadOnly = $false
64+
UnixReadWrite = $true
65+
Cifs = $false
66+
Nfsv3 = $true
67+
Nfsv41 = $false
6868
AllowedClients = '2.3.4.0/24'
6969
}
70-
70+
$rule5 = @{
71+
RuleIndex = 1
72+
UnixReadOnly = $false
73+
UnixReadWrite = $true
74+
Cifs = $false
75+
Nfsv3 = $false
76+
Nfsv41 = $true
77+
AllowedClients = '1.2.3.0/24'
78+
}
7179
$exportPolicy = @{
7280
Rules = (
7381
$rule1, $rule2
7482
)
7583
}
7684

85+
$exportPolicyv4 = @{
86+
Rules = (
87+
$rule5
88+
)
89+
}
90+
7791
$exportPolicyMod = @{
7892
Rules = (
7993
$rule3
8094
)
8195
}
8296

8397
# create the list of protocol types
84-
$protocolTypes = New-Object string[] 2
98+
$protocolTypes = New-Object string[] 1
8599
$protocolTypes[0] = "NFSv3"
86-
$protocolTypes[1] = "NFSv4.1"
87100

88101
try
89102
{
@@ -112,16 +125,18 @@ function Test-VolumeCrud
112125
Assert-NotNull $retrievedVolume.ExportPolicy
113126
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
114127
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
115-
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] $protocolTypes[0]
116-
Assert-AreEqual $retrievedVolume.ProtocolTypes[1] $protocolTypes[1]
128+
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
117129
Assert-NotNull $retrievedVolume.MountTargets
118130

131+
# use the NFSv4.1
132+
$protocolTypesv4 = New-Object string[] 1
133+
$protocolTypesv4[0] = "NFSv4.1"
134+
119135
# create second volume and check using the confirm flag
120-
$retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName2 -CreationToken $volName2 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Confirm:$false
136+
$retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName2 -CreationToken $volName2 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -ExportPolicy $exportPolicyv4 -ProtocolType $protocolTypesv4 -Confirm:$false
121137
Assert-AreEqual "$accName/$poolName/$volName2" $retrievedVolume.Name
122138
Assert-AreEqual $serviceLevel $retrievedVolume.ServiceLevel
123-
# default protocol type for new volume
124-
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
139+
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv4.1'
125140

126141
# create and check a third volume using the WhatIf - it should not be created
127142
$retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName3 -CreationToken $volName2 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -WhatIf
@@ -153,11 +168,11 @@ function Test-VolumeCrud
153168

154169
$rule4 = @{
155170
RuleIndex = 3
156-
UnixReadOnly = 'false'
157-
UnixReadWrite = 'true'
158-
Cifs = 'false'
159-
Nfsv3 = 'true'
160-
Nfsv4 = 'false'
171+
UnixReadOnly = $false
172+
UnixReadWrite = $true
173+
Cifs = $false
174+
Nfsv3 = $true
175+
Nfsv41 = $false
161176
AllowedClients = '1.2.3.0/24'
162177
}
163178

@@ -190,14 +205,16 @@ function Test-VolumeCrud
190205
# create the volume and check
191206
$newTagName = "tag1"
192207
$newTagValue = "tagValue1"
193-
$retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -VolumeName $volName4 -CreationToken $volName4 -UsageThreshold $doubleUsage -ServiceLevel "Standard" -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy -ProtocolType $protocolTypes
208+
$retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -VolumeName $volName4 -CreationToken $volName4 -UsageThreshold $doubleUsage -ServiceLevel "Standard" -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy
194209
Assert-AreEqual "$accName/$poolName2/$volName4" $retrievedVolume.Name
195210
Assert-AreEqual "Standard" $retrievedVolume.ServiceLevel
196211
Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)
197212
Assert-AreEqual "tagValue1" $retrievedVolume.Tags[$newTagName].ToString()
198213
Assert-NotNull $retrievedVolume.ExportPolicy
199214
Assert-AreEqual '0.0.0.0/0' $retrievedVolume.ExportPolicy.Rules[0].AllowedClients
200215
Assert-AreEqual '1.2.3.0/24' $retrievedVolume.ExportPolicy.Rules[1].AllowedClients
216+
# default protocol type for new volume
217+
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
201218

202219
# update (patch) export policy and check no change to rest of volume
203220
$retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -VolumeName $volName4 -ExportPolicy $exportPolicyMod
@@ -298,4 +315,4 @@ function Test-VolumePipelines
298315
# Cleanup
299316
Clean-ResourceGroup $resourceGroup
300317
}
301-
}
318+
}

0 commit comments

Comments
 (0)