Skip to content

Commit a3acd53

Browse files
yangyuanyangyuan
authored
[Cognitive Services] Update to use 2022-10-01 version. (Azure#19895)
1 parent a0d2c07 commit a3acd53

37 files changed

+18862
-26454
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.2.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="8.4.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="24.0.0" />
1616
</ItemGroup>
1717

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ function Test-SetAzureRmCognitiveServicesAccountWithVnet
402402
$vnetname = 'vnet' + $rgname;
403403
$skuname = 'S0';
404404
$accounttype = 'Face';
405-
$loc = Get-Location -providerNamespace "Microsoft.CognitiveServices" -resourceType "accounts" -preferredLocation "Central US EUAP";
405+
$loc = "SOUTHCENTRALUS";
406406

407407
New-AzResourceGroup -Name $rgname -Location $loc;
408408

@@ -834,7 +834,7 @@ function Test-GetUsages
834834
.SYNOPSIS
835835
Create a virtual network
836836
#>
837-
function CreateAndGetVirtualNetwork ($resourceGroupName, $vnetName, $location = "centraluseuap")
837+
function CreateAndGetVirtualNetwork ($resourceGroupName, $vnetName, $location = "SOUTHCENTRALUS")
838838
{
839839

840840
$subnet1 = New-AzVirtualNetworkSubnetConfig -Name "default" -AddressPrefix "200.0.0.0/24"
@@ -861,7 +861,7 @@ function Test-ManagedIdentity
861861
$accountname = 'csa' + $rgname;
862862
$skuname = 'S0';
863863
$accounttype = 'Face';
864-
$loc = "Central US EUAP";
864+
$loc = "SOUTHCENTRALUS";
865865

866866
New-AzResourceGroup -Name $rgname -Location $loc;
867867
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -Force;
@@ -881,7 +881,7 @@ function Test-ManagedIdentity
881881
$accountname = 'csa' + $rgname;
882882
$skuname = 'S0';
883883
$accounttype = 'Face';
884-
$loc = "Central US EUAP";
884+
$loc = "SOUTHCENTRALUS";
885885

886886
New-AzResourceGroup -Name $rgname -Location $loc;
887887
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
@@ -904,7 +904,7 @@ function Test-ManagedIdentity
904904
$accountname = 'csa' + $rgname;
905905
$skuname = 'S0';
906906
$accounttype = 'Face';
907-
$loc = "Central US EUAP";
907+
$loc = "SOUTHCENTRALUS";
908908

909909
New-AzResourceGroup -Name $rgname -Location $loc;
910910
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
@@ -927,7 +927,7 @@ function Test-ManagedIdentity
927927
$accountname = 'csa' + $rgname;
928928
$skuname = 'S0';
929929
$accounttype = 'Face';
930-
$loc = "Central US EUAP";
930+
$loc = "SOUTHCENTRALUS";
931931

932932
New-AzResourceGroup -Name $rgname -Location $loc;
933933
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -AssignIdentity -Force;
@@ -961,7 +961,7 @@ function Test-DisableLocalAuth
961961
$accountname = 'csa' + $rgname;
962962
$skuname = 'S0';
963963
$accounttype = 'TextAnalytics';
964-
$loc = "Central US EUAP";
964+
$loc = "SOUTHCENTRALUS";
965965

966966
New-AzResourceGroup -Name $rgname -Location $loc;
967967
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -DisableLocalAuth $true -Force;
@@ -981,7 +981,7 @@ function Test-DisableLocalAuth
981981
$accountname = 'csa' + $rgname;
982982
$skuname = 'S0';
983983
$accounttype = 'Face';
984-
$loc = "Central US EUAP";
984+
$loc = "SOUTHCENTRALUS";
985985

986986
New-AzResourceGroup -Name $rgname -Location $loc;
987987
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
@@ -1005,7 +1005,7 @@ function Test-DisableLocalAuth
10051005

10061006

10071007
<#
1008-
.SYNOPSIS
1008+
.SYNOPSISTest-ApiProperties
10091009
Test RestrictOutboundNetworkAccess
10101010
#>
10111011
function Test-RestrictOutboundNetworkAccess
@@ -1019,7 +1019,7 @@ function Test-RestrictOutboundNetworkAccess
10191019
$accountname = 'csa' + $rgname;
10201020
$skuname = 'S0';
10211021
$accounttype = 'Face';
1022-
$loc = "Central US EUAP";
1022+
$loc = "SOUTHCENTRALUS";
10231023

10241024
New-AzResourceGroup -Name $rgname -Location $loc;
10251025
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -RestrictOutboundNetworkAccess $true -AllowedFqdnList @("abc.com", "dfe.net") -Force;
@@ -1040,7 +1040,7 @@ function Test-RestrictOutboundNetworkAccess
10401040
$accountname = 'csa' + $rgname;
10411041
$skuname = 'S0';
10421042
$accounttype = 'Face';
1043-
$loc = "Central US EUAP";
1043+
$loc = "SOUTHCENTRALUS";
10441044

10451045
New-AzResourceGroup -Name $rgname -Location $loc;
10461046
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
@@ -1293,7 +1293,7 @@ function Test-PrivateEndpoint
12931293
$accountname = 'csa' + $rgname;
12941294
$skuname = 'S0';
12951295
$accounttype = 'Face';
1296-
$loc = "Central US EUAP";
1296+
$loc = "SOUTHCENTRALUS";
12971297

12981298
New-AzResourceGroup -Name $rgname -Location $loc;
12991299
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
@@ -1450,21 +1450,21 @@ function Test-ApiProperties
14501450
# Test
14511451
$accountname = 'csa' + $rgname;
14521452
$skuname = 'S0';
1453-
$accounttype = 'QnAMaker';
1454-
$loc = "West US";
1453+
$accounttype = 'QnAMaker.v2';
1454+
$loc = "SOUTHCENTRALUS";
14551455

14561456
New-AzResourceGroup -Name $rgname -Location $loc;
14571457
$apiProperties = New-AzCognitiveServicesAccountApiProperty
1458-
$apiProperties.QnaRuntimeEndpoint = "https://sdk-test-qna-maker.azurewebsites.net"
1458+
$apiProperties.QnaAzureSearchEndpointId = "https://sdk-test-qna-maker.azurewebsites.net"
14591459
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -ApiProperty $apiProperties -Force;
14601460
Assert-NotNull $createdAccount;
1461-
Assert-True {$createdAccount.ApiProperties.QnaRuntimeEndpoint -eq "https://sdk-test-qna-maker.azurewebsites.net"}
1461+
Assert-True {$createdAccount.ApiProperties.QnaAzureSearchEndpointId -eq "https://sdk-test-qna-maker.azurewebsites.net"}
14621462

1463-
$apiProperties.QnaRuntimeEndpoint = "https://qnamaker.azurewebsites.net"
1463+
$apiProperties.QnaAzureSearchEndpointId = "https://qnamaker.azurewebsites.net"
14641464

14651465
$updatedAccount = Set-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -ApiProperty $apiProperties -Force;
14661466
Assert-NotNull $updatedAccount;
1467-
Assert-True {$updatedAccount.ApiProperties.QnaRuntimeEndpoint -eq "https://qnamaker.azurewebsites.net"}
1467+
Assert-True {$updatedAccount.ApiProperties.QnaAzureSearchEndpointId -eq "https://qnamaker.azurewebsites.net"}
14681468
}
14691469
finally
14701470
{
@@ -1582,7 +1582,7 @@ function Test-Deployment
15821582
$accountname = 'csa' + $rgname;
15831583
$skuname = 'S0';
15841584
$accounttype = 'OpenAI';
1585-
$loc = "westus2";
1585+
$loc = "SOUTHCENTRALUS";
15861586

15871587
# generate a account
15881588
New-AzResourceGroup -Name $rgname -Location $loc;
@@ -1593,10 +1593,9 @@ function Test-Deployment
15931593

15941594
$properties = New-AzCognitiveServicesObject -Type DeploymentProperties
15951595
$properties.Model.Format = "OpenAI"
1596-
$properties.Model.Name = "ada"
1596+
$properties.Model.Name = "text-ada-001"
15971597
$properties.Model.Version = "1"
1598-
$properties.ScaleSettings.Capacity = 1
1599-
$properties.ScaleSettings.ScaleType = "Manual"
1598+
$properties.ScaleSettings.ScaleType = "Standard"
16001599

16011600
New-AzCognitiveServicesAccountDeployment -ResourceGroupName $rgname -AccountName $accountname -Name dpy -Properties $properties
16021601
Get-AzCognitiveServicesAccountDeployment -ResourceGroupName $rgname -AccountName $accountname

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

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

0 commit comments

Comments
 (0)