Skip to content

Commit 29508e0

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#4785 from kisantia/preview
Updating SQL vnet rules and tests with migration flag and state
2 parents 25cfc4e + db2a2dc commit 29508e0

18 files changed

+27044
-16779
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="Microsoft.Azure.Management.Network">
81-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.14.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
81+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.15.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Sql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8484
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.7.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
85+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.8.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Management.Storage">

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ public VirtualNetworkRuleTest(ITestOutputHelper output) : base(output)
3535
{
3636
}
3737

38-
[Fact(Skip = "Need to re-record tests with latest version of Network management library.")]
38+
[Fact]
3939
[Trait(Category.AcceptanceType, Category.CheckIn)]
4040
public void TestVirtualNetworkRuleCreateAndUpdate()
4141
{
4242
RunPowerShellTest("Test-CreateAndUpdateVirtualNetworkRule");
4343
}
4444

45-
[Fact(Skip = "Need to re-record tests with latest version of Network management library.")]
45+
[Fact]
4646
[Trait(Category.AcceptanceType, Category.CheckIn)]
4747
public void TestVirtualNetworkRuleGet()
4848
{
4949
RunPowerShellTest("Test-GetVirtualNetworkRule");
5050
}
5151

52-
[Fact(Skip = "Need to re-record tests with latest version of Network management library.")]
52+
[Fact]
5353
[Trait(Category.AcceptanceType, Category.CheckIn)]
5454
public void TestVirtualNetworkRuleRemove()
5555
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ function Test-CreateAndUpdateVirtualNetworkRule
3737
{
3838
# Create rule
3939
$virtualNetworkRule = New-AzureRmSqlServerVirtualNetworkRule -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
40-
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId1
40+
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId1 -IgnoreMissingVnetServiceEndpoint
4141
Assert-AreEqual $virtualNetworkRule.ServerName $server.ServerName
4242
Assert-AreEqual $virtualNetworkRule.VirtualNetworkRuleName $virtualNetworkRuleName
4343
Assert-AreEqual $virtualNetworkRule.VirtualNetworkSubnetId $virtualNetworkSubnetId1
4444

4545
# Update existing rule
4646
$virtualNetworkRule = Set-AzureRmSqlServerVirtualNetworkRule -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
47-
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId2
47+
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId2 -IgnoreMissingVnetServiceEndpoint
4848
Assert-AreEqual $virtualNetworkRule.ServerName $server.ServerName
4949
Assert-AreEqual $virtualNetworkRule.VirtualNetworkRuleName $virtualNetworkRuleName
5050
Assert-AreEqual $virtualNetworkRule.VirtualNetworkSubnetId $virtualNetworkSubnetId2
@@ -82,14 +82,14 @@ function Test-GetVirtualNetworkRule
8282
{
8383
# Create rule 1
8484
$virtualNetworkRule1 = New-AzureRmSqlServerVirtualNetworkRule -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
85-
-VirtualNetworkRuleName $virtualNetworkRuleName1 -VirtualNetworkSubnetId $virtualNetworkSubnetId1
85+
-VirtualNetworkRuleName $virtualNetworkRuleName1 -VirtualNetworkSubnetId $virtualNetworkSubnetId1 -IgnoreMissingVnetServiceEndpoint
8686
Assert-AreEqual $virtualNetworkRule1.ServerName $server.ServerName
8787
Assert-AreEqual $virtualNetworkRule1.VirtualNetworkRuleName $virtualNetworkRuleName1
8888
Assert-AreEqual $virtualNetworkRule1.VirtualNetworkSubnetId $virtualNetworkSubnetId1
8989

9090
# Create rule 2
9191
$virtualNetworkRule2 = New-AzureRmSqlServerVirtualNetworkRule -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
92-
-VirtualNetworkRuleName $virtualNetworkRuleName2 -VirtualNetworkSubnetId $virtualNetworkSubnetId2
92+
-VirtualNetworkRuleName $virtualNetworkRuleName2 -VirtualNetworkSubnetId $virtualNetworkSubnetId2 -IgnoreMissingVnetServiceEndpoint
9393
Assert-AreEqual $virtualNetworkRule2.ServerName $server.ServerName
9494
Assert-AreEqual $virtualNetworkRule2.VirtualNetworkRuleName $virtualNetworkRuleName2
9595
Assert-AreEqual $virtualNetworkRule2.VirtualNetworkSubnetId $virtualNetworkSubnetId2
@@ -132,7 +132,7 @@ function Test-RemoveVirtualNetworkRule
132132
{
133133
# Create rule
134134
$virtualNetworkRule = New-AzureRmSqlServerVirtualNetworkRule -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
135-
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId
135+
-VirtualNetworkRuleName $virtualNetworkRuleName -VirtualNetworkSubnetId $virtualNetworkSubnetId -IgnoreMissingVnetServiceEndpoint
136136
Assert-AreEqual $virtualNetworkRule.ServerName $server.ServerName
137137
Assert-AreEqual $virtualNetworkRule.VirtualNetworkRuleName $virtualNetworkRuleName
138138
Assert-AreEqual $virtualNetworkRule.VirtualNetworkSubnetId $virtualNetworkSubnetId

0 commit comments

Comments
 (0)