Merge pull request Azure#3009 from DeepakRajendranMsft/release-3.0.0

[needs re-targeting to dev branch] Add Source property to EffectiveRoute and add warning if no response from GetEffectiveNSG

Author: markcowl

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

@@ -397,6 +397,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestAddNetworkInterface.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestEffectiveRoutesAndNsg.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestSingleNetworkInterfaceDnsSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.cs

@@ -53,7 +53,7 @@ public void TestAddNetworkInterface()
         }
 
 
-        [Fact(Skip ="to be recorded after fixing compute test proj")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEffectiveRoutesAndNsg()
         {

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1

@@ -578,12 +578,12 @@ function Test-EffectiveRoutesAndNsg
         Assert-AreEqual $getnic.Primary true;
         Assert-NotNull $getnic.MacAddress;
 
-        # Get Effective route
+        # Get Effective route by name
         $effectiveRoute = Get-AzureRmEffectiveRouteTable -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name
+		Assert-NotNull $effectiveRoute[0].Source
 
-        # Get Effective NSG
-        $effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name
-        
+        # Get Effective NSG by name
+        $effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name       
     }
     finally
     {

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestEffectiveRoutesAndNsg.json

@@ -26,6 +26,9 @@ public class PSEffectiveRoute
         [JsonProperty(Order = 1)]
         public string State { get; set; }
 
+        [JsonProperty(Order = 1)]
+        public string Source { get; set; }
+
         [JsonProperty(Order = 1)]
         public List<string> AddressPrefix { get; set; }
 

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

@@ -46,6 +46,11 @@ public override void Execute()
             var psEffectiveNsgs = Mapper.Map<List<PSEffectiveNetworkSecurityGroup>>(getEffectiveNsgs.Value);
 
             WriteObject(psEffectiveNsgs, true);
+
+            if (psEffectiveNsgs.Count == 0)
+            {
+                WriteWarning(Microsoft.Azure.Commands.Network.Properties.Resources.EmptyEffectiveNetworkSecurityGroupOnNic);
+            }
         }
     }
 }

src/ResourceManager/Network/Commands.Network/NetworkInterface/EffectiveResources/GetAzureEffectiveNetworkSecurityGroupCommand.cs

@@ -255,4 +255,7 @@
   <data name="UltraPerformanceGatewayWarningMessage" xml:space="preserve">
     <value>Please check the availability of UltraPerformance gateway on https://azure.microsoft.com/en-us/documentation/articles/expressroute-about-virtual-network-gateways/. You will be billed for this gateway once this command succeeds.</value>
   </data>
+  <data name="EmptyEffectiveNetworkSecurityGroupOnNic" xml:space="preserve">
+    <value>The effective network security group list is empty because the specified network interface is not associated with a network security group or the subnet that is referenced by the network interface is also not associated with a network security group.</value>
+  </data>
 </root>