Skip to content

Commit a0de473

Browse files
committed
Rerecord lb tests
1 parent d1c470c commit a0de473

20 files changed

+6335
-5782
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165
<None Include="ScenarioTests\PublicIpAddressTests.ps1">
166166
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
167167
</None>
168+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
169+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170+
</None>
168171
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
169172
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170173
</None>
@@ -204,6 +207,9 @@
204207
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDNoDomainNameLabel.json">
205208
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
206209
</None>
210+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDReverseFqdn.json">
211+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212+
</None>
207213
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDStaticAllocation.json">
208214
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
209215
</None>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,12 @@ public void TestLoadBalancerSet()
8181
{
8282
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerSet");
8383
}
84+
85+
[Fact]
86+
[Trait(Category.AcceptanceType, Category.CheckIn)]
87+
public void TestCreateEmptyLoadBalancer()
88+
{
89+
NetworkResourcesController.NewInstance.RunPsTest("Test-CreateEmptyLoadBalancer");
90+
}
8491
}
8592
}

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

Lines changed: 89 additions & 88 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,12 @@ public void TestPublicIpAddressCRUDEditDomainNameLavel()
4646
{
4747
NetworkResourcesController.NewInstance.RunPsTest("Test-PublicIpAddressCRUD-EditDomainNameLavel");
4848
}
49+
50+
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
public void TestPublicIpAddressCRUDReverseFqdn()
53+
{
54+
NetworkResourcesController.NewInstance.RunPsTest("Test-PublicIpAddressCRUD-ReverseFqdn");
55+
}
4956
}
5057
}

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,55 @@ function Test-PublicIpAddressCRUD-EditDomainNameLavel
219219
# Cleanup
220220
Clean-ResourceGroup $rgname
221221
}
222+
}
223+
224+
<#
225+
.SYNOPSIS
226+
Tests edit the domain name label of a publicIpAddress.
227+
#>
228+
function Test-PublicIpAddressCRUD-ReverseFqdn
229+
{
230+
# Setup
231+
$rgname = Get-ResourceGroupName
232+
$rname = Get-ResourceName
233+
$domainNameLabel = Get-ResourceName
234+
$rglocation = Get-ProviderLocation ResourceManagement
235+
$resourceTypeParent = "Microsoft.Network/publicIpAddresses"
236+
$location = Get-ProviderLocation $resourceTypeParent
237+
238+
try
239+
{
240+
# Create the resource group
241+
$resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
242+
243+
# Create publicIpAddres
244+
$actual = New-AzurePublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
245+
$publicip = Get-AzurePublicIpAddress -ResourceGroupName $rgname -name $rname
246+
Assert-AreEqual $publicip.ResourceGroupName $actual.ResourceGroupName
247+
Assert-AreEqual $publicip.Name $actual.Name
248+
Assert-AreEqual $publicip.Location $actual.Location
249+
Assert-AreEqual "Dynamic" $publicip.PublicIpAllocationMethod
250+
Assert-AreEqual "Succeeded" $publicip.ProvisioningState
251+
Assert-AreEqual $domainNameLabel $publicip.DnsSettings.DomainNameLabel
252+
253+
$publicip.DnsSettings.ReverseFqdn = $publicip.DnsSettings.Fqdn
254+
255+
# Set publicIpAddress
256+
$publicip | Set-AzurePublicIpAddress
257+
258+
$publicip = Get-AzurePublicIpAddress -ResourceGroupName $rgname -name $rname
259+
Assert-AreEqual $publicip.DnsSettings.Fqdn $publicip.DnsSettings.ReverseFqdn
260+
261+
# delete
262+
$delete = Remove-AzurePublicIpAddress -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
263+
Assert-AreEqual true $delete
264+
265+
$list = Get-AzurePublicIpAddress -ResourceGroupName $actual.ResourceGroupName
266+
Assert-AreEqual 0 @($list).Count
267+
}
268+
finally
269+
{
270+
# Cleanup
271+
Clean-ResourceGroup $rgname
272+
}
222273
}

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

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

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

Lines changed: 284 additions & 723 deletions
Large diffs are not rendered by default.

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

Lines changed: 293 additions & 461 deletions
Large diffs are not rendered by default.

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

Lines changed: 334 additions & 609 deletions
Large diffs are not rendered by default.

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

Lines changed: 307 additions & 584 deletions
Large diffs are not rendered by default.

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

Lines changed: 389 additions & 447 deletions
Large diffs are not rendered by default.

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

Lines changed: 323 additions & 602 deletions
Large diffs are not rendered by default.

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

Lines changed: 356 additions & 576 deletions
Large diffs are not rendered by default.

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

Lines changed: 974 additions & 1087 deletions
Large diffs are not rendered by default.

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

Lines changed: 435 additions & 600 deletions
Large diffs are not rendered by default.

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

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

src/ResourceManager/Network/Commands.Network/LoadBalancer/ChildResourceHelper.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,12 @@ public static void NormalizeChildResourcesId(PSLoadBalancer loadBalancer)
124124
}
125125

126126
// Normalize FrontendIpconfig
127-
foreach (var frontendIpConfig in loadBalancer.FrontendIpConfigurations)
127+
if (loadBalancer.FrontendIpConfigurations != null)
128128
{
129-
frontendIpConfig.Id = string.Empty;
129+
foreach (var frontendIpConfig in loadBalancer.FrontendIpConfigurations)
130+
{
131+
frontendIpConfig.Id = string.Empty;
132+
}
130133
}
131134

132135
// Normalize Probe

src/ResourceManager/Network/Commands.Network/LoadBalancer/LoadBalancerRule/SetAzureLoadBalancerRuleConfigCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public override void ExecuteCmdlet()
7575
}
7676

7777
loadBalancingRule.FrontendIPConfiguration = null;
78-
if (string.IsNullOrEmpty(this.FrontendIpConfigurationId))
78+
if (!string.IsNullOrEmpty(this.FrontendIpConfigurationId))
7979
{
8080
loadBalancingRule.FrontendIPConfiguration = new PSResourceId() { Id = this.FrontendIpConfigurationId };
8181
}

src/ResourceManager/Network/Commands.Network/LoadBalancer/NewAzureLoadBalancerCommand.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,11 @@ private PSLoadBalancer CreateLoadBalancer()
116116
loadBalancer.ResourceGroupName = this.ResourceGroupName;
117117
loadBalancer.Location = this.Location;
118118

119-
loadBalancer.FrontendIpConfigurations = new List<PSFrontendIPConfiguration>();
120-
loadBalancer.FrontendIpConfigurations = this.FrontendIpConfiguration;
119+
if (this.FrontendIpConfiguration != null)
120+
{
121+
loadBalancer.FrontendIpConfigurations = new List<PSFrontendIPConfiguration>();
122+
loadBalancer.FrontendIpConfigurations = this.FrontendIpConfiguration;
123+
}
121124

122125
if (this.BackendAddressPool != null)
123126
{

src/ResourceManager/Network/Commands.Network/PublicIpAddress/NewAzurePublicIpAddressCommand.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public class NewAzurePublicIpAddressCommand : PublicIpAddressBaseCmdlet
6666
HelpMessage = "The Domain Name label.")]
6767
public string DomainNameLabel { get; set; }
6868

69+
[Parameter(
70+
Mandatory = false,
71+
ValueFromPipelineByPropertyName = true,
72+
HelpMessage = "The Reverse FQDN.")]
73+
public string ReverseFqdn { get; set; }
74+
6975
[Parameter(
7076
Mandatory = false,
7177
ValueFromPipelineByPropertyName = true,
@@ -118,6 +124,7 @@ private PSPublicIpAddress CreatePublicIpAddress()
118124
{
119125
publicIp.DnsSettings = new PSPublicIpAddressDnsSettings();
120126
publicIp.DnsSettings.DomainNameLabel = this.DomainNameLabel;
127+
publicIp.DnsSettings.ReverseFqdn = this.ReverseFqdn;
121128
}
122129

123130
var publicIpModel = Mapper.Map<MNM.PublicIpAddress>(publicIp);

0 commit comments

Comments
 (0)