Skip to content

Commit e388ee0

Browse files
author
unknown
committed
merge from upstream
2 parents 8b8eded + 86f45a5 commit e388ee0

File tree

260 files changed

+48129
-4417
lines changed

Some content is hidden

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

260 files changed

+48129
-4417
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 48 additions & 12 deletions
Large diffs are not rendered by default.

‎src/AzurePowershell.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates",
222222
EndProject
223223
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
224224
EndProject
225+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement", "ResourceManager\ApiManagement\Commands.ApiManagement.ServiceManagement\Commands.ApiManagement.ServiceManagement.csproj", "{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}"
226+
EndProject
227+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement.Test", "ResourceManager\ApiManagement\Commands.SMAPI.Test\Commands.ApiManagement.ServiceManagement.Test.csproj", "{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}"
228+
EndProject
225229
Global
226230
GlobalSection(SolutionConfigurationPlatforms) = preSolution
227231
Debug|Any CPU = Debug|Any CPU
@@ -548,6 +552,14 @@ Global
548552
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
549553
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
550554
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
555+
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
556+
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
557+
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
558+
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.Build.0 = Release|Any CPU
559+
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
560+
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
561+
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
562+
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.Build.0 = Release|Any CPU
551563
EndGlobalSection
552564
GlobalSection(SolutionProperties) = preSolution
553565
HideSolutionNode = FALSE
@@ -592,5 +604,6 @@ Global
592604
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
593605
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
594606
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
607+
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
595608
EndGlobalSection
596609
EndGlobal

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
106106
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107107
</Reference>
108+
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
110+
<Private>True</Private>
111+
</Reference>
108112
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
109113
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
110114
</Reference>
@@ -205,6 +209,9 @@
205209
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunServiceManagementCloudExceptionTests.json">
206210
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
207211
</None>
212+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunStartAndStopMultipleVirtualMachinesTest.json">
213+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214+
</None>
208215
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestGetAzureLocation.json">
209216
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
210217
</None>

‎src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,68 @@ function Run-ServiceManagementCloudExceptionTests
6969
Assert-ThrowsLike { $st = Get-AzureService -ServiceName '*' } $compare;
7070
Assert-ThrowsLike { $st = Get-AzureVM -ServiceName '*' } $compare;
7171
Assert-ThrowsLike { $st = Get-AzureAffinityGroup -Name '*' } $compare;
72+
}
73+
74+
# Test Start/Stop-AzureVM for Multiple VMs
75+
function Run-StartAndStopMultipleVirtualMachinesTest
76+
{
77+
# Setup
78+
$location = Get-DefaultLocation;
79+
$imgName = Get-DefaultImage $location;
80+
81+
$storageName = 'pstest' + (getAssetName);
82+
New-AzureStorageAccount -StorageAccountName $storageName -Location $location;
83+
84+
# Associate the new storage account with the current subscription
85+
Set-CurrentStorageAccountName $storageName;
86+
87+
$vmNameList = @("vm01", "vm02", "test04");
88+
$svcName = 'pstest' + (Get-CloudServiceName);
89+
$userName = "pstestuser";
90+
$password = "p@ssw0rd";
91+
92+
# Test
93+
New-AzureService -ServiceName $svcName -Location $location;
94+
95+
try
96+
{
97+
foreach ($vmName in $vmNameList)
98+
{
99+
New-AzureQuickVM -Windows -ImageName $imgName -Name $vmName -ServiceName $svcName -AdminUsername $userName -Password $password;
100+
}
101+
102+
# Get VM List
103+
$vmList = Get-AzureVM -ServiceName $svcName;
104+
105+
# Test Stop
106+
Stop-AzureVM -Force -ServiceName $svcName -Name $vmNameList[0];
107+
Stop-AzureVM -Force -ServiceName $svcName -Name $vmNameList[0],$vmNameList[1];
108+
Stop-AzureVM -Force -ServiceName $svcName -Name $vmNameList;
109+
Stop-AzureVM -Force -ServiceName $svcName -Name '*';
110+
Stop-AzureVM -Force -ServiceName $svcName -Name 'vm*';
111+
Stop-AzureVM -Force -ServiceName $svcName -Name 'vm*','test*';
112+
Stop-AzureVM -Force -ServiceName $svcName -VM $vmList[0];
113+
Stop-AzureVM -Force -ServiceName $svcName -VM $vmList[0],$vmList[1];
114+
Stop-AzureVM -Force -ServiceName $svcName -VM $vmList;
115+
116+
# Test Start
117+
Start-AzureVM -ServiceName $svcName -Name $vmNameList[0];
118+
Start-AzureVM -ServiceName $svcName -Name $vmNameList[0],$vmNameList[1];
119+
Start-AzureVM -ServiceName $svcName -Name $vmNameList;
120+
Start-AzureVM -ServiceName $svcName -Name '*';
121+
Start-AzureVM -ServiceName $svcName -Name 'vm*';
122+
Start-AzureVM -ServiceName $svcName -Name 'vm*','test*';
123+
Start-AzureVM -ServiceName $svcName -VM $vmList[0];
124+
Start-AzureVM -ServiceName $svcName -VM $vmList[0],$vmList[1];
125+
Start-AzureVM -ServiceName $svcName -VM $vmList;
126+
}
127+
catch
128+
{
129+
130+
}
131+
finally
132+
{
133+
# Cleanup
134+
Cleanup-CloudService $svcName;
135+
}
72136
}

‎src/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Common.Authentication;
16-
using Microsoft.Azure.Test;
17-
using System.Collections.Generic;
18-
using System.IO;
19-
using System.Linq;
2015
using Xunit;
2116

2217
namespace Microsoft.WindowsAzure.Commands.ScenarioTest
2318
{
2419
public partial class ServiceManagementTests
2520
{
21+
[Fact]
22+
[Trait(Category.Service, Category.ServiceManagement)]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
[Trait(Category.AcceptanceType, Category.BVT)]
25+
public void TestGetAzureVM()
26+
{
27+
this.RunPowerShellTest("Test-GetAzureVM");
28+
}
29+
2630
[Fact]
2731
[Trait(Category.Service, Category.ServiceManagement)]
2832
[Trait(Category.AcceptanceType, Category.CheckIn)]
@@ -40,5 +44,14 @@ public void RunServiceManagementCloudExceptionTests()
4044
{
4145
this.RunPowerShellTest("Run-ServiceManagementCloudExceptionTests");
4246
}
47+
48+
[Fact]
49+
[Trait(Category.Service, Category.ServiceManagement)]
50+
[Trait(Category.AcceptanceType, Category.CheckIn)]
51+
[Trait(Category.AcceptanceType, Category.BVT)]
52+
public void RunStartAndStopMultipleVirtualMachinesTest()
53+
{
54+
this.RunPowerShellTest("Run-StartAndStopMultipleVirtualMachinesTest");
55+
}
4356
}
4457
}

‎src/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,33 @@
1414

1515
using Microsoft.Azure.Common.Authentication;
1616
using Microsoft.Azure.Test;
17+
using Microsoft.WindowsAzure.Management;
18+
using Microsoft.WindowsAzure.Management.Compute;
19+
using Microsoft.WindowsAzure.Management.Network;
20+
using Microsoft.WindowsAzure.Management.Storage;
1721
using System.Collections.Generic;
1822
using System.IO;
1923
using System.Linq;
20-
using Xunit;
2124

2225
namespace Microsoft.WindowsAzure.Commands.ScenarioTest
2326
{
2427
public partial class ServiceManagementTests
2528
{
2629
private EnvironmentSetupHelper helper = new EnvironmentSetupHelper();
2730

28-
[Fact]
29-
[Trait(Category.AcceptanceType, Category.CheckIn)]
30-
public void TestGetAzureVM()
31-
{
32-
this.RunPowerShellTest("Test-GetAzureVM");
33-
}
34-
3531
protected void SetupManagementClients()
3632
{
37-
helper.SetupSomeOfManagementClients();
33+
var rdfeTestFactory = new RDFETestEnvironmentFactory();
34+
var managementClient = TestBase.GetServiceClient<ManagementClient>(rdfeTestFactory);
35+
var computeClient = TestBase.GetServiceClient<ComputeManagementClient>(rdfeTestFactory);
36+
var networkClient = TestBase.GetServiceClient<NetworkManagementClient>(rdfeTestFactory);
37+
var storageClient = TestBase.GetServiceClient<StorageManagementClient>(rdfeTestFactory);
38+
39+
helper.SetupSomeOfManagementClients(
40+
managementClient,
41+
computeClient,
42+
networkClient,
43+
storageClient);
3844
}
3945

4046
protected void RunPowerShellTest(params string[] scripts)

‎src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunStartAndStopMultipleVirtualMachinesTest.json

Lines changed: 3937 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.2.0-preview" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
2122
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2223
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
2324
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

0 commit comments

Comments
 (0)