Merge pull request #28 from dud5/nsgbugrethrow

Rethrow exception in Set-AzureNetworkSecurityGroupToSubnet

Author: ogail

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -78,9 +78,9 @@
     <Reference Include="Microsoft.WindowsAzure.Common.NetFramework">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Management, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Management, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.2.0.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.2.1.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/Common.ps1

@@ -62,7 +62,7 @@ Creates a Security Group.
 #>
 function New-NetworkSecurityGroup
 {
-    param([string] $securityGroupName)
+    param([string] $securityGroupName, [string] $location = $location)
 
     New-AzureNetworkSecurityGroup -Name $securityGroupName -Location $location -Label $NSGLabel
 }

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs

@@ -99,6 +99,14 @@ public void TestRemoveNSGFromSubnet()
             this.RunPowerShellTest("Test-RemoveNetworkSecurityGroupFromSubnet");
         }
 
+        [Fact]
+        [Trait(Category.Service, Category.Network)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSetNSGToSubnetInDiffRegion()
+        {
+            this.RunPowerShellTest("Test-SetNetworkSecurityGroupToSubnetInDifferentRegion");
+        }
+        
         #region Test setup
         protected void SetupManagementClients()
         {

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NetworkSecurityGroupTests.ps1

@@ -174,6 +174,24 @@ function Test-SetAndGetNetworkSecurityGroupForSubnet
     Assert-AreEqual $securityGroupFromSubnet.Name $securityGroupName
 }
 
+<#
+.SYNOPSIS
+Tests Set and Get-AzureNetworkSecurityGroupForSubnet
+#>
+function Test-SetNetworkSecurityGroupToSubnetInDifferentRegion
+{
+    # Setup
+    $securityGroupName = Get-SecurityGroupName
+    $securityRuleName = Get-SecurityRuleName
+    $securityGroupLocation = $locations[1].Name
+    $createdSecurityGroup = New-NetworkSecurityGroup $securityGroupName $securityGroupLocation
+    Set-AzureVNetConfig ($(Get-Location).Path +  "\TestData\SimpleNetworkConfiguration.xml")
+
+    # Assert
+    $expectedMessage = "BadRequest : The region europewest specified for the Network Security Group $securityGroupName is different than the region europenorth that Virtual Network $VirtualNetworkName belongs to, they need to belong to the same region."
+    Assert-Throws { Set-AzureNetworkSecurityGroupToSubnet -Name $securityGroupName -VirtualNetwork $VirtualNetworkName -Subnet $SubnetName -Force } $expectedMessage
+}
+
 ########################## Remove Network Security Group for Subnet Tests #############################
 
 <#

src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/.ctor.json

@@ -6,7 +6,7 @@
       <DnsServers />
     </Dns>
     <VirtualNetworkSites>
-      <VirtualNetworkSite name="VirtualNetworkSiteName" Location="North Central US">
+      <VirtualNetworkSite name="VirtualNetworkSiteName" Location="North Europe">
         <AddressSpace>
           <AddressPrefix>192.168.100.0/24</AddressPrefix>
         </AddressSpace>

src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestCreateAndRemoveNSG.json

@@ -12,7 +12,7 @@
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Common" version="1.4.1" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management" version="2.0.0" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Libraries" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.MediaServices" version="2.0.0" targetFramework="net45" />

src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestGetMultipleNSGs.json

@@ -72,6 +72,10 @@ public override void ExecuteCmdlet()
                             }
                         });
                 }
+                else
+                {
+                    throw;
+                }
             }
         }
     }