Skip to content

Commit 3888657

Browse files
ailnailn
committed
Merge remote-tracking branch 'upstream/ignite' into ignite
Conflicts: src/AzurePowershell.sln src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
2 parents 3da08f2 + 7427fd7 commit 3888657

File tree

149 files changed

+19516
-1198
lines changed

Some content is hidden

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

149 files changed

+19516
-1198
lines changed

‎ChangeLog.txt

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
1-
2015.04.29 version 0.9.0
1+
2015.05.01 version 0.9.1
2+
* Azure Automation
3+
* Added Automation cmdlets support in AzureResourceManager mode
4+
* Export-AzureAutomationDscConfiguration
5+
* Export-AzureAutomationDscNodeReportContent
6+
* Get-AzureAutomationAccount
7+
* Get-AzureAutomationDscCompilationJob
8+
* Get-AzureAutomationDscCompilationJobOutput
9+
* Get-AzureAutomationDscConfiguration
10+
* Get-AzureAutomationDscNode
11+
* Get-AzureAutomationDscNodeConfiguration
12+
* Get-AzureAutomationDscNodeReport
13+
* Get-AzureAutomationDscOnboardingMetaconfig
14+
* Get-AzureAutomationModule
15+
* Get-AzureAutomationRegistrationInfo
16+
* Import-AzureAutomationDscConfiguration
17+
* New-AzureAutomationAccount
18+
* New-AzureAutomationKey
19+
* New-AzureAutomationModule
20+
* Register-AzureAutomationDscNode
21+
* Remove-AzureAutomationAccount
22+
* Remove-AzureAutomationModule
23+
* Set-AzureAutomationAccount
24+
* Set-AzureAutomationDscNode
25+
* Set-AzureAutomationModule
26+
* Start-AzureAutomationDscCompilationJob
27+
* Unregister-AzureAutomationDscNode
28+
29+
2015.04.29 version 0.9.0
230
* Azure Compute
331
* Added Compute cmdlets support in AzureResourceManager mode
432
* Add-AzureVMSshPublicKey

‎src/AzurePowershell.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Te
204204
EndProject
205205
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{59D1B5DC-9175-43EC-90C6-CBA601B3565F}"
206206
EndProject
207+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Cmdlets", "ResourceManager\ResourceManager\Commands.ResourceManager\Cmdlets\Commands.ResourceManager.Cmdlets.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
208+
EndProject
207209
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement", "ResourceManager\ApiManagement\Commands.ApiManagement\Commands.ApiManagement.csproj", "{DC0A9742-DF36-48C9-BD2F-68D01AED6257}"
208210
EndProject
209211
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.Test", "ResourceManager\ApiManagement\Commands.ApiManagement.Test\Commands.ApiManagement.Test.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}"
@@ -498,6 +500,10 @@ Global
498500
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.Build.0 = Debug|Any CPU
499501
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.ActiveCfg = Release|Any CPU
500502
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.Build.0 = Release|Any CPU
503+
{8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
504+
{8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU
505+
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU
506+
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU
501507
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
502508
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.Build.0 = Debug|Any CPU
503509
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.5.0.1-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
74+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.3-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
75+
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="5.0.1-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="2.0.0-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.3-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@
8181
<SpecificVersion>False</SpecificVersion>
8282
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.5.0.1-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
8383
</Reference>
84-
<Reference Include="Microsoft.Azure.Management.Network">
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
84+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.3-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
86+
<Private>True</Private>
8687
</Reference>
8788
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8889
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="5.0.1-preview" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="2.0.0-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="2.0.3-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1515
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.3-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.ResourceManager">
7373
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -143,6 +143,9 @@
143143
<Compile Include="ScenarioTests\CheckDnsAvailabilityTest.cs" />
144144
<Compile Include="ScenarioTests\VirtualNetworkTests.cs" />
145145
<Compile Include="ScenarioTests\PublicIpAddressTests.cs" />
146+
<Compile Include="ScenarioTests\VirtualNetworkGatewayTests.cs" />
147+
<Compile Include="ScenarioTests\LocalNetworkGatewayTests.cs" />
148+
<Compile Include="ScenarioTests\VirtualNetworkGatewayConnectionTests.cs" />
146149
</ItemGroup>
147150
<ItemGroup>
148151
<None Include="app.config" />
@@ -151,26 +154,35 @@
151154
<SubType>Designer</SubType>
152155
</None>
153156
<None Include="ScenarioTests\Common.ps1">
154-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
157+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
155158
</None>
156159
<None Include="ScenarioTests\NetworkInterfaceTests.ps1">
157-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
160+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
158161
</None>
159162
<None Include="ScenarioTests\LoadBalancerTests.ps1">
160-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
163+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
161164
</None>
162165
<None Include="ScenarioTests\NetworkSecurityGroupTests.ps1">
163-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
166+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
164167
</None>
165168
<None Include="ScenarioTests\CheckDnsAvailabilityTest.ps1">
166-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
169+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
167170
</None>
168171
<None Include="ScenarioTests\VirtualNetworkTests.ps1">
169-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
172+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170173
</None>
171-
<None Include="ScenarioTests\PublicIpAddressTests.ps1">
172-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
174+
<None Include="ScenarioTests\VirtualNetworkGatewayTests.ps1">
175+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
176+
</None>
177+
<None Include="ScenarioTests\LocalNetworkGatewayTests.ps1">
178+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
173179
</None>
180+
<None Include="ScenarioTests\VirtualNetworkGatewayConnectionTests.ps1">
181+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182+
</None>
183+
<None Include="ScenarioTests\PublicIpAddressTests.ps1">
184+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
185+
</None>
174186
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.CheckDnsAvailabilityTest\TestCheckDnsAvailability.json">
175187
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
176188
</None>
@@ -252,6 +264,18 @@
252264
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkSecurityGroupTests\TestNetworkSecurityGroupSecurityRuleCRUD.json">
253265
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254266
</None>
267+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayCRUD.json">
268+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
269+
</None>
270+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LocalNetworkGatewayTests\TestLocalNetworkGatewayCRUD.json">
271+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
272+
</None>
273+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionCRUD.json">
274+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
275+
</None>
276+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionSharedKeyCRUD.json">
277+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
278+
</None>
255279
</ItemGroup>
256280
<ItemGroup>
257281
<ProjectReference Include="..\..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj">

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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 LocalNetworkGatewayTests
21+
{
22+
[Fact(Skip = "TODO: Fix test.")]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestLocalNetworkGatewayCRUD()
25+
{
26+
NetworkResourcesController.NewInstance.RunPsTest("Test-LocalNetworkGatewayCRUD");
27+
}
28+
}
29+
}

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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+
<#
16+
.SYNOPSIS
17+
Local network gateway tests
18+
#>
19+
function Test-LocalNetworkGatewayCRUD
20+
{
21+
# Setup
22+
$rgname = Get-ResourceGroupName
23+
$rname = Get-ResourceName
24+
$rglocation = Get-ProviderLocation ResourceManagement
25+
$resourceTypeParent = "Microsoft.Network/localNetworkGateways"
26+
$location = Get-ProviderLocation $resourceTypeParent
27+
28+
try
29+
{
30+
# Create the resource group
31+
$resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
32+
33+
# Create & Get LocalNetworkGateway
34+
$actual = New-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -AddressPrefix 192.168.0.0/16 -GatewayIpAddress 192.168.3.4
35+
$expected = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $rname
36+
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
37+
Assert-AreEqual $expected.Name $actual.Name
38+
Assert-AreEqual "192.168.3.4" $expected.GatewayIpAddress
39+
40+
# List LocalNetworkGateways
41+
$list = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname
42+
Assert-AreEqual 1 @($list).Count
43+
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
44+
Assert-AreEqual $list[0].Name $actual.Name
45+
Assert-AreEqual $list[0].Location $actual.Location
46+
Assert-AreEqual "192.168.3.4" $list[0].GatewayIpAddress
47+
48+
# Reset/Update LocalNetworkGateway
49+
$expected.GatewayIpAddress = "192.168.3.5"
50+
$actual = Reset-AzureLocalNetworkGateway -LocalNetworkGateway $expected
51+
$expected = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $rname
52+
Assert-AreEqual "192.168.3.5" $expected.GatewayIpAddress
53+
54+
# Delete LocalNetworkGateway
55+
$delete = Remove-AzureLocalNetworkGateway -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
56+
Assert-AreEqual true $delete
57+
58+
$list = Get-AzureLocalNetworkGateway -ResourceGroupName $actual.ResourceGroupName
59+
Assert-AreEqual 0 @($list).Count
60+
}
61+
finally
62+
{
63+
# Cleanup
64+
Clean-ResourceGroup $rgname
65+
}
66+
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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 VirtualNetworkGatewayConnectionTests
21+
{
22+
[Fact(Skip = "TODO: Fix test.")]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestVirtualNetworkGatewayConnectionCRUD()
25+
{
26+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionCRUD");
27+
}
28+
29+
[Fact(Skip = "TODO: Fix test.")]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD()
32+
{
33+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionSharedKeyCRUD");
34+
}
35+
}
36+
}

0 commit comments

Comments
 (0)