Skip to content

Commit 0bdbe77

Browse files
authored
[Storage] Support rounting preferences (#11778)
1 parent 4aa4220 commit 0bdbe77

File tree

11 files changed

+1959
-14
lines changed

11 files changed

+1959
-14
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,12 @@ public void TestNewSetAzureStorageAccountRAGZRS()
204204
{
205205
TestRunner.RunTestScript("Test-NewSetAzureStorageAccount_RAGZRS");
206206
}
207+
208+
[Fact]
209+
[Trait(Category.AcceptanceType, Category.CheckIn)]
210+
public void TestNewSetAStorageAccount_RoutingPreference()
211+
{
212+
TestRunner.RunTestScript("Test-NewSetAzStorageAccount_RoutingPreference");
213+
}
207214
}
208215
}

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,4 +1429,80 @@ function Test-NewSetAzureStorageAccount_RAGZRS
14291429
# Cleanup
14301430
Clean-ResourceGroup $rgname
14311431
}
1432+
}
1433+
1434+
<#
1435+
.SYNOPSIS
1436+
Test Test-NewSetAzStorageAccount_RoutingPreference
1437+
.DESCRIPTION
1438+
SmokeTest
1439+
#>
1440+
function Test-NewSetAzStorageAccount_RoutingPreference
1441+
{
1442+
# Setup
1443+
$rgname = Get-StorageManagementTestResourceName;
1444+
1445+
try
1446+
{
1447+
# Test
1448+
$stoname = 'sto' + $rgname;
1449+
$stotype = 'Standard_LRS';
1450+
$loc = Get-ProviderLocation_Canary ResourceManagement;
1451+
$kind = 'StorageV2'
1452+
1453+
New-AzResourceGroup -Name $rgname -Location $loc;
1454+
Write-Output ("Resource Group created")
1455+
1456+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $true -RoutingChoice MicrosoftRouting;
1457+
1458+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1459+
Assert-AreEqual $stoname $sto.StorageAccountName;
1460+
Assert-AreEqual $stotype $sto.Sku.Name;
1461+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1462+
Assert-AreEqual $kind $sto.Kind;
1463+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1464+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1465+
Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
1466+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1467+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1468+
1469+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -RoutingChoice InternetRouting;
1470+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1471+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1472+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1473+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1474+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1475+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1476+
1477+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $false ;
1478+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1479+
Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
1480+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1481+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1482+
Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1483+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1484+
1485+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishInternetEndpoint $false;
1486+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1487+
Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
1488+
Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
1489+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1490+
Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1491+
Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1492+
1493+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $false -RoutingChoice MicrosoftRouting;
1494+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1495+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1496+
Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
1497+
Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
1498+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1499+
Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1500+
1501+
Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
1502+
}
1503+
finally
1504+
{
1505+
# Cleanup
1506+
Clean-ResourceGroup $rgname
1507+
}
14321508
}

0 commit comments

Comments
 (0)