Skip to content

Commit 9c2c482

Browse files
authored
Support modifying PublicNetworkAccess (Azure#12008)
* Support modifying PublicNetworkAccess * Address comments
1 parent 20f021e commit 9c2c482

File tree

8 files changed

+2442
-8
lines changed

8 files changed

+2442
-8
lines changed

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,12 @@ public void TestPrivateEndpoint()
204204
{
205205
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PrivateEndpoint");
206206
}
207+
208+
[Fact]
209+
[Trait(Category.AcceptanceType, Category.CheckIn)]
210+
public void TestPublicNetworkAccess()
211+
{
212+
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PublicNetworkAccess");
213+
}
207214
}
208215
}

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.ps1

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,4 +1161,71 @@ function Test-PrivateEndpoint
11611161
# Cleanup
11621162
Clean-ResourceGroup $rgname
11631163
}
1164+
}
1165+
1166+
<#
1167+
.SYNOPSIS
1168+
Test PublicNetworkAccess
1169+
#>
1170+
function Test-PublicNetworkAccess
1171+
{
1172+
# Setup
1173+
$rgname = Get-CognitiveServicesManagementTestResourceName;
1174+
# Test
1175+
$accountname = 'csa' + $rgname;
1176+
$skuname = 'S1';
1177+
$accounttype = 'TextAnalytics';
1178+
$loc = "Central US EUAP";
1179+
1180+
1181+
try
1182+
{
1183+
New-AzResourceGroup -Name $rgname -Location $loc;
1184+
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
1185+
Assert-NotNull $createdAccount;
1186+
Assert-AreEqual $createdAccount.PublicNetworkAccess "Enabled"
1187+
1188+
$updatedAccount = Set-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -PublicNetworkAccess "Disabled"
1189+
Assert-NotNull $updatedAccount;
1190+
Assert-AreEqual $updatedAccount.PublicNetworkAccess "Disabled"
1191+
1192+
$updatedAccount = Set-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -PublicNetworkAccess "Enabled"
1193+
Assert-NotNull $updatedAccount;
1194+
Assert-AreEqual $updatedAccount.PublicNetworkAccess "Enabled"
1195+
1196+
$updatedAccount = Set-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -PublicNetworkAccess "Enabled"
1197+
Assert-NotNull $updatedAccount;
1198+
Assert-AreEqual $updatedAccount.PublicNetworkAccess "Enabled"
1199+
}
1200+
finally
1201+
{
1202+
# Cleanup
1203+
Clean-ResourceGroup $rgname
1204+
}
1205+
1206+
try
1207+
{
1208+
New-AzResourceGroup -Name $rgname -Location $loc;
1209+
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -PublicNetworkAccess "Enabled" -Force;
1210+
Assert-NotNull $createdAccount;
1211+
Assert-AreEqual $createdAccount.PublicNetworkAccess "Enabled"
1212+
}
1213+
finally
1214+
{
1215+
# Cleanup
1216+
Clean-ResourceGroup $rgname
1217+
}
1218+
1219+
try
1220+
{
1221+
New-AzResourceGroup -Name $rgname -Location $loc;
1222+
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -PublicNetworkAccess "Disabled" -Force;
1223+
Assert-NotNull $createdAccount;
1224+
Assert-AreEqual $createdAccount.PublicNetworkAccess "Disabled"
1225+
}
1226+
finally
1227+
{
1228+
# Cleanup
1229+
Clean-ResourceGroup $rgname
1230+
}
11641231
}

0 commit comments

Comments
 (0)