Skip to content

Commit 34e27c7

Browse files
authored
Merge pull request #8133 from wastoresh/pipeline
[Storage] Add test for account pipeline
2 parents e0c4a47 + 3f4190b commit 34e27c7

File tree

3 files changed

+1577
-3
lines changed

3 files changed

+1577
-3
lines changed

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,14 @@ public void TestGetAzureStorageLocationUsage()
128128
{
129129
TestController.NewInstance.RunPsTest(_logger, "Test-GetAzureStorageLocationUsage");
130130
}
131+
132+
[Fact]
133+
[Trait(Category.AcceptanceType, Category.CheckIn)]
134+
public void TestPipingNewUpdateAccount()
135+
{
136+
TestController.NewInstance.RunPsTest(_logger, "Test-PipingNewUpdateAccount");
137+
}
138+
139+
131140
}
132141
}

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ function Test-NetworkRule
538538

539539
New-AzureRmResourceGroup -Name $rgname -Location $loc;
540540

541-
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -NetworkRuleSet (@{bypass="Logging,Metrics,AzureServices";
541+
$global:sto = New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -NetworkRuleSet (@{bypass="Logging,Metrics,AzureServices";
542542
ipRules=(@{IPAddressOrRange="$ip1";Action="allow"},
543543
@{IPAddressOrRange="$ip2";Action="allow"});
544544
defaultAction="Deny"})
@@ -551,8 +551,8 @@ function Test-NetworkRule
551551
Assert-AreEqual $ip2 $stoacl.IpRules[1].IPAddressOrRange;
552552
Assert-AreEqual 0 $stoacl.VirtualNetworkRules.Count
553553

554-
Update-AzureRmStorageAccountNetworkRuleSet -verbose -ResourceGroupName $rgname -Name $stoname -Bypass AzureServices,Metrics -DefaultAction Allow -IpRule (@{IPAddressOrRange="$ip3";Action="allow"},@{IPAddressOrRange="$ip4";Action="allow"})
555-
$stoacl = Get-AzureRmStorageAccountNetworkRuleSet -ResourceGroupName $rgname -Name $stoname
554+
$sto | Update-AzureRmStorageAccountNetworkRuleSet -verbose -Bypass AzureServices,Metrics -DefaultAction Allow -IpRule (@{IPAddressOrRange="$ip3";Action="allow"},@{IPAddressOrRange="$ip4";Action="allow"})
555+
$stoacl = $sto | Get-AzureRmStorageAccountNetworkRuleSet
556556
$stoacliprule = $stoacl.IpRules
557557
Assert-AreEqual 6 $stoacl.Bypass;
558558
Assert-AreEqual Allow $stoacl.DefaultAction;
@@ -677,3 +677,44 @@ function Test-GetAzureStorageLocationUsage
677677
Assert-AreNotEqual 0 $usage.Limit;
678678
Assert-AreNotEqual 0 $usage.CurrentValue;
679679
}
680+
681+
<#
682+
.SYNOPSIS
683+
Test Get-AzureRmStorageAccount | New/Set-AzureRmStorageAccount
684+
#>
685+
function Test-PipingNewUpdateAccount
686+
{
687+
# Setup
688+
$rgname = Get-StorageManagementTestResourceName;
689+
690+
try
691+
{
692+
# Test
693+
$stoname = 'sto' + $rgname;
694+
$stoname2 = 'sto' + $rgname + '2';
695+
$stotype = 'Standard_GRS';
696+
$loc = Get-ProviderLocation ResourceManagement;
697+
698+
New-AzureRmResourceGroup -Name $rgname -Location $loc;
699+
700+
$global:sto = New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
701+
702+
Retry-IfException { $global:sto2 = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname | New-AzureRmStorageAccount -Name $stoname2 -skuName $stotype; }
703+
Assert-AreEqual $sto.ResourceGroupName $sto2.ResourceGroupName;
704+
Assert-AreEqual $sto.Location $sto2.Location;
705+
Assert-AreNotEqual $sto.StorageAccountName $sto2.StorageAccountName;
706+
707+
Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname | set-AzureRmStorageAccount -UpgradeToStorageV2
708+
$global:sto = $sto | set-AzureRmStorageAccount -EnableHttpsTrafficOnly $true
709+
Assert-AreEqual 'StorageV2' $sto.Kind;
710+
Assert-AreEqual $true $sto.EnableHttpsTrafficOnly;
711+
712+
Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname | Remove-AzureRmStorageAccount -Force;
713+
$sto2 | Remove-AzureRmStorageAccount -Force;
714+
}
715+
finally
716+
{
717+
# Cleanup
718+
Clean-ResourceGroup $rgname
719+
}
720+
}

0 commit comments

Comments
 (0)