Skip to content

Commit db714e5

Browse files
committed
Re-enable server communication link tests against Stage North europe
1 parent c05a38d commit db714e5

File tree

5 files changed

+3700
-18
lines changed

5 files changed

+3700
-18
lines changed

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2121
public class ServerCommunicationLinkCrudTests : SqlTestsBase
2222
{
2323
// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
24-
// [Fact]
24+
[Fact]
2525
[Trait(Category.AcceptanceType, Category.CheckIn)]
2626
public void TestServerCommunicationLinkCreate()
2727
{
2828
RunPowerShellTest("Test-CreateServerCommunicationLink");
2929
}
3030

3131
// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
32-
// [Fact]
32+
[Fact]
3333
[Trait(Category.AcceptanceType, Category.CheckIn)]
3434
public void TestServerCommunicationLinkGet()
3535
{
3636
RunPowerShellTest("Test-GetServerCommunicationLink");
3737
}
3838

3939
// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
40-
// [Fact]
40+
[Fact]
4141
[Trait(Category.AcceptanceType, Category.CheckIn)]
4242
public void TestServerCommunicationLinkRemove()
4343
{

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.ps1

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
function Test-CreateServerCommunicationLink
2020
{
2121
# Setup
22-
$rg = Create-ResourceGroupForTest
23-
$server = Create-ServerForTest $rg "Japan East"
24-
$server2 = Create-ServerForTest $rg "Japan East"
22+
$locationOverride = "North Europe"
23+
$serverVersion = "12.0"
24+
$rg = Create-ResourceGroupForTest $locationOverride
25+
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
26+
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride
2527

2628
try
2729
{
@@ -30,6 +32,7 @@ function Test-CreateServerCommunicationLink
3032
-LinkName $linkName -PartnerServer $server2.ServerName
3133

3234
Assert-NotNull $ep1
35+
Assert-AreEqual $linkName $ep1.Name
3336
Assert-AreEqual $server2.ServerName $ep1.PartnerServer
3437
}
3538
finally
@@ -45,23 +48,28 @@ function Test-CreateServerCommunicationLink
4548
function Test-GetServerCommunicationLink
4649
{
4750
# Setup
48-
$rg = Create-ResourceGroupForTest
49-
$server = Create-ServerForTest $rg "Japan East"
50-
$server2 = Create-ServerForTest $rg "Japan East"
51+
$locationOverride = "North Europe"
52+
$serverVersion = "12.0"
53+
$rg = Create-ResourceGroupForTest $locationOverride
54+
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
55+
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride
5156

5257
$linkName = Get-ElasticPoolName
5358
$ep1 = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
5459
-LinkName $linkName -PartnerServer $server2.ServerName
5560
Assert-NotNull $ep1
61+
Assert-AreEqual $linkName $ep1.Name
62+
Assert-AreEqual $server2.ServerName $ep1.PartnerServer
5663

5764
try
5865
{
5966
$gep1 = Get-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
60-
-LinkName $ep1.LinkName
61-
Assert-NotNull $ep1
62-
Assert-AreEqual $server2.ServerName $ep1.PartnerServer
67+
-LinkName $ep1.Name
68+
Assert-NotNull $gep1
69+
Assert-AreEqual $linkName $gep1.Name
70+
Assert-AreEqual $server2.ServerName $gep1.PartnerServer
6371

64-
$all = $server | Get-AzureRmSqlServerCommunicationLink
72+
$all = $server1 | Get-AzureRmSqlServerCommunicationLink
6573
Assert-AreEqual $all.Count 1
6674
}
6775
finally
@@ -77,9 +85,11 @@ function Test-GetServerCommunicationLink
7785
function Test-RemoveServerCommunicationLink
7886
{
7987
# Setup
80-
$rg = Create-ResourceGroupForTest
81-
$server1 = Create-ServerForTest $rg "Japan East"
82-
$server2 = Create-ServerForTest $rg "Japan East"
88+
$locationOverride = "North Europe"
89+
$serverVersion = "12.0"
90+
$rg = Create-ResourceGroupForTest $locationOverride
91+
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
92+
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride
8393

8494
$linkName = Get-ElasticPoolName
8595
$ep1 = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
@@ -88,9 +98,9 @@ function Test-RemoveServerCommunicationLink
8898

8999
try
90100
{
91-
Remove-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName -LinkName $ep1.LinkName -Force
101+
Remove-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName -LinkName $ep1.Name -Force
92102

93-
$all = $server | Get-AzureRmSqlServerCommunicationLink
103+
$all = $server1 | Get-AzureRmSqlServerCommunicationLink
94104
Assert-AreEqual $all.Count 0
95105
}
96106
finally

0 commit comments

Comments
 (0)