diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1 index 0615f790e1d1..d459de2f847b 100644 --- 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 index 75ca0d857d61..99938ccd8020 100644 --- 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 ProtocolTypes { get; set; } - - [Parameter( - Mandatory = false, - HelpMessage = "A hashtable which represents mount targets of the volume")] - [ValidateNotNullOrEmpty] - public Hashtable MountTargets { get; } + public List 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 index d48201ab9c55..ff2c29a9ed34 100644 --- a/src/NetAppFiles/NetAppFiles/help/New-AzNetAppFilesVolume.md +++ b/src/NetAppFiles/NetAppFiles/help/New-AzNetAppFilesVolume.md @@ -17,7 +17,7 @@ Creates a new Azure NetApp Files (ANF) volume. New-AzNetAppFilesVolume -ResourceGroupName -Location -AccountName -PoolName -Name -UsageThreshold -SubnetId -CreationToken -ServiceLevel [-ExportPolicy ] - [-ProtocolTypes ] [-MountTargets ] + [-ProtocolType ] [-Tag ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -25,7 +25,7 @@ New-AzNetAppFilesVolume -ResourceGroupName -Location -AccountN ``` New-AzNetAppFilesVolume -Name -UsageThreshold -SubnetId -CreationToken -ServiceLevel [-ExportPolicy ] - [-ProtocolTypes ] [-MountTargets ] + [-ProtocolType ] [-Tag ] -PoolObject [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -193,7 +193,7 @@ Accept pipeline input: True (ByValue) Accept wildcard characters: False ``` -### -ProtocolTypes +### -ProtocolType A hashtable array which represents the export policy ```yaml