Skip to content

Commit 13de674

Browse files
bluewwblueww
committed
[Storage] Update per review comments, and update test
1 parent 3022c53 commit 13de674

File tree

7 files changed

+414
-283
lines changed

7 files changed

+414
-283
lines changed

‎src/Storage/Storage.Management.Test/ScenarioTests/StorageFileTests.ps1

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,23 @@ function Test-StorageFileShare
5353
Assert-AreEqual $stoname $share.StorageAccountName
5454
Assert-AreEqual $shareName $share.Name
5555
Assert-AreEqual $quotaGiB $share.QuotaGiB
56-
Assert-AreEqual $metadata.Count $share.Metadata.Count
56+
Assert-AreEqual $metadata.Count $share.Metadata.Count
5757

5858
$quotaGiB = 200
59-
$metadata = @{tag0="value0";tag1="value1";tag2="value2"}
59+
$metadata = @{tag0="value0";tag1="value1";tag2="value2"}
60+
$share | Update-AzRmStorageShare -QuotaGiB $quotaGiB -Metadata $metadata
61+
$share = Get-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $stoname -Name $shareName
62+
Assert-AreEqual $rgname $share.ResourceGroupName
63+
Assert-AreEqual $stoname $share.StorageAccountName
64+
Assert-AreEqual $shareName $share.Name
65+
Assert-AreEqual $quotaGiB $share.QuotaGiB
66+
Assert-AreEqual $metadata.Count $share.Metadata.Count
67+
68+
$quotaGiB = 300
69+
$metadata = @{tag0="value0";tag1="value1";tag2="value2";tag3="value3"}
6070
$shareName2 = "share2"+ $rgname
61-
New-AzRmStorageShare -StorageAccount $stos -Name $shareName2 -QuotaGiB $quotaGiB -Metadata $metadata
62-
$share = Get-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $stoname -Name $shareName2
71+
$stos | New-AzRmStorageShare -Name $shareName2 -QuotaGiB $quotaGiB -Metadata $metadata
72+
$share = $stos | Get-AzRmStorageShare -Name $shareName2
6373
Assert-AreEqual $rgname $share.ResourceGroupName
6474
Assert-AreEqual $stoname $share.StorageAccountName
6575
Assert-AreEqual $shareName2 $share.Name
@@ -76,7 +86,7 @@ function Test-StorageFileShare
7686
Assert-AreEqual 1 $shares.Count
7787
Assert-AreEqual $shareName2 $shares[0].Name
7888

79-
Remove-AzRmStorageShare -Force -StorageAccount $stos -Name $shareName2
89+
$stos | Get-AzRmStorageShare -Name $shareName2 | Remove-AzRmStorageShare -Force
8090
$shares = Get-AzRmStorageShare -StorageAccount $stos
8191
Assert-AreEqual 0 $shares.Count
8292

‎src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageFileTests/TestStorageFileShare.json

Lines changed: 396 additions & 249 deletions
Large diffs are not rendered by default.

‎src/Storage/Storage.Management/File/GetAzureStorageShare.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class GetAzureStorageShareCommand : StorageFileBaseCmdlet
4343
[Parameter(
4444
Position = 0,
4545
Mandatory = true,
46-
ValueFromPipelineByPropertyName = true,
4746
HelpMessage = "Resource Group Name.",
4847
ParameterSetName = AccountNameParameterSet)]
4948
[ValidateNotNullOrEmpty]
@@ -52,7 +51,6 @@ public class GetAzureStorageShareCommand : StorageFileBaseCmdlet
5251
[Parameter(
5352
Position = 1,
5453
Mandatory = true,
55-
ValueFromPipelineByPropertyName = true,
5654
HelpMessage = "Storage Account Name.",
5755
ParameterSetName = AccountNameParameterSet)]
5856
[Alias(AccountNameAlias)]
@@ -62,7 +60,6 @@ public class GetAzureStorageShareCommand : StorageFileBaseCmdlet
6260
[Parameter(Mandatory = true,
6361
HelpMessage = "Storage account object",
6462
ValueFromPipeline = true,
65-
ValueFromPipelineByPropertyName = true,
6663
ParameterSetName = AccountObjectParameterSet)]
6764
[ValidateNotNullOrEmpty]
6865
public PSStorageAccount StorageAccount { get; set; }
@@ -78,9 +75,7 @@ public class GetAzureStorageShareCommand : StorageFileBaseCmdlet
7875

7976
[Alias("N", "ShareName")]
8077
[Parameter(HelpMessage = "Share Name",
81-
Mandatory = false,
82-
ValueFromPipeline = true,
83-
ValueFromPipelineByPropertyName = true)]
78+
Mandatory = false)]
8479
public string Name { get; set; }
8580

8681
public override void ExecuteCmdlet()

‎src/Storage/Storage.Management/File/NewAzureStorageShare.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class NewAzureStorageShareCommand : StorageFileBaseCmdlet
3939
[Parameter(
4040
Position = 0,
4141
Mandatory = true,
42-
ValueFromPipelineByPropertyName = true,
4342
HelpMessage = "Resource Group Name.",
4443
ParameterSetName = AccountNameParameterSet)]
4544
[ValidateNotNullOrEmpty]
@@ -48,7 +47,6 @@ public class NewAzureStorageShareCommand : StorageFileBaseCmdlet
4847
[Parameter(
4948
Position = 1,
5049
Mandatory = true,
51-
ValueFromPipelineByPropertyName = true,
5250
HelpMessage = "Storage Account Name.",
5351
ParameterSetName = AccountNameParameterSet)]
5452
[Alias(AccountNameAlias)]
@@ -58,16 +56,13 @@ public class NewAzureStorageShareCommand : StorageFileBaseCmdlet
5856
[Parameter(Mandatory = true,
5957
HelpMessage = "Storage account object",
6058
ValueFromPipeline = true,
61-
ValueFromPipelineByPropertyName = true,
6259
ParameterSetName = AccountObjectParameterSet)]
6360
[ValidateNotNullOrEmpty]
6461
public PSStorageAccount StorageAccount { get; set; }
6562

6663
[Alias("N", "ShareName")]
6764
[Parameter(Mandatory = true,
68-
HelpMessage = "Azure File share name",
69-
ValueFromPipeline = true,
70-
ValueFromPipelineByPropertyName = true)]
65+
HelpMessage = "Azure File share name")]
7166
[ValidateNotNullOrEmpty]
7267
public string Name { get; set; }
7368

‎src/Storage/Storage.Management/File/RemoveAzureStorageShare.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public class RemoveAzureStorageShareCommand : StorageFileBaseCmdlet
4949
[Parameter(
5050
Position = 0,
5151
Mandatory = true,
52-
ValueFromPipelineByPropertyName = true,
5352
HelpMessage = "Resource Group Name.",
5453
ParameterSetName = AccountNameParameterSet)]
5554
[ValidateNotNullOrEmpty]
@@ -58,7 +57,6 @@ public class RemoveAzureStorageShareCommand : StorageFileBaseCmdlet
5857
[Parameter(
5958
Position = 1,
6059
Mandatory = true,
61-
ValueFromPipelineByPropertyName = true,
6260
HelpMessage = "Storage Account Name.",
6361
ParameterSetName = AccountNameParameterSet)]
6462
[Alias(AccountNameAlias)]
@@ -68,21 +66,16 @@ public class RemoveAzureStorageShareCommand : StorageFileBaseCmdlet
6866
[Alias("N", "ShareName")]
6967
[Parameter(Mandatory = true,
7068
HelpMessage = "Share Name",
71-
ValueFromPipeline = true,
72-
ValueFromPipelineByPropertyName = true,
7369
ParameterSetName = AccountObjectParameterSet)]
7470
[Parameter(Position = 2,
7571
Mandatory = true,
7672
HelpMessage = "Share Name",
77-
ValueFromPipeline = true,
78-
ValueFromPipelineByPropertyName = true,
7973
ParameterSetName = AccountNameParameterSet)]
8074
public string Name { get; set; }
8175

8276
[Parameter(Mandatory = true,
8377
HelpMessage = "Storage account object",
8478
ValueFromPipeline = true,
85-
ValueFromPipelineByPropertyName = true,
8679
ParameterSetName = AccountObjectParameterSet)]
8780
[ValidateNotNullOrEmpty]
8881
public PSStorageAccount StorageAccount { get; set; }
@@ -100,7 +93,6 @@ public class RemoveAzureStorageShareCommand : StorageFileBaseCmdlet
10093
[Parameter(Mandatory = true,
10194
HelpMessage = "Storage Share object",
10295
ValueFromPipeline = true,
103-
ValueFromPipelineByPropertyName = true,
10496
ParameterSetName = ShareObjectParameterSet)]
10597
[ValidateNotNullOrEmpty]
10698
public PSShare InputObject { get; set; }

‎src/Storage/Storage.Management/File/StorageFileBaseCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.Management.Storage
2727
public abstract class StorageFileBaseCmdlet : AzureRMCmdlet
2828
{
2929
private StorageManagementClientWrapper storageClientWrapper;
30-
30+
3131
protected const string AccountNameAlias = "AccountName";
3232
protected const string NameAlias = "Name";
3333

‎src/Storage/Storage.Management/File/UpdateAzureStorageShare.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public class UpdateAzureStorageShareCommand : StorageFileBaseCmdlet
4949
[Parameter(
5050
Position = 0,
5151
Mandatory = true,
52-
ValueFromPipelineByPropertyName = true,
5352
HelpMessage = "Resource Group Name.",
5453
ParameterSetName = AccountNameParameterSet)]
5554
[ValidateNotNullOrEmpty]
@@ -58,7 +57,6 @@ public class UpdateAzureStorageShareCommand : StorageFileBaseCmdlet
5857
[Parameter(
5958
Position = 1,
6059
Mandatory = true,
61-
ValueFromPipelineByPropertyName = true,
6260
HelpMessage = "Storage Account Name.",
6361
ParameterSetName = AccountNameParameterSet)]
6462
[Alias(AccountNameAlias)]
@@ -68,21 +66,16 @@ public class UpdateAzureStorageShareCommand : StorageFileBaseCmdlet
6866
[Alias("N", "ShareName")]
6967
[Parameter(Mandatory = true,
7068
HelpMessage = "Share Name",
71-
ValueFromPipeline = true,
72-
ValueFromPipelineByPropertyName = true,
7369
ParameterSetName = AccountObjectParameterSet)]
7470
[Parameter(Position = 2,
7571
Mandatory = true,
7672
HelpMessage = "Share Name",
77-
ValueFromPipeline = true,
78-
ValueFromPipelineByPropertyName = true,
7973
ParameterSetName = AccountNameParameterSet)]
8074
public string Name { get; set; }
8175

8276
[Parameter(Mandatory = true,
8377
HelpMessage = "Storage account object",
8478
ValueFromPipeline = true,
85-
ValueFromPipelineByPropertyName = true,
8679
ParameterSetName = AccountObjectParameterSet)]
8780
[ValidateNotNullOrEmpty]
8881
public PSStorageAccount StorageAccount { get; set; }
@@ -100,7 +93,6 @@ public class UpdateAzureStorageShareCommand : StorageFileBaseCmdlet
10093
[Parameter(Mandatory = true,
10194
HelpMessage = "Storage Share object",
10295
ValueFromPipeline = true,
103-
ValueFromPipelineByPropertyName = true,
10496
ParameterSetName = ShareObjectParameterSet)]
10597
[ValidateNotNullOrEmpty]
10698
public PSShare InputObject { get; set; }

0 commit comments

Comments
 (0)