Skip to content

Commit

Permalink
Merge pull request #26 from Azure/dev
Browse files Browse the repository at this point in the history
pr from parent
  • Loading branch information
sethusrinivasan committed Jul 13, 2015
2 parents 63b788c + c567d87 commit 3c1c9fb
Show file tree
Hide file tree
Showing 133 changed files with 30,008 additions and 2,250 deletions.
69 changes: 66 additions & 3 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,75 @@
2015.07.10 version 1.0.0
2015.07.16 version 0.9.5
* Azure Network Resource Provider cmdlets
* Added Application Gateway cmdlets
* New-AzureApplicationGateway
* Start-AzureApplicationGateway
* Stop-AzureApplicationGateway
* SetAzureApplicationGateway
* GetAzureApplicationGateway
* RemoveAzureApplicationGateway
* Added Application Gateway Backend Address Pool cmdlets
* New-AzureApplicationGatewayBackendAddressPool
* Add-AzureApplicationGatewayBackendAddressPool
* Set-AzureApplicationGatewayBackendAddressPool
* Get-AzureApplicationGatewayBackendAddressPool
* Remove-AzureApplicationGatewayBackendAddressPool
* Added Application Gateway Backend HTTP Settings cmdlets
* New-AzureApplicationGatewayBackendHttpSettings
* Add-AzureApplicationGatewayBackendHttpSettings
* Set-AzureApplicationGatewayBackendHttpSettings
* Get-AzureApplicationGatewayBackendHttpSettings
* Remove-AzureApplicationGatewayBackendHttpSettings
* Added Application Gateway Frontend IP Configuration cmdlets
* New-AzureApplicationGatewayFrontendIPConfiguration
* Add-AzureApplicationGatewayFrontendIPConfiguration
* Set-AzureApplicationGatewayFrontendIPConfiguration
* Get-AzureApplicationGatewayFrontendIPConfiguration
* Remove-AzureApplicationGatewayFrontendIPConfiguration
* Added Application Gateway Frontend Port cmdlets
* New-AzureApplicationGatewayFrontendPort
* Add-AzureApplicationGatewayFrontendPort
* Set-AzureApplicationGatewayFrontendPort
* Get-AzureApplicationGatewayFrontendPort
* Remove-AzureApplicationGatewayFrontendPort
* Added Application Gateway IP Configuration cmdlets
* New-AzureApplicationGatewayGatewayIPConfiguration
* Add-AzureApplicationGatewayGatewayIPConfiguration
* Set-AzureApplicationGatewayGatewayIPConfiguration
* Get-AzureApplicationGatewayGatewayIPConfiguration
* Remove-AzureApplicationGatewayGatewayIPConfiguration
* Added Application Gateway HTTP Listener cmdlets
* New-AzureApplicationGatewayHttpListener
* Add-AzureApplicationGatewayHttpListener
* Set-AzureApplicationGatewayHttpListener
* Get-AzureApplicationGatewayHttpListener
* Remove-AzureApplicationGatewayHttpListener
* Added Application Gateway Request Routing Rule cmdlets
* New-AzureApplicationGatewayRequestRoutingRule
* Add-AzureApplicationGatewayRequestRoutingRule
* Set-AzureApplicationGatewayRequestRoutingRule
* Get-AzureApplicationGatewayRequestRoutingRule
* Remove-AzureApplicationGatewayRequestRoutingRule
* Added Application Gateway SKU cmdlets
* New-AzureApplicationGatewaySku
* Set-AzureApplicationGatewaySku
* Get-AzureApplicationGatewaySku
* Added Application Gateway SSL Certificate cmdlets
* New-AzureApplicationGatewaySslCertificate
* Add-AzureApplicationGatewaySslCertificate
* Set-AzureApplicationGatewaySslCertificate
* Get-AzureApplicationGatewaySslCertificate
* Remove-AzureApplicationGatewaySslCertificate
*Azure Network cmdlets
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter

2015.07.10 version 1.0.0
* Azure Backup cmdlets
*Added New-AzureBackupVault cmdlets
*Added Get-AzureBackupVault cmdlets
*Added Set-AzureBackupVault cmdlets
*Added Remove-AzureBackupVault cmdlets
*Added Get-AzureBackupVaultCredential cmdlets

2015.07.16 version 0.9.5
* Azure Resource Manager cmdlets
* Fixed formatting of output for Get-UsageAggregates
* Fixed executing Get-UsageAggregates when first cmdlet being called.
Expand Down
2 changes: 1 addition & 1 deletion src/AzurePowershell.sln
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{37455286-D8A7-4E0C-8B4D-C517D20C641A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{A3965B66-5A3E-4B8C-9574-28E5958D4828} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
Expand All @@ -588,6 +587,7 @@ Global
{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{374D4000-DEDE-4995-9B63-E3B9FE0C4D29} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Common/Commands.Common/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ use and privacy statement at <url> and (c) agree to sharing my contact inf
<value>Cannot find storage account '{0}' please type the name of an existing storage account.</value>
</data>
<data name="StorageEmulatorExe" xml:space="preserve">
<value>WAStorageEmulator.exe</value>
<value>AzureStorageEmulator.exe</value>
</data>
<data name="StorageEmulatorInstallPathRegistryKeyValue" xml:space="preserve">
<value>InstallPath</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,16 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.7-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Test.Framework">
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.7-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,17 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.7.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.7-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.7-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.7-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Test.Framework">
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
Expand Down Expand Up @@ -137,6 +139,7 @@
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="NetworkResourcesController.cs" />
<Compile Include="ScenarioTests\ApplicationGatewayTests.cs" />
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
Expand All @@ -152,6 +155,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="ScenarioTests\ApplicationGatewayTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\Common.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -182,6 +188,9 @@
<None Include="ScenarioTests\PublicIpAddressTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.CheckDnsAvailabilityTest\TestCheckDnsAvailability.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;

namespace Commands.Network.Test.ScenarioTests
{
public class ApplicationGatewayTests
{
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestApplicationGatewayCRUD()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-ApplicationGatewayCRUD");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# ----------------------------------------------------------------------------------
#
# Copyright Microsoft Corporation
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ----------------------------------------------------------------------------------

<#
.SYNOPSIS
Application gateway tests
#>
function Test-ApplicationGatewayCRUD
{
# Setup

$rgname = Get-ResourceGroupName
$rname = Get-ResourceName
$domainNameLabel = Get-ResourceName
$vnetName = Get-ResourceName
$publicIpName = Get-ResourceName
$vnetGatewayConfigName = Get-ResourceName
$rglocation = Get-ProviderLocation ResourceManagement
$resourceTypeParent = "Microsoft.Network/applicationgateways"
$location = Get-ProviderLocation $resourceTypeParent

$gipconfigname = Get-ResourceName
$fipconfigName = Get-ResourceName
$poolName = Get-ResourceName
$poolSettingName = Get-ResourceName
$frontendPortName = Get-ResourceName
$listenerName = Get-ResourceName
$ruleName = Get-ResourceName
$appgwName = Get-ResourceName

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 "GatewaySubnet" -AddressPrefix 10.0.0.0/24
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
$vnet = Get-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet

# Create the Application Gateway
$gipconfig = New-AzureApplicationGatewayIPConfiguration -Name $gipconfigname -Subnet $subnet
$pool = New-AzureApplicationGatewayBackendAddressPool -Name $poolName -BackendIPAddresses 1.1.1.1, 2.2.2.2, 3.3.3.3
$poolSetting = New-AzureApplicationGatewayBackendHttpSettings -Name $poolSettingName -Port 80 -Protocol HTTP -CookieBasedAffinity Disabled
$fp = New-AzureApplicationGatewayFrontendPort -Name $frontendPortName -Port 80
$fipconfig = New-AzureApplicationGatewayFrontendIPConfig -Name $fipconfigName -PublicIPAddress $publicip
$listener = New-AzureApplicationGatewayHttpListener -Name $listenerName -Protocol http -FrontendIpConfiguration $fipconfig -FrontendPort $fp
$rule = New-AzureApplicationGatewayRequestRoutingRule -Name $ruleName -RuleType basic -BackendHttpSettings $poolSetting -HttpListener $listener -BackendAddressPool $pool
$sku = New-AzureApplicationGatewaySku -Name Standard_Small -Tier Standard -Capacity 2

# $actual = New-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Location $location -BackendAddressPools $pool -BackendHttpSettingsCollection $poolSetting -FrontendIpConfigurations $fipconfig -GatewayIpConfigurations $gipconfig -FrontendPorts $fp -HttpListeners $listener -RequestRoutingRules $rule -Sku $sku
# $expected = Get-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname
# Compare-AzureApplicationGateway $actual $expected

# Stop-AzureApplicationGateway -ApplicationGateway $expected
# Remove-AzureApplicationGateway -Name $appgwName -ResourceGroupName $rgname
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Compare application gateways
#>
function Compare-AzureApplicationGateway($actual, $expected)
{
Assert-AreEqual $expected.Name $actual.Name
Assert-AreEqual $expected.Name $actual.Name
Assert-AreEqual $expected.Sku.Name $actual.Sku.Name
Assert-AreEqual $expected.Sku.Tier $actual.Sku.Tier
Assert-AreEqual $expected.Sku.Capacity $actual.Sku.Capacity
Assert-AreEqual $expected.FrontendPorts.Count $actual.FrontendPorts.Count
Assert-AreEqual $expected.SslCertificates.Count $actual.SslCertificates.Count
Assert-AreEqual $expected.BackendAddressPools.Count $actual.BackendAddressPools.Count
Assert-AreEqual $expected.BackendHttpSettingsCollection.Count $actual.BackendHttpSettingsCollection.Count
Assert-AreEqual $expected.HttpListeners.Count $actual.HttpListeners.Count
Assert-AreEqual $expected.RequestRoutingRules.Count $actual.RequestRoutingRules.Count
}
Loading

0 comments on commit 3c1c9fb

Please sign in to comment.