Skip to content

Commit c23a66b

Browse files
franktsafranktsa
committed
Feedback response:
- Replaced tabs with spaces in test file - Removed Authentication reference in packages.config
1 parent a9b5073 commit c23a66b

File tree

3 files changed

+46
-48
lines changed

3 files changed

+46
-48
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.ps1

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,71 +13,71 @@
1313
# ----------------------------------------------------------------------------------
1414

1515
<#
16-
.SYNOPSIS
17-
Tests CRUD on disaster recovery configuration
16+
.SYNOPSIS
17+
Tests CRUD on disaster recovery configuration
1818
#>
1919
function Test-ServerDisasterRecoveryConfiguration
2020
{
21-
Test-ServerDisasterRecoveryConfigurationInternal
21+
Test-ServerDisasterRecoveryConfigurationInternal
2222
}
2323

2424
<#
25-
.SYNOPSIS
26-
Tests creating 2 servers, a disaster recovery configuration, failing over, then deleting
25+
.SYNOPSIS
26+
Tests creating 2 servers, a disaster recovery configuration, failing over, then deleting
2727
#>
2828
function Test-ServerDisasterRecoveryConfigurationInternal ($location1 = "North Europe", $location2 = "Southeast Asia")
2929
{
30-
# Setup
31-
$rg1 = Create-ResourceGroupForTest $location1
32-
$rg2 = Create-ResourceGroupForTest $location2
33-
34-
try
35-
{
36-
$server1 = Create-ServerForTest $rg1 "12.0" $location1
37-
$server2 = Create-ServerForTest $rg2 "12.0" $location2
38-
$failoverPolicy = "Off"
39-
$sdrcName = "test-sdrc-alias"
30+
# Setup
31+
$rg1 = Create-ResourceGroupForTest $location1
32+
$rg2 = Create-ResourceGroupForTest $location2
33+
34+
try
35+
{
36+
$server1 = Create-ServerForTest $rg1 "12.0" $location1
37+
$server2 = Create-ServerForTest $rg2 "12.0" $location2
38+
$failoverPolicy = "Off"
39+
$sdrcName = "test-sdrc-alias"
4040

41-
# Create and validate
42-
#
43-
$sdrc = New-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -PartnerResourceGroupName $rg2.ResourceGroupName -PartnerServerName $server2.ServerName
41+
# Create and validate
42+
#
43+
$sdrc = New-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -PartnerResourceGroupName $rg2.ResourceGroupName -PartnerServerName $server2.ServerName
4444

45-
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Primary"
46-
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Secondary"
45+
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Primary"
46+
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Secondary"
4747

48-
# Failover and check
49-
#
50-
Set-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg2.ResourceGroupName -ServerName $server2.ServerName -VirtualEndpointName $sdrcName -Failover
48+
# Failover and check
49+
#
50+
Set-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg2.ResourceGroupName -ServerName $server2.ServerName -VirtualEndpointName $sdrcName -Failover
5151

52-
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Primary"
53-
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Secondary"
52+
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Primary"
53+
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Secondary"
5454

55-
# Fail back and check
56-
#
57-
Set-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -Failover
55+
# Fail back and check
56+
#
57+
Set-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -Failover
5858

59-
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Primary"
60-
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Secondary"
59+
GetSdrcCheck $rg1 $server1 $sdrcName $rg2 $server2 $failoverPolicy "Primary"
60+
GetSdrcCheck $rg2 $server2 $sdrcName $rg1 $server1 $failoverPolicy "Secondary"
6161

62-
# Delete
63-
#
64-
Remove-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -Force
65-
}
66-
finally
67-
{
68-
Remove-ResourceGroupForTest $rg1
69-
Remove-ResourceGroupForTest $rg2
70-
}
62+
# Delete
63+
#
64+
Remove-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $rg1.ResourceGroupName -ServerName $server1.ServerName -VirtualEndpointName $sdrcName -Force
65+
}
66+
finally
67+
{
68+
Remove-ResourceGroupForTest $rg1
69+
Remove-ResourceGroupForTest $rg2
70+
}
7171
}
7272

7373
function GetSdrcCheck ($resourceGroup, $server, $virtualEndpointName, $partnerResourceGroup, $partnerServer, $failoverPolicy, $role)
7474
{
75-
$sdrcGet = Get-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $resourceGroup.ResourceGroupName -ServerName $server.ServerName -VirtualEndpointName $virtualEndpointName
75+
$sdrcGet = Get-AzureRmSqlServerDisasterRecoveryConfiguration -ResourceGroupName $resourceGroup.ResourceGroupName -ServerName $server.ServerName -VirtualEndpointName $virtualEndpointName
7676

77-
Assert-AreEqual $resourceGroup.ResourceGroupName $sdrcGet.ResourceGroupName
78-
Assert-AreEqual $server.ServerName $sdrcGet.ServerName
79-
Assert-AreEqual $virtualEndpointName $sdrcGet.VirtualEndpointName
80-
Assert-AreEqual $partnerServer.ServerName $sdrcGet.PartnerServerName
81-
Assert-AreEqual $failoverPolicy $sdrcGet.FailoverPolicy
82-
Assert-AreEqual $role $sdrcGet.Role
77+
Assert-AreEqual $resourceGroup.ResourceGroupName $sdrcGet.ResourceGroupName
78+
Assert-AreEqual $server.ServerName $sdrcGet.ServerName
79+
Assert-AreEqual $virtualEndpointName $sdrcGet.VirtualEndpointName
80+
Assert-AreEqual $partnerServer.ServerName $sdrcGet.PartnerServerName
81+
Assert-AreEqual $failoverPolicy $sdrcGet.FailoverPolicy
82+
Assert-AreEqual $role $sdrcGet.Role
8383
}

‎src/ResourceManager/Sql/Commands.Sql.Test/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.4.1-preview" targetFramework="net45" />
65
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
76
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
87
<package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />

‎src/ResourceManager/Sql/Commands.Sql/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.4.1-preview" targetFramework="net45" />
65
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
76
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
87
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />

0 commit comments

Comments
 (0)