Skip to content

Commit f8d1df4

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#7243 from MikhailTryakhov/local-september-release
September Azure networking release (Ignite)
2 parents 3c76192 + a52d259 commit f8d1df4

File tree

539 files changed

+210462
-126728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+210462
-126728
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
31-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.4.0-preview" />
31+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
3232
<PackageReference Include="Moq" Version="4.7.145" />
3333
</ItemGroup>
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.21.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.4.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="21.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="19.4.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="7.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
27+
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.0" />
28+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.4.0-preview" />
2929
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3030
</ItemGroup>
3131

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
<RunCodeAnalysis>false</RunCodeAnalysis>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="Microsoft.Azure.Management.Dns, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<Reference Include="Microsoft.Azure.Management.Dns">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
49+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.3.0.0\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.4.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5454
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>
@@ -91,6 +91,9 @@
9191
<None Include="ScenarioTests\Common.ps1">
9292
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9393
</None>
94+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestAliasRecordSet.json">
95+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
96+
</None>
9497
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestRecordSetA.json">
9598
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9699
</None>

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/RecordsTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ public RecordsTests(Xunit.Abstractions.ITestOutputHelper output)
3030
XunitTracingInterceptor.AddToContext(_logger);
3131
}
3232

33+
[Fact]
34+
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
public void TestAliasRecordSet()
36+
{
37+
DnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-AliasRecordSet");
38+
}
39+
3340
[Fact]
3441
[Trait(Category.AcceptanceType, Category.CheckIn)]
3542
public void TestRecordSetCrud()

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/RecordsTests.ps1

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,51 @@ function Test-RecordSetCrud
8585
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
8686
}
8787

88+
<#
89+
.SYNOPSIS
90+
Test Alias Record Set
91+
#>
92+
function Test-AliasRecordSet
93+
{
94+
$zoneName = Get-RandomZoneName
95+
$recordName = getAssetname
96+
$subscription = getSubscription
97+
$resourceGroup = TestSetup-CreateResourceGroup
98+
$recordType = "A"
99+
$zone = $resourceGroup | New-AzureRmDnsZone -Name $zoneName
100+
101+
# non alias record
102+
$record = $zone | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType $recordType -DnsRecords @()
103+
$record = $record | Add-AzureRmDnsRecordConfig -Ipv4Address 1.1.1.1
104+
$record = $record | Set-AzureRmDnsRecordSet
105+
106+
# alias record pointing to non-alias record
107+
$aliasRecordName = "alias" + $(getAssetname)
108+
$createdRecord = New-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -TargetResourceId $record.Id
109+
110+
Assert-NotNull $createdRecord
111+
Assert-AreEqual $zoneName $createdRecord.ZoneName
112+
Assert-AreEqual $aliasRecordName $createdRecord.Name
113+
Assert-AreEqual $resourceGroup.ResourceGroupName $createdRecord.ResourceGroupName
114+
115+
$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
116+
$nonaliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $recordName -RecordType $recordType
117+
Assert-AreEqual $record.Id $aliasRecord.TargetResourceId
118+
119+
$nonaliasRecord | Remove-AzureRmDnsRecordSet
120+
121+
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
122+
123+
$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
124+
Assert-Null $nonaliasRecord.TargetResourceId
125+
$aliasRecord | Remove-AzureRmDnsRecordSet
126+
127+
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
128+
129+
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
130+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
131+
}
132+
88133
<#
89134
.SYNOPSIS
90135
Full Record Set CRUD cycle trims terminating dot from zone name

0 commit comments

Comments
 (0)