Skip to content

Commit 85ba01b

Browse files
huangpfhuangpf
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Conflicts: src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj
2 parents 6b26e4b + b690811 commit 85ba01b

File tree

12 files changed

+77
-104
lines changed

12 files changed

+77
-104
lines changed

‎AzurePowershell.Test.targets

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
1212
<NetworkTestDebug>.\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll</NetworkTestDebug>
1313
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
14+
<AzureRTSeqTestSettings>.\src\AzureRTSeq.testsettings</AzureRTSeqTestSettings>
1415
<AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
1516
<StorageScenarioTestDebug>src\ServiceManagement\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
1617
<ManagementTestDebug>.\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll</ManagementTestDebug>
@@ -265,19 +266,11 @@
265266
ContinueOnError="false" />
266267
</Target>
267268

268-
<Target Name="AzureRTBVTsSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
269-
<Message Importance="high" Text="Running AzureRT BVT tests..." />
270-
<Delete Files="$(TestOutputDirectory)\RTBVTDebug.trx" />
271-
<Exec
272-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:BVT /resultsfile:$(TestOutputDirectory)\RTBVTDebug.trx"
273-
ContinueOnError="false" />
274-
</Target>
275-
276269
<Target Name="AzureRTOne" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
277270
<Message Importance="high" Text="Running a specific tests..." />
278271
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
279272
<Exec
280-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
273+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
281274
ContinueOnError="false" />
282275
</Target>
283276

@@ -293,15 +286,15 @@
293286
<Message Importance="high" Text="Running tests:" />
294287
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
295288
<Exec
296-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) $(TestParams) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
289+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) $(TestParams) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
297290
ContinueOnError="false" />
298291
</Target>
299292

300293
<Target Name="AzureRTAll" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
301294
<Message Importance="high" Text="Running AzureRT all tests..." />
302295
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
303296
<Exec
304-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
297+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
305298
ContinueOnError="false" />
306299
</Target>
307300

@@ -311,7 +304,7 @@
311304
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
312305
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
313306
<Exec
314-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
307+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
315308
ContinueOnError="true" />
316309
<Exec
317310
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTParAllFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
@@ -323,7 +316,7 @@
323316

324317
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
325318
<Exec
326-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
319+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
327320
ContinueOnError="true" />
328321
</Target>
329322

@@ -332,7 +325,7 @@
332325

333326
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
334327
<Exec
335-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
328+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
336329
ContinueOnError="false" />
337330
</Target>
338331

@@ -341,7 +334,7 @@
341334

342335
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
343336
<Exec
344-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
337+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTSeqTestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
345338
ContinueOnError="false" />
346339
</Target>
347340

‎src/AzureRTSeq.testsettings

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestSettings
3+
id="bbc9ef85-493f-459f-bc76-434f1966c32c"
4+
name="AzureRTSeq"
5+
enableDefaultDataCollectors="false"
6+
xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
7+
<Description>These are test settings for AzureRT test run.</Description>
8+
<Deployment>
9+
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
10+
<DeploymentItem filename="Package\Debug\" />
11+
</Deployment>
12+
<Execution parallelTestCount="1">
13+
<Timeouts testTimeout="3000000" />
14+
</Execution>
15+
</TestSettings>

‎src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ AliasesToExport = @(
115115
'Get-AzureSqlDatabaseServerAuditingPolicy',
116116
'Remove-AzureSqlDatabaseServerAuditing',
117117
'Set-AzureSqlDatabaseServerAuditingPolicy',
118-
'Use-AzureSqlDatabaseServerAuditingPolicy'
118+
'Use-AzureSqlDatabaseServerAuditingPolicy',
119+
'Get-AzureStorageContainerAcl',
120+
'Start-CopyAzureStorageBlob',
121+
'Stop-CopyAzureStorageBlob'
119122
)
120123

121124
# List of all modules packaged with this module

‎src/ResourceManager/Resources/Commands.Resources/ResourceManagerStartup.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@
1818
"Remove-AzureSqlDatabaseServerAuditing" = "Remove-AzureSqlServerAuditing";
1919
"Set-AzureSqlDatabaseServerAuditingPolicy" = "Set-AzureSqlServerAuditingPolicy";
2020
"Use-AzureSqlDatabaseServerAuditingPolicy" = "Use-AzureSqlServerAuditingPolicy";
21+
22+
# Storage aliases
23+
"Get-AzureStorageContainerAcl" = "Get-AzureStorageContainer";
24+
"Start-CopyAzureStorageBlob" = "Start-AzureStorageBlobCopy";
25+
"Stop-CopyAzureStorageBlob" = "Stop-AzureStorageBlobCopy";
2126
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,9 @@
445445
<None Include="Resources\download_VHD.csv">
446446
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
447447
</None>
448-
<None Include="Resources\DSC\DscExtensionTestConfigurationData.psd1" />
448+
<None Include="Resources\DSC\DscExtensionTestConfigurationData.psd1">
449+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
450+
</None>
449451
<None Include="Resources\HelloNoDiag.cscfg">
450452
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
451453
</None>
@@ -479,16 +481,10 @@
479481
<None Include="Resources\rdpcert.pfx">
480482
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
481483
</None>
482-
<None Include="Resources\ReservedIPConfig1.cscfg">
483-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
484-
</None>
485-
<None Include="Resources\ReservedIPConfig1update.cscfg">
484+
<None Include="Resources\ReservedIPConfig.cscfg">
486485
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
487486
</None>
488-
<None Include="Resources\ReservedIPConfig2.cscfg">
489-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
490-
</None>
491-
<None Include="Resources\ReservedIPConfig2update.cscfg">
487+
<None Include="Resources\ReservedIPConfigupdate.cscfg">
492488
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
493489
</None>
494490
<None Include="Resources\resume_VHD.csv">
@@ -509,7 +505,9 @@
509505
<None Include="Resources\storageAccountTestData.csv">
510506
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
511507
</None>
512-
<None Include="Resources\DSC\DscExtensionTestConfiguration.ps1" />
508+
<None Include="Resources\DSC\DscExtensionTestConfiguration.ps1">
509+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
510+
</None>
513511
<None Include="Resources\test1.ps1">
514512
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
515513
</None>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LocationBasedReservedIPTests.cs

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
2020
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
2121

22+
using System.Threading;
23+
2224
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
2325
{
2426
[TestClass]
@@ -72,7 +74,9 @@ public void CreateReservedIPThenPaaSVM()
7274
string reservedIpLabel1 = Utilities.GetUniqueShortName("ResrvdIPLbl", 5);
7375
string reservedIpLabel2 = Utilities.GetUniqueShortName("ResrvdIPLbl", 5);
7476
string dnsName = Utilities.GetUniqueShortName("Dns");
75-
string deploymentName = Utilities.GetUniqueShortName("Depl");
77+
string deploymentName1 = Utilities.GetUniqueShortName("Depl");
78+
string deploymentName2 = Utilities.GetUniqueShortName("Depl");
79+
7680
var input1 = new ReservedIPContext()
7781
{
7882
DeploymentName = string.Empty,
@@ -95,48 +99,41 @@ public void CreateReservedIPThenPaaSVM()
9599

96100
// Reserve a new IP
97101
Utilities.ExecuteAndLog(() => vmPowershellCmdlets.NewAzureReservedIP(reservedIpName1, locationName, reservedIpLabel1), "Reserve a new IP");
102+
98103
//Get the reserved ip and verify the reserved Ip properties.
99104
VerifyReservedIpNotInUse(input1);
100105

101106
// Reserve a new IP
102107
Utilities.ExecuteAndLog(() => vmPowershellCmdlets.NewAzureReservedIP(reservedIpName2, locationName, reservedIpLabel2), "Reserve a new IP");
108+
103109
//Get the reserved ip and verify the reserved Ip properties.
104110
VerifyReservedIpNotInUse(input2);
105111

106112
vmPowershellCmdlets.NewAzureService(serviceName, locationName);
107113

108-
109114
var _packageName = Convert.ToString(TestContext.DataRow["packageName"]);
110-
var _configName1 = Convert.ToString(TestContext.DataRow["configName1"]);
111-
var _configName2 = Convert.ToString(TestContext.DataRow["configName2"]);
112-
var _configName1update = Convert.ToString(TestContext.DataRow["updateConfig1"]);
113-
var _configName2update = Convert.ToString(TestContext.DataRow["updateConfig2"]);
114-
115-
var _packagePath = new FileInfo(Directory.GetCurrentDirectory() + "\\" + _packageName);
116-
var _configPath1 = new FileInfo(Directory.GetCurrentDirectory() + "\\" + _configName1);
117-
var _configPath2 = new FileInfo(Directory.GetCurrentDirectory() + "\\" + _configName2);
118-
var _configPath1update = new FileInfo(Directory.GetCurrentDirectory() + "\\" + _configName1update);
119-
var _configPath2update = new FileInfo(Directory.GetCurrentDirectory() + "\\" + _configName2update);
120-
121-
122-
vmPowershellCmdlets.NewAzureDeployment(serviceName, _packagePath.FullName, _configPath1.FullName,
123-
DeploymentSlotType.Production, "label", deploymentName, false, false);
124-
125-
vmPowershellCmdlets.NewAzureDeployment(serviceName, _packagePath.FullName, _configPath2.FullName,
126-
DeploymentSlotType.Staging, "label", deploymentName, false, false);
115+
var _configName = Convert.ToString(TestContext.DataRow["configName"]);
116+
var _configNameupdate = Convert.ToString(TestContext.DataRow["updateConfig"]);
127117

118+
string _packagePath = (new FileInfo(Directory.GetCurrentDirectory() + "\\" + _packageName)).FullName;
119+
string _configPath1 = StoreConfigFileWithReservedIp(_configName, reservedIpName1);
120+
string _configPath2 = StoreConfigFileWithReservedIp(_configName, reservedIpName2);
121+
string _configPath1update = StoreConfigFileWithReservedIp(_configNameupdate, reservedIpName1);
122+
string _configPath2update = StoreConfigFileWithReservedIp(_configNameupdate, reservedIpName2);
128123

124+
vmPowershellCmdlets.NewAzureDeployment(serviceName, _packagePath, _configPath1,
125+
DeploymentSlotType.Production, "label", deploymentName1, false, false);
129126

127+
vmPowershellCmdlets.NewAzureDeployment(serviceName, _packagePath, _configPath2,
128+
DeploymentSlotType.Staging, "label", deploymentName2, false, false);
130129

131130
vmPowershellCmdlets.MoveAzureDeployment(serviceName);
132131

133132
vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Production);
134133
vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Staging);
135134

136-
vmPowershellCmdlets.SetAzureDeploymentConfig(serviceName, DeploymentSlotType.Production, _configPath1update.FullName);
137-
vmPowershellCmdlets.SetAzureDeploymentConfig(serviceName, DeploymentSlotType.Staging, _configPath2update.FullName);
138-
139-
135+
vmPowershellCmdlets.SetAzureDeploymentConfig(serviceName, DeploymentSlotType.Production, _configPath1update);
136+
vmPowershellCmdlets.SetAzureDeploymentConfig(serviceName, DeploymentSlotType.Staging, _configPath2update);
140137

141138
pass = true;
142139
}
@@ -148,6 +145,17 @@ public void CreateReservedIPThenPaaSVM()
148145
}
149146
}
150147

148+
private string StoreConfigFileWithReservedIp(string configFileName, string reservedIpName)
149+
{
150+
var originalConfigPath = new FileInfo(Directory.GetCurrentDirectory() + "\\" + configFileName);
151+
var tempConfigPath = new FileInfo(Directory.GetCurrentDirectory() + "\\" + Utilities.GetUniqueShortName(configFileName));
152+
153+
string _config1_format = File.ReadAllText(originalConfigPath.FullName);
154+
155+
File.WriteAllText(tempConfigPath.FullName, string.Format(_config1_format, reservedIpName));
156+
return tempConfigPath.FullName;
157+
}
158+
151159
[TestMethod(), Priority(0), TestProperty("Feature", "IaaS"), TestCategory(Category.Network), Owner("hylee"), Description("Test the cmdlets (New-AzureReservedIP,Get-AzureReservedIP,Remove-AzureReservedIP)")]
152160
public void CreateReservedIPThenWindowsVM()
153161
{

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/VMTemplateTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,8 @@ public void CreateVirtualMachineUsingVMImageWithDataDisks()
581581
{
582582
// Try to get VM image with data disks
583583
var vmImages = vmPowershellCmdlets.GetAzureVMImageReturningVMImages();
584-
var vmImage = vmImages.Where(t => t.OS == "Windows" && t.Category == "Public" && t.DataDiskConfigurations != null && t.DataDiskConfigurations.Any()).FirstOrDefault();
584+
var vmImage = vmImages.Where(t => t.OS == "Windows" && t.Category == "Public" && t.DataDiskConfigurations != null
585+
&& t.Location.Contains(locationName) && t.DataDiskConfigurations.Any()).FirstOrDefault();
585586

586587
// New-AzureService and verify with Get-AzureService
587588
vmPowershellCmdlets.NewAzureService(serviceName, serviceName, locationName);

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfig2.cscfg renamed to ‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfig.cscfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<NetworkConfiguration>
1919
<AddressAssignments>
2020
<ReservedIPs>
21-
<ReservedIP name="ResrvdIP2"/>
21+
<ReservedIP name="{0}"/>
2222
</ReservedIPs>
2323
</AddressAssignments>
2424
</NetworkConfiguration>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfig1update.cscfg

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfig2update.cscfg

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfig1.cscfg renamed to ‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ReservedIPConfigupdate.cscfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<NetworkConfiguration>
1919
<AddressAssignments>
2020
<ReservedIPs>
21-
<ReservedIP name="ResrvdIP1"/>
21+
<ReservedIP name="{0}"/>
2222
</ReservedIPs>
2323
</AddressAssignments>
2424
</NetworkConfiguration>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/packageReservedIP.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
packageName,configName1,configName2,updateConfig1,updateConfig2
2-
SampleAppV1.cspkg,ReservedIPConfig1.cscfg,ReservedIPConfig2.cscfg,ReservedIPConfig1update.cscfg,ReservedIPConfig2update.cscfg
1+
packageName,configName,updateConfig
2+
SampleAppV1.cspkg,ReservedIPConfig.cscfg,ReservedIPConfigupdate.cscfg

0 commit comments

Comments
 (0)