Skip to content

Commit ad8763c

Browse files
committed
[Storage] Support rounting preferences (Azure#11778)
1 parent 16ae5f7 commit ad8763c

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 TestNewAzureStorageAccountQueueTableEncrytionKeyType()
204204
{
205205
TestRunner.RunTestScript("Test-NewAzureStorageAccountQueueTableEncrytionKeyType");
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
@@ -1331,4 +1331,80 @@ function Test-NewAzureStorageAccountQueueTableEncrytionKeyType
13311331
# Cleanup
13321332
Clean-ResourceGroup $rgname
13331333
}
1334+
}
1335+
1336+
<#
1337+
.SYNOPSIS
1338+
Test Test-NewSetAzStorageAccount_RoutingPreference
1339+
.DESCRIPTION
1340+
SmokeTest
1341+
#>
1342+
function Test-NewSetAzStorageAccount_RoutingPreference
1343+
{
1344+
# Setup
1345+
$rgname = Get-StorageManagementTestResourceName;
1346+
1347+
try
1348+
{
1349+
# Test
1350+
$stoname = 'sto' + $rgname;
1351+
$stotype = 'Standard_LRS';
1352+
$loc = Get-ProviderLocation_Canary ResourceManagement;
1353+
$kind = 'StorageV2'
1354+
1355+
New-AzResourceGroup -Name $rgname -Location $loc;
1356+
Write-Output ("Resource Group created")
1357+
1358+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $true -RoutingChoice MicrosoftRouting;
1359+
1360+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1361+
Assert-AreEqual $stoname $sto.StorageAccountName;
1362+
Assert-AreEqual $stotype $sto.Sku.Name;
1363+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1364+
Assert-AreEqual $kind $sto.Kind;
1365+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1366+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1367+
Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
1368+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1369+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1370+
1371+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -RoutingChoice InternetRouting;
1372+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1373+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1374+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1375+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1376+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1377+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1378+
1379+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $false ;
1380+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1381+
Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
1382+
Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
1383+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1384+
Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1385+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1386+
1387+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishInternetEndpoint $false;
1388+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1389+
Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
1390+
Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
1391+
Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
1392+
Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1393+
Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1394+
1395+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $false -RoutingChoice MicrosoftRouting;
1396+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1397+
Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
1398+
Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
1399+
Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
1400+
Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
1401+
Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
1402+
1403+
Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
1404+
}
1405+
finally
1406+
{
1407+
# Cleanup
1408+
Clean-ResourceGroup $rgname
1409+
}
13341410
}

0 commit comments

Comments
 (0)