Skip to content

Commit 6387364

Browse files
huangpfhuangpf
committed
Merge pull request #48 from Azure/dev
.
2 parents 4e3841d + 8eb13ac commit 6387364

File tree

110 files changed

+16033
-6071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+16033
-6071
lines changed

‎ChangeLog.txt

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,21 @@
5959
* Set-AzureApplicationGatewaySslCertificate
6060
* Get-AzureApplicationGatewaySslCertificate
6161
* Remove-AzureApplicationGatewaySslCertificate
62-
*Azure Network cmdlets
63-
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
64-
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
62+
* Fixed minor bugs AzureLoadbalancer
63+
* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
64+
* Added cmdlets to RouteTables and Routes
65+
* New-AzureRouteTable
66+
* Get-AzureRouteTable
67+
* Set-AzureRouteTable
68+
* Remove-AzureRouteTable
69+
* New-AzureRouteConfig
70+
* Add-AzureRouteConfig
71+
* Set-AzureRouteConfig
72+
* Get-AzureRouteConfig
73+
* Remove-AzureRouteConfig
74+
*Azure Network cmdlets
75+
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
76+
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
6577

6678
2015.07.10 version 1.0.0
6779
* Azure Backup cmdlets
@@ -111,6 +123,12 @@
111123
* Get-AzureSqlDatabaseRestorePoints
112124
* Changed cmdlets:
113125
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
126+
* Azure Recovery Services
127+
* Fixed Storage and Network mapping issues
128+
* Added encryption support for failover changes
129+
* Added Delete vault support
130+
* Provisioned to update VM properties
131+
* Few bug fixes
114132

115133
2015.06.05 version 0.9.3
116134
* Fixed bug in Websites cmdlets related to slots #454

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,6 +3089,9 @@
30893089
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
30903090
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
30913091
</Component>
3092+
<Component Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" Guid="*">
3093+
<File Id="fil91A18D6C24D483473C8F08BC5DCED268" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.format.ps1xml" />
3094+
</Component>
30923095
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
30933096
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
30943097
</Component>
@@ -5052,6 +5055,7 @@
50525055
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
50535056
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
50545057
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
5058+
<ComponentRef Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" />
50555059
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
50565060
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
50575061
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
@@ -142,8 +142,9 @@
142142
<Compile Include="ScenarioTests\ApplicationGatewayTests.cs" />
143143
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
144144
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
145+
<Compile Include="ScenarioTests\RouteTableTests.cs" />
145146
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
146-
<Compile Include="ScenarioTests\CheckDnsAvailabilityTest.cs" />
147+
<Compile Include="ScenarioTests\TestDnsAvailabilityTest.cs" />
147148
<Compile Include="ScenarioTests\VirtualNetworkTests.cs" />
148149
<Compile Include="ScenarioTests\PublicIpAddressTests.cs" />
149150
<Compile Include="ScenarioTests\VirtualNetworkGatewayTests.cs" />
@@ -167,10 +168,13 @@
167168
<None Include="ScenarioTests\LoadBalancerTests.ps1">
168169
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
169170
</None>
171+
<None Include="ScenarioTests\RouteTableTests.ps1">
172+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
173+
</None>
170174
<None Include="ScenarioTests\NetworkSecurityGroupTests.ps1">
171175
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
172176
</None>
173-
<None Include="ScenarioTests\CheckDnsAvailabilityTest.ps1">
177+
<None Include="ScenarioTests\TestDnsAvailabilityTest.ps1">
174178
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
175179
</None>
176180
<None Include="ScenarioTests\VirtualNetworkTests.ps1">
@@ -190,11 +194,7 @@
190194
</None>
191195
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
192196
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
193-
</None>
194-
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.CheckDnsAvailabilityTest\TestCheckDnsAvailability.json">
195-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
196-
</None>
197-
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
197+
</None> <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
198198
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199199
</None>
200200
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
@@ -230,6 +230,9 @@
230230
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDUsingId.json">
231231
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232232
</None>
233+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceEnableIPForwarding.json">
234+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
235+
</None>
233236
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceIDns.json">
234237
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
235238
</None>
@@ -251,6 +254,21 @@
251254
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDStaticAllocation.json">
252255
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
253256
</None>
257+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
258+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259+
</None>
260+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableCRUD.json">
261+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262+
</None>
263+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableRouteCRUD.json">
264+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
265+
</None>
266+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableSubnetRef.json">
267+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
268+
</None>
269+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.TestDnsAvailabilityTest\TestDnsAvailability.json">
270+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
271+
</None>
254272
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkCRUD.json">
255273
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
256274
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkInterfaceTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,12 @@ public void TestNetworkInterfaceIDns()
6060
{
6161
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceIDns");
6262
}
63+
64+
[Fact]
65+
[Trait(Category.AcceptanceType, Category.CheckIn)]
66+
public void TestNetworkInterfaceEnableIPForwarding()
67+
{
68+
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceEnableIPForwarding");
69+
}
6370
}
6471
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkInterfaceTests.ps1

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,74 @@ function Test-NetworkInterfaceIDns
422422
Assert-AreEqual "Dynamic" $expectedNic.IpConfigurations[0].PrivateIpAllocationMethod
423423
Assert-AreEqual "idnstest" $expectedNic.DnsSettings.InternalDnsNameLabel
424424
Assert-Null $expectedNic.DnsSettings.InternalFqdn
425+
426+
# Delete NetworkInterface
427+
$delete = Remove-AzureNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force
428+
Assert-AreEqual true $delete
429+
430+
$list = Get-AzureNetworkInterface -ResourceGroupName $rgname
431+
Assert-AreEqual 0 @($list).Count
432+
}
433+
finally
434+
{
435+
# Cleanup
436+
Clean-ResourceGroup $rgname
437+
}
438+
}
439+
440+
<#
441+
.SYNOPSIS
442+
Tests creating new simple public networkinterface with Idns.
443+
#>
444+
function Test-NetworkInterfaceEnableIPForwarding
445+
{
446+
# Setup
447+
$rgname = Get-ResourceGroupName
448+
$vnetName = Get-ResourceName
449+
$subnetName = Get-ResourceName
450+
$publicIpName = Get-ResourceName
451+
$nicName = Get-ResourceName
452+
$domainNameLabel = Get-ResourceName
453+
$rglocation = Get-ProviderLocation ResourceManagement
454+
$resourceTypeParent = "Microsoft.Network/networkInterfaces"
455+
456+
$location = Get-ProviderLocation $resourceTypeParent
457+
458+
try
459+
{
460+
# Create the resource group
461+
$resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
462+
463+
# Create the Virtual Network
464+
$subnet = New-AzureVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
465+
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
466+
467+
# Create NetworkInterface
468+
$actualNic = New-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -EnableIPForwarding
469+
$expectedNic = Get-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname
470+
471+
Assert-AreEqual $expectedNic.ResourceGroupName $actualNic.ResourceGroupName
472+
Assert-AreEqual $expectedNic.Name $actualNic.Name
473+
Assert-AreEqual $expectedNic.Location $actualNic.Location
474+
Assert-AreEqual "Succeeded" $expectedNic.ProvisioningState
475+
Assert-AreEqual $expectedNic.IpConfigurations[0].Name $actualNic.IpConfigurations[0].Name
476+
Assert-AreEqual $expectedNic.IpConfigurations[0].PublicIpAddress.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
477+
Assert-AreEqual $expectedNic.IpConfigurations[0].Subnet.Id $actualNic.IpConfigurations[0].Subnet.Id
478+
Assert-NotNull $expectedNic.IpConfigurations[0].PrivateIpAddress
479+
Assert-AreEqual true $expectedNic.EnableIPForwarding
480+
481+
# Create NetworkInterface without IPForwarding
482+
$nic = New-AzureNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -Force
483+
Assert-AreEqual $expectedNic.Name $nic.Name
484+
Assert-AreEqual false $nic.EnableIPForwarding
485+
486+
# set nic
487+
$nic.EnableIPForwarding = $true
488+
$nic = $nic | Set-AzureNetworkInterface
425489

490+
Assert-AreEqual $expectedNic.Name $nic.Name
491+
Assert-AreEqual true $nic.EnableIPForwarding
492+
426493
# Delete NetworkInterface
427494
$delete = Remove-AzureNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force
428495
Assert-AreEqual true $delete

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/RouteTableTests.cs

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16+
using Xunit;
17+
18+
namespace Commands.Network.Test.ScenarioTests
19+
{
20+
public class RouteTableTests
21+
{
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestEmptyRouteTable()
25+
{
26+
NetworkResourcesController.NewInstance.RunPsTest("Test-EmptyRouteTable");
27+
}
28+
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestRouteTableCRUD()
32+
{
33+
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableCRUD");
34+
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestRouteTableSubnetRef()
39+
{
40+
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableSubnetRef");
41+
}
42+
43+
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
45+
public void TestRouteTableRouteCRUD()
46+
{
47+
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableRouteCRUD");
48+
}
49+
50+
}
51+
}

0 commit comments

Comments
 (0)