Merge branch 'network-september-release' into network-september-release

Author: khannarhea

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

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.4.0-preview" />
     <PackageReference Include="Moq" Version="4.2.1510.2205" />
   </ItemGroup>

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

@@ -44,9 +44,9 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.Dns, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.Dns">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.3.0.0\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -91,6 +91,9 @@
     <None Include="ScenarioTests\Common.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestAliasRecordSet.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestRecordSetA.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -30,6 +30,13 @@ public RecordsTests(Xunit.Abstractions.ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(_logger);
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAliasRecordSet()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-AliasRecordSet");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRecordSetCrud()

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

@@ -85,6 +85,51 @@ function Test-RecordSetCrud
 	Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
 }
 
+<#
+.SYNOPSIS
+Test Alias Record Set
+#>
+function Test-AliasRecordSet
+{
+	$zoneName = Get-RandomZoneName
+	$recordName = getAssetname
+	$subscription = getSubscription
+	$resourceGroup = TestSetup-CreateResourceGroup
+	$recordType = "A"
+	$zone = $resourceGroup | New-AzureRmDnsZone -Name $zoneName 
+
+	# non alias record
+	$record = $zone | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType $recordType -DnsRecords @()
+	$record = $record | Add-AzureRmDnsRecordConfig -Ipv4Address 1.1.1.1
+	$record = $record | Set-AzureRmDnsRecordSet
+	
+	# alias record pointing to non-alias record
+	$aliasRecordName = "alias" + $(getAssetname)
+	$createdRecord = New-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -TargetResourceId $record.Id
+
+	Assert-NotNull $createdRecord
+	Assert-AreEqual $zoneName $createdRecord.ZoneName 
+	Assert-AreEqual $aliasRecordName $createdRecord.Name 
+	Assert-AreEqual $resourceGroup.ResourceGroupName $createdRecord.ResourceGroupName
+
+	$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
+	$nonaliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $recordName -RecordType $recordType
+	Assert-AreEqual $record.Id $aliasRecord.TargetResourceId
+
+	$nonaliasRecord | Remove-AzureRmDnsRecordSet
+
+	Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
+
+	$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
+	Assert-Null $nonaliasRecord.TargetResourceId
+	$aliasRecord | Remove-AzureRmDnsRecordSet
+
+	Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
+
+	Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
+	Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
+}
+
 <#
 .SYNOPSIS
 Full Record Set CRUD cycle trims terminating dot from zone name