Skip to content

Commit 50c5f05

Browse files
[SQL DB] Added Information Message that will be displayed Aure SQL DB with GeoDr link is migrated to Hyperscale edition (Azure#27530)
1 parent bc2caef commit 50c5f05

File tree

43 files changed

+193943
-31136
lines changed

Some content is hidden

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

43 files changed

+193943
-31136
lines changed

src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,8 +1393,8 @@ function Test-DatabaseUpdateWithPerDBCMK ($location = "eastus2euap")
13931393
# Setup
13941394
$rg = Create-ResourceGroupForTest
13951395
$server = Create-ServerForTest $rg $location
1396-
$encryptionProtector = "https://pstestkv.vault.azure.net/keys/testkey/f62d937858464f329ab4a8c2dc7e0fa4"
1397-
$umi = "/subscriptions/2c647056-bab2-4175-b172-493ff049eb29/resourceGroups/pstest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pstestumi"
1396+
$encryptionProtector = "https://kvpstest.vault.azure.net/keys/pstestkey/1493a5e6d9e34b429276c02457e42c0c"
1397+
$umi = "/subscriptions/10a238d6-a139-46d0-818d-d091394072b6/resourceGroups/pstest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pstestumi"
13981398

13991399
# Create with per db cmk enabled
14001400
$databaseName = Get-DatabaseName
@@ -1405,7 +1405,7 @@ function Test-DatabaseUpdateWithPerDBCMK ($location = "eastus2euap")
14051405
Assert-AreEqual $databaseFromGet.EncryptionProtector $encryptionProtector
14061406

14071407
# Update the db with new EncryptionProtector
1408-
$encryptionProtector2 = "https://pstestkv.vault.azure.net/keys/testkey1/6218d117492a42eda0b6a9334c9a989d"
1408+
$encryptionProtector2 = "https://kvpstest.vault.azure.net/keys/pstestkey1/f6143120ccd3400c94e244799d6d00d1"
14091409
$dbAfterUpdate = Set-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -EncryptionProtector $encryptionProtector2 -EncryptionProtectorAutoRotation:$false
14101410

14111411
$databaseGetAfterUpdate = Get-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName

src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.ps1

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -639,19 +639,20 @@ function Test-UpdateElasticPoolWithPreferredEnclaveType
639639
.SYNOPSIS
640640
Tests moving a database out of a Hyperscale elastic pool
641641
#>
642-
function Test-MoveDatabaseOutHyperscaleElasticPool
642+
function Test-MoveDatabaseOutHyperscaleElasticPool($location = "uksouth")
643643
{
644644
# Setup
645-
$location = "East US 2 EUAP"
646-
$rg = "pstest"
647-
$server = "canarysvr1"
645+
$rg = Create-ResourceGroupForTest $location
646+
$server = Create-ServerForTest $rg $location
648647

649648
try
650649
{
651650
# Create Hyperscale elastic pool
652651
$poolName = Get-ElasticPoolName
653-
$ep1 = New-AzSqlElasticPool -ServerName $server -ResourceGroupName $rg `
654-
-ElasticPoolName $poolName -VCore 4 -Edition Hyperscale -ComputeGeneration Gen5 -HighAvailabilityReplicaCount 2
652+
$job = New-AzSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
653+
-ElasticPoolName $poolName -VCore 4 -Edition "Hyperscale" -ComputeGeneration "Gen5" -HighAvailabilityReplicaCount 2 -AsJob
654+
$job | Wait-Job
655+
$ep1 = $job.Output
655656

656657
Assert-NotNull $ep1
657658
Assert-AreEqual Hyperscale $ep1.Edition
@@ -660,23 +661,23 @@ function Test-MoveDatabaseOutHyperscaleElasticPool
660661

661662
# Create database inside pool
662663
$databaseName = Get-DatabaseName
663-
$db = New-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -ElasticPoolName $poolName
664+
$db = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -ElasticPoolName $poolName
664665

665666
Assert-NotNull $db
666667
Assert-AreEqual Hyperscale $db.Edition
667668
Assert-AreEqual 2 $db.HighAvailabilityReplicaCount
668669

669670
#Move database out of elastic pool
670-
$db = Set-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -Edition "Hyperscale" -Vcore 4 -ComputeGeneration "Gen5"
671+
$db = Set-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -Edition "Hyperscale" -Vcore 4 -ComputeGeneration "Gen5"
671672
Assert-NotNull $db
672673
Assert-AreEqual Hyperscale $db.Edition
673674
Assert-AreEqual 4 $db.Capacity
674675
Assert-AreEqual 2 $db.HighAvailabilityReplicaCount
675676
}
676677
finally
677678
{
678-
Remove-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName
679-
Remove-AzSqlElasticPool -ElasticPoolName $poolName -ResourceGroupName $rg -ServerName $server
679+
Remove-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
680+
Remove-AzSqlElasticPool -ElasticPoolName $poolName -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName
680681
}
681682
}
682683

src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
.SYNOPSIS
1717
Tests create and update a database with read scale option
1818
#>
19-
function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location = "West Europe")
19+
function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location = "uksouth")
2020
{
2121
# Setup
2222
$rg = Create-ResourceGroupForTest
@@ -44,7 +44,7 @@ function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location
4444
.SYNOPSIS
4545
Tests Getting a database read scale option
4646
#>
47-
function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "West Europe")
47+
function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "uksouth")
4848
{
4949
# Setup
5050
$rg = Create-ResourceGroupForTest
@@ -81,7 +81,7 @@ function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "West E
8181
.SYNOPSIS
8282
Tests database HighAvailabilityReplicaCount option
8383
#>
84-
function Test-DatabaseReadReplicaCount ($serverVersion = "12.0", $location = "West Europe")
84+
function Test-DatabaseReadReplicaCount ($serverVersion = "12.0", $location = "uksouth")
8585
{
8686
# Setup
8787
$rg = Create-ResourceGroupForTest

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests/TestCreateServerlessDatabase.json

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

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests/TestDatabaseCancelOperation.json

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

0 commit comments

Comments
 (0)