Merge pull request #294 from karravi-msft/preview

Support for Private DNS zones in Azure DNS

Author: markcowl

src/ResourceManager/Dns/ChangeLog.md

@@ -18,7 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
-
+    * Support for Private DNS Zones (Public Preview feature)
+        - Adds ability to create DNS Zones that are visible only within associated virtual networks
 ## Version 3.3.1
 
 ## Version 3.3.0

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

@@ -63,7 +63,11 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Dns, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.1.7.2-preview\lib\net45\Microsoft.Azure.Management.Dns.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.1.11.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Azure.Management.Network, Version=14.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.14.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -104,7 +108,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -328,6 +332,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests\TestZoneCrud.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests\TestZoneCrudPrivateRegistrationVnet.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests\TestZoneCrudPrivateResolutionVnet.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests\TestZoneCrudTrimsDot.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -21,6 +21,15 @@ function Get-ResourceGroupName
     return getAssetName
 }
 
+<#
+.SYNOPSIS
+Gets valid resource group name
+#>
+function Get-VirtualNetworkName
+{
+    return getAssetName
+}
+
 <#
 .SYNOPSIS
 Gets valid resource name
@@ -71,6 +80,18 @@ function TestSetup-CreateResourceGroup
 	return $resourceGroup
 }
 
+<#
+.SYNOPSIS
+Creates a resource group to use in tests
+#>
+function TestSetup-CreateVirtualNetwork ($resourceGroup)
+{
+    $virtualNetworkName = Get-VirtualNetworkName
+    $virtualNetwork = New-AzureRmVirtualNetwork -Name $virtualNetworkName -resourceGroupName $resourceGroup.ResourceGroupName -location "WestUS" -AddressPrefix "192.168.1.0/24"
+	return $virtualNetwork
+}
+
+
 function Get-RandomZoneName
 {
 	$prefix = getAssetName;

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

@@ -14,6 +14,7 @@
 
 using System.Collections.Generic;
 using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Management.Network;
 using Microsoft.Azure.Test.HttpRecorder;
 using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 
@@ -38,23 +39,19 @@ public class DnsTestsBase : RMTestBase
     {
         private LegacyTest.CSMTestEnvironmentFactory csmTestFactory;
 
-
         private readonly EnvironmentSetupHelper helper;
-
-
+ 
         public ResourceManagementClient ResourceManagementClient { get; private set; }
 
         public SubscriptionClient SubscriptionClient { get; private set; }
 
-
         public GalleryClient GalleryClient { get; private set; }
 
-
         public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
 
-
         public DnsManagementClient DnsClient { get; private set; }
 
+        public NetworkManagementClient NetworkManagementClient { get; private set; }
 
         public static DnsTestsBase NewInstance
         {
@@ -64,28 +61,28 @@ public static DnsTestsBase NewInstance
             }
         }
 
-
         protected DnsTestsBase()
         {
             this.helper = new EnvironmentSetupHelper();
         }
 
-
         protected void SetupManagementClients(MockContext context) 
         {
             this.ResourceManagementClient = this.GetResourceManagementClient();
             this.SubscriptionClient = this.GetSubscriptionClient();
             this.GalleryClient = this.GetGalleryClient();
             this.AuthorizationManagementClient = this.GetAuthorizationManagementClient();
-            this.DnsClient = this.GetFeatureClient(context); 
+            this.DnsClient = this.GetFeatureClient(context);
+            this.NetworkManagementClient = this.GetNetworkManagementClient(context);
 
 
             this.helper.SetupManagementClients(
                 this.ResourceManagementClient,
                 this.SubscriptionClient,
                 this.GalleryClient,
                 this.AuthorizationManagementClient,
-                this.DnsClient);
+                this.DnsClient,
+                this.NetworkManagementClient);
         }
 
 
@@ -133,12 +130,15 @@ public void RunPsTestWorkflow(
                 }
 
 
-                this.SetupManagementClients(context); 
-
+                this.SetupManagementClients(context);
 
                 this.helper.SetupEnvironment(AzureModule.AzureResourceManager);
 
 
+
+
+
+
                 string callingClassName = callingClassType
                                         .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
                                         .Last();
@@ -148,6 +148,7 @@ public void RunPsTestWorkflow(
                     helper.RMProfileModule,
                     helper.RMResourceModule,
                     helper.GetRMModulePath("AzureRM.Dns.psd1"),
+                    helper.GetRMModulePath("AzureRM.Network.psd1"),
                     "AzureRM.Resources.ps1");
 
                 try
@@ -178,6 +179,12 @@ protected ResourceManagementClient GetResourceManagementClient()
             return LegacyTest.TestBase.GetServiceClient<ResourceManagementClient>(this.csmTestFactory);
         }
 
+        protected NetworkManagementClient GetNetworkManagementClient(MockContext context)
+        {
+            return context.GetServiceClient<NetworkManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
+        }
+
+
         private AuthorizationManagementClient GetAuthorizationManagementClient()
         {
             return LegacyTest.TestBase.GetServiceClient<AuthorizationManagementClient>(this.csmTestFactory);

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

@@ -31,6 +31,20 @@ public void TestZoneCrud()
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneCrudPrivateResolutionVnet()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrudPrivateResolutionVnet");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneCrudPrivateRegistrationVnet()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrudPrivateRegistrationVnet");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestZoneCrudTrimsDot()