Skip to content

Rethrow exception in Set-AzureNetworkSecurityGroupToSubnet #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 5, 2014
Merged

Rethrow exception in Set-AzureNetworkSecurityGroupToSubnet #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5abc36
Update Network.Test to WindowsAzure.Management.Common 2.1.0
Dec 5, 2014
3b39092
Add test for the bug fix.
Dec 5, 2014
805fe28
Rethrow exception if the exception doesn't mean we are replacing the …
Dec 5, 2014
259915e
Re-record all NSG scenario tests, including the new one.
Dec 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify that this package is updated for all projects in AzurePowerShell solution

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All other packages.config had been updated to 2.1.0 already and this one was missed.

image

<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>
Expand Down
2 changes: 1 addition & 1 deletion ...iceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 8 additions & 0 deletions ...ment/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
18 changes: 18 additions & 0 deletions ...rk/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NetworkSecurityGroupTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #############################

<#
Expand Down
257 changes: 169 additions & 88 deletions ...onRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/.ctor.json
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 189 additions & 99 deletions ...ft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestCreateAndRemoveNSG.json
View file
Open in desktop

Large diffs are not rendered by default.

325 changes: 215 additions & 110 deletions ...osoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestGetMultipleNSGs.json
View file
Open in desktop

Large diffs are not rendered by default.

468 changes: 309 additions & 159 deletions ...t.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGFromSubnet.json
View file
Open in desktop

Large diffs are not rendered by default.

144 changes: 93 additions & 51 deletions ...ommands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGWithNonExistingName.json
View file
Open in desktop

Large diffs are not rendered by default.

432 changes: 285 additions & 147 deletions ...s/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSR.json
View file
Open in desktop

Large diffs are not rendered by default.

415 changes: 275 additions & 140 deletions ...Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetAndGetNSGForSubnet.json
View file
Open in desktop

Large diffs are not rendered by default.

541 changes: 541 additions & 0 deletions ....Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSGToSubnetInDiffRegion.json
View file
Open in desktop

Large diffs are not rendered by default.

296 changes: 196 additions & 100 deletions ...ords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSR.json
View file
Open in desktop

Large diffs are not rendered by default.

214 changes: 143 additions & 71 deletions ....Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSRWithInvalidParameter.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ServiceManagement/Network/Commands.Network.Test/TestData/SimpleNetworkConfiguration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Network/Commands.Network.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 4 additions & 0 deletions ...work/Commands.Network/NetworkSecurityGroup/Subnet/SetAzureNetworkSecurityGroupToSubnet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ public override void ExecuteCmdlet()
}
});
}
else
{
throw;
}
}
}
}
Expand Down