upstream merge

Author: kagamsft

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

@@ -230,6 +230,9 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDUsingId.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceIDns.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceSet.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -53,5 +53,12 @@ public void TestNetworkInterfaceSet()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceSet");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNetworkInterfaceIDns()
+        {
+            NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceIDns");
+        }
     }
 }

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

@@ -375,4 +375,64 @@ function Test-NetworkInterfaceSet
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Tests creating new simple public networkinterface with Idns.
+#>
+function Test-NetworkInterfaceIDns
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $vnetName = Get-ResourceName
+    $subnetName = Get-ResourceName
+    $publicIpName = Get-ResourceName
+    $nicName = Get-ResourceName
+    $domainNameLabel = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/networkInterfaces"
+    <#
+    uncomment after IDNS is enabled in all locations
+    $location = Get-ProviderLocation $resourceTypeParent
+    #>
+    $location = "centralus"
+    
+    try 
+    {
+        # Create the resource group
+        $resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"} 
+        
+        # Create the Virtual Network
+        $subnet = New-AzureVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
+        $vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
+
+        # Create NetworkInterface
+        $actualNic = New-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -InternalDnsNameLabel "idnstest"
+        $expectedNic = Get-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname
+
+        Assert-AreEqual $expectedNic.ResourceGroupName $actualNic.ResourceGroupName	
+        Assert-AreEqual $expectedNic.Name $actualNic.Name	
+        Assert-AreEqual $expectedNic.Location $actualNic.Location
+        Assert-AreEqual "Succeeded" $expectedNic.ProvisioningState
+        Assert-AreEqual $expectedNic.IpConfigurations[0].Name $actualNic.IpConfigurations[0].Name
+        Assert-AreEqual $expectedNic.IpConfigurations[0].PublicIpAddress.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
+        Assert-AreEqual $expectedNic.IpConfigurations[0].Subnet.Id $actualNic.IpConfigurations[0].Subnet.Id
+        Assert-NotNull $expectedNic.IpConfigurations[0].PrivateIpAddress
+        Assert-AreEqual "Dynamic" $expectedNic.IpConfigurations[0].PrivateIpAllocationMethod
+        Assert-AreEqual "idnstest" $expectedNic.DnsSettings.InternalDnsNameLabel
+        Assert-Null $expectedNic.DnsSettings.InternalFqdn
+
+        # Delete NetworkInterface
+        $delete = Remove-AzureNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force
+        Assert-AreEqual true $delete
+        
+        $list = Get-AzureNetworkInterface -ResourceGroupName $rgname
+        Assert-AreEqual 0 @($list).Count
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkInterfaceTests/TestNetworkInterfaceIDns.json

@@ -281,7 +281,7 @@
     <Compile Include="Models\PSProbeProtocol.cs" />
     <Compile Include="Models\PSAddressSpace.cs" />
     <Compile Include="Models\PSDhcpOptions.cs" />
-    <Compile Include="Models\PSDnsSettings.cs" />
+    <Compile Include="Models\PSNetworkInterfaceDnsSettings.cs" />
     <Compile Include="Models\PSNetworkInterface.cs" />
     <Compile Include="Models\PSNetworkInterfaceIpConfiguration.cs" />
     <Compile Include="Models\PSProvisioningState.cs" />

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

@@ -100,13 +100,12 @@ protected override void Configure()
 
             // NetworkInterface
             // CNM to MNM
-            Mapper.CreateMap<CNM.PSNetworkInterface, MNM.NetworkInterface>();
-            Mapper.CreateMap<CNM.PSDnsSettings, MNM.NetworkInterfaceDnsSettings>();
+            Mapper.CreateMap<CNM.PSNetworkInterfaceDnsSettings, MNM.NetworkInterfaceDnsSettings>();
             Mapper.CreateMap<CNM.PSNetworkInterfaceIpConfiguration, MNM.NetworkInterfaceIpConfiguration>();
 
             // MNM to CNM
             Mapper.CreateMap<MNM.NetworkInterface, CNM.PSNetworkInterface>();
-            Mapper.CreateMap<MNM.NetworkInterfaceDnsSettings, CNM.PSDnsSettings>();
+            Mapper.CreateMap<MNM.NetworkInterfaceDnsSettings, CNM.PSNetworkInterfaceDnsSettings>();
             Mapper.CreateMap<MNM.NetworkInterfaceIpConfiguration, CNM.PSNetworkInterfaceIpConfiguration>();
 
             // LoadBalancer

src/ResourceManager/Network/Commands.Network/Common/NetworkResourceManagerProfile.cs

@@ -24,7 +24,7 @@ public class PSNetworkInterface : PSTopLevelResource
 
         public List<PSNetworkInterfaceIpConfiguration> IpConfigurations { get; set; }
 
-        public PSDnsSettings DnsSettings { get; set; }
+        public PSNetworkInterfaceDnsSettings DnsSettings { get; set; }
 
         public string MacAddress { get; set; }
 
@@ -49,7 +49,7 @@ public string IpConfigurationsText
         [JsonIgnore]
         public string DnsSettingsText
         {
-            get { return JsonConvert.SerializeObject(DnsSettings, Formatting.Indented); }
+            get { return JsonConvert.SerializeObject(this.DnsSettings, Formatting.Indented); }
         }
 
         [JsonIgnore]

src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterface.cs

@@ -16,10 +16,14 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
-    public class PSDnsSettings
+    public class PSNetworkInterfaceDnsSettings
     {
         public List<string> DnsServers { get; set; }
 
         public List<string> AppliedDnsServers { get; set; }
+
+        public string InternalDnsNameLabel { get; set; }
+
+        public string InternalFqdn { get; set; }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSDnsSettings.cs renamed to src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterfaceDnsSettings.cs

@@ -143,6 +143,12 @@ public class NewAzureNetworkInterfaceCommand : NetworkInterfaceBaseCmdlet
             HelpMessage = "The list of Dns Servers")]
         public List<string> DnsServer { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The Internal Dns name")]
+        public string InternalDnsNameLabel { get; set; }
+
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
@@ -261,10 +267,18 @@ private PSNetworkInterface CreateNetworkInterface()
                 }
             }
 
-            if (this.DnsServer != null)
+            if (this.DnsServer != null || this.InternalDnsNameLabel != null)
             {
-                networkInterface.DnsSettings = new PSDnsSettings();
-                networkInterface.DnsSettings.DnsServers = this.DnsServer;
+                networkInterface.DnsSettings = new PSNetworkInterfaceDnsSettings();
+                if (this.DnsServer != null)
+                {
+                    networkInterface.DnsSettings.DnsServers = this.DnsServer;
+                }
+                if (this.InternalDnsNameLabel != null)
+                {
+                    networkInterface.DnsSettings.InternalDnsNameLabel = this.InternalDnsNameLabel;
+                }
+
             }
 
             networkInterface.IpConfigurations.Add(nicIpConfiguration);