Skip to content

Commit 7d1b37f

Browse files
Completed tests fixes; Updated SDK version
1 parent 6b82d63 commit 7d1b37f

File tree

6 files changed

+5243
-22
lines changed

6 files changed

+5243
-22
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,15 @@
289289
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDInternalBasicSku.json">
290290
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
291291
</None>
292+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDInternalStandardSku.json">
293+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
294+
</None>
292295
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicBasicSku.json">
293296
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
294297
</None>
298+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicStandardSku.json">
299+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300+
</None>
295301
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests\TestFlowLog.json">
296302
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
297303
</None>
@@ -436,6 +442,9 @@
436442
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpBasicSku.json">
437443
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
438444
</None>
445+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpStandardSku.json">
446+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
447+
</None>
439448
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
440449
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
441450
</None>

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,8 +1907,8 @@ function Test-LoadBalancerCRUD-PublicStandardSku
19071907
$rglocation = Get-ProviderLocation ResourceManagement
19081908
$resourceTypeParent = "Microsoft.Network/loadBalancers"
19091909
$location = Get-ProviderLocation $resourceTypeParent
1910-
1911-
try
1910+
1911+
try
19121912
{
19131913
# Create the resource group
19141914
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval"}
@@ -1918,7 +1918,7 @@ function Test-LoadBalancerCRUD-PublicStandardSku
19181918
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
19191919

19201920
# Create the publicip
1921-
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
1921+
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel -Sku Standard
19221922

19231923
# Create LoadBalancer
19241924
$frontend = New-AzureRmLoadBalancerFrontendIpConfig -Name $frontendName -PublicIpAddress $publicip
@@ -1938,7 +1938,7 @@ function Test-LoadBalancerCRUD-PublicStandardSku
19381938
Assert-AreEqual "Succeeded" $expectedLb.ProvisioningState
19391939
Assert-NotNull $expectedLb.ResourceGuid
19401940
Assert-AreEqual 1 @($expectedLb.FrontendIPConfigurations).Count
1941-
1941+
19421942
Assert-AreEqual $frontendName $expectedLb.FrontendIPConfigurations[0].Name
19431943
Assert-AreEqual $publicip.Id $expectedLb.FrontendIPConfigurations[0].PublicIpAddress.Id
19441944
Assert-Null $expectedLb.FrontendIPConfigurations[0].PrivateIpAddress
@@ -1990,8 +1990,6 @@ function Test-LoadBalancerCRUD-InternalStandardSku
19901990
$rgname = Get-ResourceGroupName
19911991
$vnetName = Get-ResourceName
19921992
$subnetName = Get-ResourceName
1993-
$publicIpName = Get-ResourceName
1994-
$domainNameLabel = Get-ResourceName
19951993
$lbName = Get-ResourceName
19961994
$frontendName = Get-ResourceName
19971995
$backendAddressPoolName = Get-ResourceName
@@ -2001,7 +1999,7 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20011999
$rglocation = Get-ProviderLocation ResourceManagement
20022000
$resourceTypeParent = "Microsoft.Network/loadBalancers"
20032001
$location = Get-ProviderLocation $resourceTypeParent
2004-
2002+
20052003
try
20062004
{
20072005
# Create the resource group
@@ -2010,18 +2008,15 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20102008
# Create the Virtual Network
20112009
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
20122010
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
2013-
2014-
# Create the publicip
2015-
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
20162011

20172012
# Create LoadBalancer
20182013
$frontend = New-AzureRmLoadBalancerFrontendIpConfig -Name $frontendName -Subnet $vnet.Subnets[0]
20192014
$backendAddressPool = New-AzureRmLoadBalancerBackendAddressPoolConfig -Name $backendAddressPoolName
20202015
$probe = New-AzureRmLoadBalancerProbeConfig -Name $probeName -RequestPath healthcheck.aspx -Protocol http -Port 80 -IntervalInSeconds 15 -ProbeCount 2
20212016
$inboundNatRule = New-AzureRmLoadBalancerInboundNatRuleConfig -Name $inboundNatRuleName -FrontendIPConfiguration $frontend -Protocol Tcp -FrontendPort 3389 -BackendPort 3389 -IdleTimeoutInMinutes 15 -EnableFloatingIP
2022-
$lbrule = New-AzureRmLoadBalancerRuleConfig -Name $lbruleName -FrontendIPConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -Protocol Tcp -FrontendPort 80 -BackendPort 80 -IdleTimeoutInMinutes 15 -EnableFloatingIP -LoadDistribution SourceIP
2017+
$lbrule = New-AzureRmLoadBalancerRuleConfig -Name $lbruleName -FrontendIPConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -Protocol Tcp -FrontendPort 80 -BackendPort 80 -IdleTimeoutInMinutes 15 -EnableFloatingIP -LoadDistribution SourceIP -DisableOutboundSNAT
20232018
$actualLb = New-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -Location $location -FrontendIpConfiguration $frontend -BackendAddressPool $backendAddressPool -Probe $probe -InboundNatRule $inboundNatRule -LoadBalancingRule $lbrule -Sku Standard
2024-
2019+
20252020
$expectedLb = Get-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname
20262021

20272022
# Verification
@@ -2047,8 +2042,8 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20472042
Assert-AreEqual $lbruleName $expectedLb.LoadBalancingRules[0].Name
20482043
Assert-AreEqual $expectedLb.FrontendIPConfigurations[0].Id $expectedLb.LoadBalancingRules[0].FrontendIPConfiguration.Id
20492044
Assert-AreEqual $expectedLb.BackendAddressPools[0].Id $expectedLb.LoadBalancingRules[0].BackendAddressPool.Id
2050-
Assert-AreEqual true $expectedlb.LoadBalancingRules[0].DisableOutboundSNAT
2051-
Assert-AreEqual true $actualLb.LoadBalancingRules[0].DisableOutboundSNAT
2045+
Assert-AreEqual true $expectedlb.LoadBalancingRules[0].DisableOutboundSNAT
2046+
Assert-AreEqual true $actualLb.LoadBalancingRules[0].DisableOutboundSNAT
20522047

20532048
# List
20542049
$list = Get-AzureRmLoadBalancer -ResourceGroupName $rgname
@@ -2060,7 +2055,7 @@ function Test-LoadBalancerCRUD-InternalStandardSku
20602055
Assert-AreEqual $expectedLb.InboundNatRules[0].Etag $list[0].InboundNatRules[0].Etag
20612056
Assert-AreEqual $expectedLb.Probes[0].Etag $list[0].Probes[0].Etag
20622057
Assert-AreEqual $expectedLb.LoadBalancingRules[0].Etag $list[0].LoadBalancingRules[0].Etag
2063-
Assert-AreEqual $expectedlb.LoadBalancingRules[0].DisableOutboundSNAT $actualLb.LoadBalancingRules[0].DisableOutboundSNAT
2058+
Assert-AreEqual $expectedlb.LoadBalancingRules[0].DisableOutboundSNAT $actualLb.LoadBalancingRules[0].DisableOutboundSNAT
20642059

20652060
# Delete
20662061
$deleteLb = Remove-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $rgname -PassThru -Force

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -492,23 +492,23 @@ function Test-PublicIpAddressCRUD-StandardSku
492492
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
493493

494494
# Create publicIpAddres
495-
$actual = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Static -Sku Standard
495+
$actual = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Static -Sku Standard -DomainNameLabel $domainNameLabel
496496
$expected = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $rname
497-
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
498-
Assert-AreEqual $expected.Name $actual.Name
497+
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
498+
Assert-AreEqual $expected.Name $actual.Name
499499
Assert-AreEqual $expected.Location $actual.Location
500-
Assert-AreEqual $expected.Sku $actual.Sku
500+
Assert-AreEqualObjectProperties $expected.Sku $actual.Sku
501501
Assert-AreEqual "Static" $expected.PublicIpAllocationMethod
502502
Assert-NotNull $expected.IpAddress
503503
Assert-AreEqual "Succeeded" $expected.ProvisioningState
504504

505505
# list
506506
$list = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname
507507
Assert-AreEqual 1 @($list).Count
508-
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
509-
Assert-AreEqual $list[0].Name $actual.Name
508+
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
509+
Assert-AreEqual $list[0].Name $actual.Name
510510
Assert-AreEqual $list[0].Location $actual.Location
511-
Assert-AreEqual $list[0].Sku $actual.Sku
511+
Assert-AreEqualObjectProperties $list[0].Sku $actual.Sku
512512
Assert-AreEqual "Static" $list[0].PublicIpAllocationMethod
513513
Assert-NotNull $list[0].IpAddress
514514
Assert-AreEqual "Succeeded" $list[0].ProvisioningState

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDInternalStandardSku.json

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

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDPublicStandardSku.json

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

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpStandardSku.json

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

0 commit comments

Comments
 (0)