Skip to content

Commit 6b82d63

Browse files
EvgenyAgafonchikovEvgenyAgafonchikov
committed
Common fixes for LB/PublicIP SKU tests
1 parent 1cab39a commit 6b82d63

File tree

7 files changed

+4457
-18
lines changed

7 files changed

+4457
-18
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@
6060
<SpecificVersion>False</SpecificVersion>
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.4.0-preview\lib\net452\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.Management.Authorization">
63+
<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<Private>True</Private>
6566
</Reference>
6667
<Reference Include="Microsoft.Azure.Management.Network, Version=14.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6768
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.14.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
@@ -285,6 +286,12 @@
285286
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteBgpServiceCommunitiesGet.json">
286287
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
287288
</None>
289+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDInternalBasicSku.json">
290+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
291+
</None>
292+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicBasicSku.json">
293+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
294+
</None>
288295
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests\TestFlowLog.json">
289296
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
290297
</None>
@@ -426,6 +433,9 @@
426433
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressVmss.json">
427434
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
428435
</None>
436+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpBasicSku.json">
437+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
438+
</None>
429439
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
430440
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
431441
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LoadBalancerTests.ps1

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ function Test-SetLoadBalancerObjectAssignment
16971697
Clean-ResourceGroup $rgname
16981698
}
16991699
}
1700-
1700+
17011701

17021702
<#
17031703
.SYNOPSIS
@@ -1747,7 +1747,7 @@ function Test-LoadBalancerCRUD-PublicBasicSku
17471747
Assert-AreEqual $expectedLb.ResourceGroupName $actualLb.ResourceGroupName
17481748
Assert-AreEqual $expectedLb.Name $actualLb.Name
17491749
Assert-AreEqual $expectedLb.Location $actualLb.Location
1750-
Assert-AreEqual $expectedLb.Sku $actualLb.Sku
1750+
Assert-AreEqualObjectProperties $expectedLb.Sku $actualLb.Sku
17511751
Assert-AreEqual "Succeeded" $expectedLb.ProvisioningState
17521752
Assert-NotNull $expectedLb.ResourceGuid
17531753
Assert-AreEqual 1 @($expectedLb.FrontendIPConfigurations).Count
@@ -1772,7 +1772,7 @@ function Test-LoadBalancerCRUD-PublicBasicSku
17721772
$list = Get-AzureRmLoadBalancer -ResourceGroupName $rgname
17731773
Assert-AreEqual 1 @($list).Count
17741774
Assert-AreEqual $expectedLb.Etag $list[0].Etag
1775-
Assert-AreEqual $expectedLb.Sku $list[0].Sku
1775+
Assert-AreEqualObjectProperties $expectedLb.Sku $list[0].Sku
17761776
Assert-AreEqual $expectedLb.FrontendIPConfigurations[0].Etag $list[0].FrontendIPConfigurations[0].Etag
17771777
Assert-AreEqual $expectedLb.BackendAddressPools[0].Etag $list[0].BackendAddressPools[0].Etag
17781778
Assert-AreEqual $expectedLb.InboundNatRules[0].Etag $list[0].InboundNatRules[0].Etag
@@ -1841,7 +1841,7 @@ function Test-LoadBalancerCRUD-InternalBasicSku
18411841
Assert-AreEqual $expectedLb.ResourceGroupName $actualLb.ResourceGroupName
18421842
Assert-AreEqual $expectedLb.Name $actualLb.Name
18431843
Assert-AreEqual $expectedLb.Location $actualLb.Location
1844-
Assert-AreEqual $expectedLb.Sku $actualLb.Sku
1844+
Assert-AreEqualObjectProperties $expectedLb.Sku $actualLb.Sku
18451845
Assert-AreEqual "Succeeded" $expectedLb.ProvisioningState
18461846
Assert-AreEqual 1 @($expectedLb.FrontendIPConfigurations).Count
18471847

@@ -1865,7 +1865,7 @@ function Test-LoadBalancerCRUD-InternalBasicSku
18651865
$list = Get-AzureRmLoadBalancer -ResourceGroupName $rgname
18661866
Assert-AreEqual 1 @($list).Count
18671867
Assert-AreEqual $expectedLb.Etag $list[0].Etag
1868-
Assert-AreEqual $expectedLb.Sku list[0].Sku
1868+
Assert-AreEqualObjectProperties $expectedLb.Sku $list[0].Sku
18691869
Assert-AreEqual $expectedLb.FrontendIPConfigurations[0].Etag $list[0].FrontendIPConfigurations[0].Etag
18701870
Assert-AreEqual $expectedLb.BackendAddressPools[0].Etag $list[0].BackendAddressPools[0].Etag
18711871
Assert-AreEqual $expectedLb.InboundNatRules[0].Etag $list[0].InboundNatRules[0].Etag
@@ -1884,8 +1884,9 @@ function Test-LoadBalancerCRUD-InternalBasicSku
18841884
# Cleanup
18851885
Clean-ResourceGroup $rgname
18861886
}
1887+
}
18871888

1888-
<#
1889+
<#
18891890
.SYNOPSIS
18901891
Tests creating a public Load balancer with basic sku.
18911892
#>
@@ -1925,15 +1926,15 @@ function Test-LoadBalancerCRUD-PublicStandardSku
19251926
$probe = New-AzureRmLoadBalancerProbeConfig -Name $probeName -RequestPath healthcheck.aspx -Protocol http -Port 80 -IntervalInSeconds 15 -ProbeCount 2
19261927
$inboundNatRule = New-AzureRmLoadBalancerInboundNatRuleConfig -Name $inboundNatRuleName -FrontendIPConfiguration $frontend -Protocol Tcp -FrontendPort 3389 -BackendPort 3389 -IdleTimeoutInMinutes 15 -EnableFloatingIP
19271928
$lbrule = New-AzureRmLoadBalancerRuleConfig -Name $lbruleName -FrontendIPConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -Protocol Tcp -FrontendPort 80 -BackendPort 80 -IdleTimeoutInMinutes 15 -EnableFloatingIP -LoadDistribution SourceIP -DisableOutboundSNAT
1928-
$actualLb = New-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -Location $location -FrontendIpConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -InboundNatRule $inboundNatRule -LoadBalancingRule $lbrule -Sku Basic
1929+
$actualLb = New-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -Location $location -FrontendIpConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -InboundNatRule $inboundNatRule -LoadBalancingRule $lbrule -Sku Standard
19291930

19301931
$expectedLb = Get-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname
19311932

19321933
# Verification
19331934
Assert-AreEqual $expectedLb.ResourceGroupName $actualLb.ResourceGroupName
19341935
Assert-AreEqual $expectedLb.Name $actualLb.Name
19351936
Assert-AreEqual $expectedLb.Location $actualLb.Location
1936-
Assert-AreEqual $expectedLb.Sku $actualLb.Sku
1937+
Assert-AreEqualObjectProperties $expectedLb.Sku $actualLb.Sku
19371938
Assert-AreEqual "Succeeded" $expectedLb.ProvisioningState
19381939
Assert-NotNull $expectedLb.ResourceGuid
19391940
Assert-AreEqual 1 @($expectedLb.FrontendIPConfigurations).Count
@@ -1958,7 +1959,7 @@ function Test-LoadBalancerCRUD-PublicStandardSku
19581959
$list = Get-AzureRmLoadBalancer -ResourceGroupName $rgname
19591960
Assert-AreEqual 1 @($list).Count
19601961
Assert-AreEqual $expectedLb.Etag $list[0].Etag
1961-
Assert-AreEqual $expectedLb.Sku $list[0].Sku
1962+
Assert-AreEqualObjectProperties $expectedLb.Sku $list[0].Sku
19621963
Assert-AreEqual $expectedLb.FrontendIPConfigurations[0].Etag $list[0].FrontendIPConfigurations[0].Etag
19631964
Assert-AreEqual $expectedLb.BackendAddressPools[0].Etag $list[0].BackendAddressPools[0].Etag
19641965
Assert-AreEqual $expectedLb.InboundNatRules[0].Etag $list[0].InboundNatRules[0].Etag
@@ -2019,15 +2020,15 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20192020
$probe = New-AzureRmLoadBalancerProbeConfig -Name $probeName -RequestPath healthcheck.aspx -Protocol http -Port 80 -IntervalInSeconds 15 -ProbeCount 2
20202021
$inboundNatRule = New-AzureRmLoadBalancerInboundNatRuleConfig -Name $inboundNatRuleName -FrontendIPConfiguration $frontend -Protocol Tcp -FrontendPort 3389 -BackendPort 3389 -IdleTimeoutInMinutes 15 -EnableFloatingIP
20212022
$lbrule = New-AzureRmLoadBalancerRuleConfig -Name $lbruleName -FrontendIPConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -Protocol Tcp -FrontendPort 80 -BackendPort 80 -IdleTimeoutInMinutes 15 -EnableFloatingIP -LoadDistribution SourceIP
2022-
$actualLb = New-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -Location $location -FrontendIpConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -InboundNatRule $inboundNatRule -LoadBalancingRule $lbrule -Sku Basic
2023+
$actualLb = New-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -Location $location -FrontendIpConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -InboundNatRule $inboundNatRule -LoadBalancingRule $lbrule -Sku Standard
20232024

20242025
$expectedLb = Get-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname
20252026

20262027
# Verification
20272028
Assert-AreEqual $expectedLb.ResourceGroupName $actualLb.ResourceGroupName
20282029
Assert-AreEqual $expectedLb.Name $actualLb.Name
20292030
Assert-AreEqual $expectedLb.Location $actualLb.Location
2030-
Assert-AreEqual $expectedLb.Sku $actualLb.Sku
2031+
Assert-AreEqualObjectProperties $expectedLb.Sku $actualLb.Sku
20312032
Assert-AreEqual "Succeeded" $expectedLb.ProvisioningState
20322033
Assert-AreEqual 1 @($expectedLb.FrontendIPConfigurations).Count
20332034

@@ -2053,7 +2054,7 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20532054
$list = Get-AzureRmLoadBalancer -ResourceGroupName $rgname
20542055
Assert-AreEqual 1 @($list).Count
20552056
Assert-AreEqual $expectedLb.Etag $list[0].Etag
2056-
Assert-AreEqual $expectedLb.Sku list[0].Sku
2057+
Assert-AreEqualObjectProperties $expectedLb.Sku $list[0].Sku
20572058
Assert-AreEqual $expectedLb.FrontendIPConfigurations[0].Etag $list[0].FrontendIPConfigurations[0].Etag
20582059
Assert-AreEqual $expectedLb.BackendAddressPools[0].Etag $list[0].BackendAddressPools[0].Etag
20592060
Assert-AreEqual $expectedLb.InboundNatRules[0].Etag $list[0].InboundNatRules[0].Etag

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/PublicIpAddressTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,9 @@ function Test-PublicIpAddressVmss
414414
# Cleanup
415415
Clean-ResourceGroup $rgname
416416
}
417+
}
417418

418-
<#
419+
<#
419420
.SYNOPSIS
420421
Tests creating new simple publicIpAddress.
421422
#>
@@ -440,7 +441,7 @@ function Test-PublicIpAddressCRUD-BasicSku
440441
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
441442
Assert-AreEqual $expected.Name $actual.Name
442443
Assert-AreEqual $expected.Location $actual.Location
443-
Assert-AreEqual $expected.Sku $actual.Sku
444+
Assert-AreEqualObjectProperties $expected.Sku $actual.Sku
444445
Assert-AreEqual "Dynamic" $expected.PublicIpAllocationMethod
445446
Assert-NotNull $expected.ResourceGuid
446447
Assert-AreEqual "Succeeded" $expected.ProvisioningState
@@ -452,7 +453,7 @@ function Test-PublicIpAddressCRUD-BasicSku
452453
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
453454
Assert-AreEqual $list[0].Name $actual.Name
454455
Assert-AreEqual $list[0].Location $actual.Location
455-
Assert-AreEqual $list[0].Sku $actual.Sku
456+
Assert-AreEqualObjectProperties $list[0].Sku $actual.Sku
456457
Assert-AreEqual "Dynamic" $list[0].PublicIpAllocationMethod
457458
Assert-AreEqual "Succeeded" $list[0].ProvisioningState
458459
Assert-AreEqual $domainNameLabel $list[0].DnsSettings.DomainNameLabel
@@ -525,4 +526,3 @@ function Test-PublicIpAddressCRUD-StandardSku
525526
Clean-ResourceGroup $rgname
526527
}
527528
}
528-
}

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDInternalBasicSku.json

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

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDPublicBasicSku.json

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

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpBasicSku.json

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Insights" version="0.13.1-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.Compute" version="16.2.0" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Network" version="14.0.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Redis" version="3.1.1-preview" targetFramework="net45" />

0 commit comments

Comments
 (0)