Skip to content

Commit

Permalink
Merge pull request #48 from Azure/dev
Browse files Browse the repository at this point in the history
.
  • Loading branch information
huangpf committed Jul 13, 2015
2 parents 4e3841d + 8eb13ac commit 6387364
Show file tree
Hide file tree
Showing 110 changed files with 16,033 additions and 6,071 deletions.
24 changes: 21 additions & 3 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,21 @@
* 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
* Fixed minor bugs AzureLoadbalancer
* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
* Added cmdlets to RouteTables and Routes
* New-AzureRouteTable
* Get-AzureRouteTable
* Set-AzureRouteTable
* Remove-AzureRouteTable
* New-AzureRouteConfig
* Add-AzureRouteConfig
* Set-AzureRouteConfig
* Get-AzureRouteConfig
* Remove-AzureRouteConfig
*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
Expand Down Expand Up @@ -111,6 +123,12 @@
* Get-AzureSqlDatabaseRestorePoints
* Changed cmdlets:
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
* Azure Recovery Services
* Fixed Storage and Network mapping issues
* Added encryption support for failover changes
* Added Delete vault support
* Provisioned to update VM properties
* Few bug fixes

2015.06.05 version 0.9.3
* Fixed bug in Websites cmdlets related to slots #454
Expand Down
4 changes: 4 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -3089,6 +3089,9 @@
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
</Component>
<Component Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" Guid="*">
<File Id="fil91A18D6C24D483473C8F08BC5DCED268" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.format.ps1xml" />
</Component>
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
</Component>
Expand Down Expand Up @@ -5052,6 +5055,7 @@
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
<ComponentRef Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" />
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<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, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<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>
Expand Down Expand Up @@ -142,8 +142,9 @@
<Compile Include="ScenarioTests\ApplicationGatewayTests.cs" />
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
<Compile Include="ScenarioTests\RouteTableTests.cs" />
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
<Compile Include="ScenarioTests\CheckDnsAvailabilityTest.cs" />
<Compile Include="ScenarioTests\TestDnsAvailabilityTest.cs" />
<Compile Include="ScenarioTests\VirtualNetworkTests.cs" />
<Compile Include="ScenarioTests\PublicIpAddressTests.cs" />
<Compile Include="ScenarioTests\VirtualNetworkGatewayTests.cs" />
Expand All @@ -167,10 +168,13 @@
<None Include="ScenarioTests\LoadBalancerTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\RouteTableTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\NetworkSecurityGroupTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\CheckDnsAvailabilityTest.ps1">
<None Include="ScenarioTests\TestDnsAvailabilityTest.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\VirtualNetworkTests.ps1">
Expand All @@ -190,11 +194,7 @@
</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>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
</None> <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
Expand Down Expand Up @@ -230,6 +230,9 @@
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDUsingId.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceEnableIPForwarding.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceIDns.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -251,6 +254,21 @@
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDStaticAllocation.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableCRUD.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableRouteCRUD.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableSubnetRef.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.TestDnsAvailabilityTest\TestDnsAvailability.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkCRUD.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,12 @@ public void TestNetworkInterfaceIDns()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceIDns");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestNetworkInterfaceEnableIPForwarding()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceEnableIPForwarding");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,74 @@ function Test-NetworkInterfaceIDns
Assert-AreEqual "Dynamic" $expectedNic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual "idnstest" $expectedNic.DnsSettings.InternalDnsNameLabel
Assert-Null $expectedNic.DnsSettings.InternalFqdn

# Delete NetworkInterface
$delete = Remove-AzureNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force
Assert-AreEqual true $delete

$list = Get-AzureNetworkInterface -ResourceGroupName $rgname
Assert-AreEqual 0 @($list).Count
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Tests creating new simple public networkinterface with Idns.
#>
function Test-NetworkInterfaceEnableIPForwarding
{
# Setup
$rgname = Get-ResourceGroupName
$vnetName = Get-ResourceName
$subnetName = Get-ResourceName
$publicIpName = Get-ResourceName
$nicName = Get-ResourceName
$domainNameLabel = Get-ResourceName
$rglocation = Get-ProviderLocation ResourceManagement
$resourceTypeParent = "Microsoft.Network/networkInterfaces"

$location = Get-ProviderLocation $resourceTypeParent

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 $subnetName -AddressPrefix 10.0.1.0/24
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet

# Create NetworkInterface
$actualNic = New-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -EnableIPForwarding
$expectedNic = Get-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname

Assert-AreEqual $expectedNic.ResourceGroupName $actualNic.ResourceGroupName
Assert-AreEqual $expectedNic.Name $actualNic.Name
Assert-AreEqual $expectedNic.Location $actualNic.Location
Assert-AreEqual "Succeeded" $expectedNic.ProvisioningState
Assert-AreEqual $expectedNic.IpConfigurations[0].Name $actualNic.IpConfigurations[0].Name
Assert-AreEqual $expectedNic.IpConfigurations[0].PublicIpAddress.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
Assert-AreEqual $expectedNic.IpConfigurations[0].Subnet.Id $actualNic.IpConfigurations[0].Subnet.Id
Assert-NotNull $expectedNic.IpConfigurations[0].PrivateIpAddress
Assert-AreEqual true $expectedNic.EnableIPForwarding

# Create NetworkInterface without IPForwarding
$nic = New-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -Force
Assert-AreEqual $expectedNic.Name $nic.Name
Assert-AreEqual false $nic.EnableIPForwarding

# set nic
$nic.EnableIPForwarding = $true
$nic = $nic | Set-AzureNetworkInterface

Assert-AreEqual $expectedNic.Name $nic.Name
Assert-AreEqual true $nic.EnableIPForwarding

# Delete NetworkInterface
$delete = Remove-AzureNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force
Assert-AreEqual true $delete
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// ----------------------------------------------------------------------------------
//
// 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 RouteTableTests
{
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestEmptyRouteTable()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-EmptyRouteTable");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRouteTableCRUD()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableCRUD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRouteTableSubnetRef()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableSubnetRef");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRouteTableRouteCRUD()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableRouteCRUD");
}

}
}
Loading

0 comments on commit 6387364

Please sign in to comment.