Review fixes, added new test record,

Author: tomasm9

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/AccountTests.cs

@@ -36,7 +36,7 @@ public void TestAccountCrud()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestAccountActiveDirctory()
+        public void TestAccountActiveDirectory()
         {
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-AccountActiveDirectory");
         }

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

@@ -54,7 +54,7 @@ function Test-AccountActiveDirectory
             # create and check account 1
             $newTagName = "tag1"
             $newTagValue = "tagValue1"
-            $retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirectories $activeDirectories
+            $retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirector $activeDirectories
             Assert-True { $false }
         }
         catch
@@ -71,7 +71,7 @@ function Test-AccountActiveDirectory
         # create and check account 1
         $newTagName = "tag1"
         $newTagValue = "tagValue1"
-        $retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirectories $activeDirectories
+        $retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirectory $activeDirectories
         Assert-AreEqual $accName1 $retrievedAcc.Name
         Assert-AreEqual $activeDirectory1.SmbServerName $retrievedAcc.ActiveDirectories[0].SmbServerName
         Assert-AreEqual $activeDirectory1.Username $retrievedAcc.ActiveDirectories[0].Username
@@ -80,7 +80,7 @@ function Test-AccountActiveDirectory
         # create and check account 1
         $newTagName = "tag1"
         $newTagValue = "tagValue2"
-        $retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue}
+        $retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -Tag @{$newTagName = $newTagValue}
         Assert-AreEqual $accName1 $retrievedAcc.Name
         Assert-AreEqual $activeDirectory1.SmbServerName $retrievedAcc.ActiveDirectories[0].SmbServerName
         Assert-AreEqual $activeDirectory1.Username $retrievedAcc.ActiveDirectories[0].Username
@@ -89,15 +89,15 @@ function Test-AccountActiveDirectory
 
         # patch an Active Directory. Should be updated to contain only the new one
         $activedirectories = @( $activeDirectory2 )
-        $retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1 -ActiveDirectories $activedirectories
+        $retrievedAcc = Update-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName1 -ActiveDirectory $activedirectories
         Assert-AreEqual $accName1 $retrievedAcc.Name
         Assert-AreEqual $activeDirectory2.SmbServerName $retrievedAcc.ActiveDirectories[0].SmbServerName
         Assert-AreEqual $activeDirectory2.Username $retrievedAcc.ActiveDirectories[0].Username
         Assert-AreEqual 1 $retrievedAcc.ActiveDirectories.Length
         Assert-AreEqual "tagValue2" $retrievedAcc.Tags[$newTagName].ToString()
 
         # update (put) the account. The absence of an active directory should result in the removal of any currently associated. Also tags
-        $retrievedAcc = Set-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1 -Location $resourceLocation
+        $retrievedAcc = Set-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -AccountName $accName1 -Location $resourceLocation
         Assert-AreEqual $accName1 $retrievedAcc.Name
         Assert-Null $retrievedAcc.Tags
         Assert-Null $retrievedAcc.ActiveDirectories

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

@@ -56,7 +56,13 @@ function Test-VolumeCrud
         Nfsv4 = 'false'
         AllowedClients = '1.2.3.0/24'
     }
-    $exportPolicy = @( $rule1, $rule2 )
+
+
+    $exportPolicy = @{
+		Rules = (
+			$rule1, $rule2
+		)
+	}
 
     try
     {
@@ -119,8 +125,24 @@ function Test-VolumeCrud
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
 
+		$rule3 = @{
+			RuleIndex = 3
+			UnixReadOnly = 'false'
+			UnixReadWrite = 'true'
+			Cifs = 'false'
+			Nfsv3 = 'true'
+			Nfsv4 = 'false'
+			AllowedClients = '1.2.3.0/24'
+		}
+
+		$exportPolicyUpdate = @{
+			Rules = (
+				$rule2, $rule3
+			)
+		}
+
         # now patch the policy
-        $retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -ExportPolicy @( $rule2 )
+        $retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -ExportPolicy $exportPolicyUpdate
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '1.2.3.0/24'
 
         # delete one volume retrieved by id and one by name and check removed
@@ -185,7 +207,7 @@ function Test-VolumePipelines
 
         # create volume by piping from a pool
         # account name, pool name and service level are all acquired
-        $retrievedVolume = Get-AnfPool -ResourceGroupName $resourceGroup -AccountName $accName -Name $poolName | New-AnfVolume -Name $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -SubnetId $subnetId
+        $retrievedVolume = Get-AnfPool -ResourceGroupName $resourceGroup -AccountName $accName -Name $poolName | New-AnfVolume -Name $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -SubnetId $subnetId -ServiceLevel $serviceLevel
         Assert-AreEqual "$accName/$poolName/$volName1" $retrievedVolume.Name
         Assert-AreEqual "Premium" $retrievedVolume.ServiceLevel