Merge pull request Azure#133 from dud5/interface-nsg

Adding cmdlets for adding NSGs to NICs

Author: markcowl

src/Common/Commands.Common/ServiceManagementTypes.cs

@@ -962,6 +962,9 @@ public AssignIPConfigurationCollection IPConfigurations
             }
         }
 
+        [DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 3)]
+        public string NetworkSecurityGroup { get; set; }
+
         [DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 4)]
         public string IPForwarding { get; set; }
     }

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/AddAzureNetworkInterfaceConfig.cs

@@ -33,6 +33,9 @@ public class AddAzureNetworkInterfaceConfig : VirtualMachineConfigurationCmdletB
         [Parameter(Position = 3, Mandatory = false, HelpMessage = "The static ip address.")]
         public string StaticVNetIPAddress { get; set; }
 
+        [Parameter(Position = 4, Mandatory = false, HelpMessage = "The network security group for this network interface.")]
+        public string NetworkSecurityGroup { get; set; }
+
         [Parameter(Position = 5, Mandatory = false, HelpMessage = "The IP Forwarding state for this network interface.")]
         [ValidateSet("Enabled", "Disabled", IgnoreCase = false)]
         public string IPForwarding { get; set; }
@@ -77,6 +80,7 @@ protected override void ProcessRecord()
                     {
                         ipConfig
                     },
+                    NetworkSecurityGroup = this.NetworkSecurityGroup,
                     IPForwarding = this.IPForwarding,
                 });
             WriteObject(VM);

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/SetAzureNetworkInterfaceConfig.cs

@@ -34,6 +34,9 @@ public class SetAzureNetworkInterfaceConfig : VirtualMachineConfigurationCmdletB
         [Parameter(Position = 3, Mandatory = false, HelpMessage = "The Subnet Name.")]
         public string StaticVNetIPAddress { get; set; }
 
+        [Parameter(Position = 4, Mandatory = false, HelpMessage = "The network security group for this network interface.")]
+        public string NetworkSecurityGroup { get; set; }
+
         [Parameter(Position = 5, Mandatory = false, HelpMessage = "The IP Forwarding state for this network interface.")]
         [ValidateSet("Enabled", "Disabled", IgnoreCase = false)]
         public string IPForwarding { get; set; }
@@ -64,6 +67,7 @@ protected override void ProcessRecord()
                 {
                     interfaces.IPConfigurations.First().SubnetName = this.SubnetName;
                     interfaces.IPConfigurations.First().StaticVirtualNetworkIPAddress = this.StaticVNetIPAddress;
+                    interfaces.NetworkSecurityGroup = this.NetworkSecurityGroup;
                     interfaces.IPForwarding = this.IPForwarding;
                 }
             }

src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj

@@ -146,6 +146,9 @@
   <ItemGroup>
     <Compile Include="IPForwarding\GetIPForwardingTests.cs" />
     <Compile Include="IPForwarding\SetIPForwardingTests.cs" />
+    <Compile Include="NetworkSecurityGroups\GetNetworkSecurityGroupAssociationTests.cs" />
+    <Compile Include="NetworkSecurityGroups\RemoveNetworkSecurityGroupAssociationTests.cs" />
+    <Compile Include="NetworkSecurityGroups\SetNetworkSecurityGroupAssociationTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Routes\GetEffectiveRouteTests.cs" />
     <Compile Include="ScenarioTests\IPForwarding\IPForwardingScenarioTests.cs" />
@@ -201,6 +204,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Network.Test.ScenarioTests.IPForwardingScenarioTests\SetIPForwardingOnVMAndUpdateVM.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests\SetNSGOnNICAndUpdateVM.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests\SetNSGOnRoleAndUpdateVM.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests\TestCreateAndRemoveNSG.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -232,6 +241,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Readme.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />