NFSAAS-2898 update to R4.5 RP standard (#26)

* NFSAAS-2898 update to R4.5 RP standard * NFSAAS-2898 update to R4.5 RP standard * NFSAAS-2898 update to R4.5 RP standard
Azure · Aug 3, 2019 · c7c69eb · c7c69eb
1 parent 41c5cee
commit c7c69eb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1
@@ -104,7 +104,7 @@ function Test-VolumeCrud
         # create first volume and check
         $newTagName = "tag1"
         $newTagValue = "tagValue1"
-        $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy -ProtocolTypes $protocolTypes
+        $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy -ProtocolType $protocolTypes
         Assert-AreEqual "$accName/$poolName/$volName1" $retrievedVolume.Name
         Assert-AreEqual $serviceLevel $retrievedVolume.ServiceLevel
         Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)
@@ -151,21 +151,21 @@ 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
-			)
-		}
+        $rule4 = @{
+            RuleIndex = 3
+            UnixReadOnly = 'false'
+            UnixReadWrite = 'true'
+            Cifs = 'false'
+            Nfsv3 = 'true'
+            Nfsv4 = 'false'
+            AllowedClients = '1.2.3.0/24'
+        }
+
+        $exportPolicyUpdate = @{
+            Rules = (
+                $rule2, $rule4
+            )
+        }
 
         # now patch the policy
         $retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -ExportPolicy $exportPolicyUpdate
@@ -190,7 +190,7 @@ function Test-VolumeCrud
         # create the volume and check
         $newTagName = "tag1"
         $newTagValue = "tagValue1"
-        $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 -ProtocolTypes $protocolTypes
+        $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
         Assert-AreEqual "$accName/$poolName2/$volName4" $retrievedVolume.Name
         Assert-AreEqual "Standard" $retrievedVolume.ServiceLevel
         Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)

diff --git a/src/NetAppFiles/NetAppFiles/Volume/NewNetAppFilesVolume.cs b/src/NetAppFiles/NetAppFiles/Volume/NewNetAppFilesVolume.cs
@@ -120,13 +120,7 @@ public class NewAzureRmNetAppFilesVolume : AzureNetAppFilesCmdletBase
             Mandatory = false,
             HelpMessage = "A hashtable array which represents the protocol types")]
         [ValidateNotNullOrEmpty]
-        public List<string> ProtocolTypes { get; set; }
-
-        [Parameter(
-            Mandatory = false,
-            HelpMessage = "A hashtable which represents mount targets of the volume")]
-        [ValidateNotNullOrEmpty]
-        public Hashtable MountTargets { get; }
+        public List<string> ProtocolType { get; set; }
 
         [Parameter(
             Mandatory = false,
@@ -162,7 +156,7 @@ public override void ExecuteCmdlet()
                 SubnetId = SubnetId,
                 Location = Location,
                 ExportPolicy = (ExportPolicy != null) ? ModelExtensions.ConvertExportPolicyFromPs(ExportPolicy) : null,
-                ProtocolTypes = ProtocolTypes,
+                ProtocolTypes = ProtocolType,
                 Tags = Tag
             };
 

diff --git a/src/NetAppFiles/NetAppFiles/help/New-AzNetAppFilesVolume.md b/src/NetAppFiles/NetAppFiles/help/New-AzNetAppFilesVolume.md
@@ -17,15 +17,15 @@ Creates a new Azure NetApp Files (ANF) volume.
 New-AzNetAppFilesVolume -ResourceGroupName <String> -Location <String> -AccountName <String> -PoolName <String>
  -Name <String> -UsageThreshold <Int64> -SubnetId <String> -CreationToken <String> -ServiceLevel <String>
  [-ExportPolicy <PSNetAppFilesVolumeExportPolicy>]
- [-ProtocolTypes <List[String]>] [-MountTargets <Hashtable>]
+ [-ProtocolType <List[String]>]
  [-Tag <Hashtable>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ByParentObjectParameterSet
 ```
 New-AzNetAppFilesVolume -Name <String> -UsageThreshold <Int64> -SubnetId <String> -CreationToken <String>
  -ServiceLevel <String> [-ExportPolicy <PSNetAppFilesVolumeExportPolicy>]
- [-ProtocolTypes <List[String]>] [-MountTargets <Hashtable>]
+ [-ProtocolType <List[String]>]
  [-Tag <Hashtable>] -PoolObject <PSNetAppFilesPool> [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
  [-Confirm] [<CommonParameters>]
 ```
@@ -193,7 +193,7 @@ Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
 ```
 
-### -ProtocolTypes
+### -ProtocolType
 A hashtable array which represents the export policy
 
 ```yaml