Skip to content

Commit 869648f

Browse files
authored
Cognitive Services PowerShell Update to RP Version 2022-03-01 (#17630)
* Cognitive Services PowerShell Update to RP Version 2022-03-01 * Adress comments
1 parent ac74336 commit 869648f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+27024
-10487
lines changed

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="8.1.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="8.2.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="21.0.0" />
1616
</ItemGroup>
1717

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,5 +261,12 @@ public void TestDeployment()
261261
{
262262
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-Deployment");
263263
}
264+
265+
[Fact]
266+
[Trait(Category.AcceptanceType, Category.CheckIn)]
267+
public void TestListModels()
268+
{
269+
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ListModels");
270+
}
264271
}
265272
}

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

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,12 @@ function Test-GetAzureRmCognitiveServicesAccountSkus
597597
$skus = (Get-AzCognitiveServicesAccountSkus -Type 'TextAnalytics');
598598
$skuNames = $skus | Select-Object -ExpandProperty Name | Sort-Object | Get-Unique
599599

600-
$expectedSkus = "F0", "S", "S0","S1", "S2", "S3", "S4"
601-
Assert-AreEqualArray $expectedSkus $skuNames
600+
Assert-AreNotEqual 0 $skuNames.Count
602601

603602
$skus = (Get-AzCognitiveServicesAccountSkus -Type 'TextAnalytics' -Location 'westus');
604603
$skuNames = $skus | Select-Object -ExpandProperty Name | Sort-Object | Get-Unique
605604

606-
$expectedSkus = "F0", "S", "S0","S1", "S2", "S3", "S4"
607-
Assert-AreEqualArray $expectedSkus $skuNames
605+
Assert-AreNotEqual 0 $skuNames.Count
608606

609607
$skus = (Get-AzCognitiveServicesAccountSkus -Type 'QnAMaker' -Location 'global');
610608
$skuNames = $skus | Select-Object -ExpandProperty Name | Sort-Object | Get-Unique
@@ -1080,7 +1078,7 @@ function Test-UserAssignedIdentity
10801078
$accountname = 'csa' + $rgname;
10811079
$skuname = 'E0';
10821080
$accounttype = 'Face';
1083-
$loc = "Central US EUAP";
1081+
$loc = "WestUS2";
10841082

10851083
New-AzResourceGroup -Name $rgname -Location $loc;
10861084
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -IdentityType "UserAssigned" -UserAssignedIdentityId @("/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/yuanyang/providers/Microsoft.ManagedIdentity/userAssignedIdentities/sdk-test-mi") -Force;
@@ -1100,7 +1098,7 @@ function Test-UserAssignedIdentity
11001098
$accountname = 'csa' + $rgname;
11011099
$skuname = 'E0';
11021100
$accounttype = 'Face';
1103-
$loc = "Central US EUAP";
1101+
$loc = "WestUS2";
11041102

11051103
New-AzResourceGroup -Name $rgname -Location $loc;
11061104
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -Force;
@@ -1133,7 +1131,7 @@ function Test-Encryption
11331131
$accountname = 'csa' + $rgname;
11341132
$skuname = 'E0';
11351133
$accounttype = 'Face';
1136-
$loc = "Central US EUAP";
1134+
$loc = "West US 2";
11371135

11381136
New-AzResourceGroup -Name $rgname -Location $loc;
11391137
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -CognitiveServicesEncryption -Force;
@@ -1154,7 +1152,7 @@ function Test-Encryption
11541152
$accountname = 'csa' + $rgname;
11551153
$skuname = 'E0';
11561154
$accounttype = 'Face';
1157-
$loc = "Central US EUAP";
1155+
$loc = "West US 2";
11581156

11591157
New-AzResourceGroup -Name $rgname -Location $loc;
11601158
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -Force;
@@ -1303,9 +1301,24 @@ function Test-PrivateEndpoint
13031301
Assert-AreEqual $createdAccount.PublicNetworkAccess "Enabled"
13041302
Assert-AreEqual $createdAccount.PrivateEndpointConnections $null
13051303

1306-
$vnet = Get-AzVirtualNetwork -ResourceName yydemo-vnet -ResourceGroupName yuanyang-demo
1304+
$vnet = @{
1305+
Name = 'vnet-ut'
1306+
ResourceGroupName = $rgname
1307+
Location = 'Central US EUAP'
1308+
AddressPrefix = '10.0.0.0/16'
1309+
}
1310+
$virtualNetwork = New-AzVirtualNetwork @vnet
1311+
$subnet = @{
1312+
Name = 'default'
1313+
VirtualNetwork = $virtualNetwork
1314+
AddressPrefix = '10.0.0.0/24'
1315+
}
1316+
$subnetConfig = Add-AzVirtualNetworkSubnetConfig @subnet
1317+
$virtualNetwork | Set-AzVirtualNetwork
1318+
1319+
$vnet = Get-AzVirtualNetwork -ResourceName vnet-ut -ResourceGroupName $rgname
13071320
$plsConnection = New-AzPrivateLinkServiceConnection -Name pe-powershell-ut -PrivateLinkServiceId $createdAccount.Id -RequestMessage "Please Approve my request" -GroupId "account"
1308-
New-AzPrivateEndpoint -PrivateLinkServiceConnection $plsConnection -Subnet $vnet.Subnets[0] -Name pe-powershell-ut -ResourceGroupName yuanyang-demo -Location centraluseuap -Force
1321+
New-AzPrivateEndpoint -PrivateLinkServiceConnection $plsConnection -Subnet $vnet.Subnets[0] -Name pe-powershell-ut -ResourceGroupName $rgname -Location centraluseuap -Force
13091322

13101323
$account = Get-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname
13111324
Assert-AreEqual $account.PrivateEndpointConnections.Length 1
@@ -1597,6 +1610,39 @@ function Test-Deployment
15971610
}
15981611
}
15991612

1613+
<#
1614+
.SYNOPSIS
1615+
Test ListModels
1616+
#>
1617+
function Test-ListModels
1618+
{
1619+
# Setup
1620+
$rgname = Get-CognitiveServicesManagementTestResourceName;
1621+
1622+
try
1623+
{
1624+
# Test
1625+
$accountname = 'csa' + $rgname;
1626+
$skuname = 'S0';
1627+
$accounttype = 'OpenAI';
1628+
$loc = "westus2";
1629+
1630+
# generate a account
1631+
New-AzResourceGroup -Name $rgname -Location $loc;
1632+
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc;
1633+
Assert-NotNull $createdAccount;
1634+
1635+
$models = Get-AzCognitiveServicesAccountModel -ResourceGroupName $rgname -AccountName $accountname
1636+
1637+
Assert-AreNotEqual 0 $$models.Count
1638+
}
1639+
finally
1640+
{
1641+
# Cleanup
1642+
Clean-ResourceGroup $rgname
1643+
}
1644+
}
1645+
16001646

16011647
<#
16021648
.SYNOPSIS

src/CognitiveServices/CognitiveServices.Test/SessionRecords/CognitiveServices.Test.ScenarioTests.CognitiveServicesAccountTests/TestAccountSkus.json

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

0 commit comments

Comments
 (0)