Skip to content

Commit 74f87b2

Browse files
unknownunknown
unknown
authored and
unknown
committed
Fix CreateReservedIPThenPaaSVM test
1 parent a91906e commit 74f87b2

File tree

7 files changed

+143
-117
lines changed

7 files changed

+143
-117
lines changed

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

Lines changed: 108 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -423,64 +423,132 @@
423423
<None Include="AzureRTExtensions.playlist" />
424424
<None Include="AzureRTFull.playlist" />
425425
<None Include="Resources\HelloWorld_SDK20.cspkg">
426-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
426+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
427427
</None>
428428
<None Include="Resources\ServiceConfiguration.cscfg">
429-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
429+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
430430
</None>
431431
<None Include="MSSharedLibKey.snk" />
432432
<None Include="packages.config" />
433-
<None Include="Resources\affinityGroupData.csv" />
434-
<None Include="Resources\certificateData.csv" />
433+
<None Include="Resources\affinityGroupData.csv">
434+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
435+
</None>
436+
<None Include="Resources\certificateData.csv">
437+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
438+
</None>
435439
<None Include="Resources\CustomData.bin">
436440
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
437441
</None>
438442
<None Include="Resources\cloudinittest.sh">
439443
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
440444
</None>
441-
<None Include="Resources\download_VHD.csv" />
442-
<None Include="Resources\DSC\DscExtensionTestConfigurationData.psd1" />
443-
<None Include="Resources\HelloNoDiag.cscfg" />
444-
<None Include="Resources\nodiagpackage.csv" />
445-
<None Include="Resources\OneWebOneWorker.cscfg" />
446-
<None Include="Resources\OneWebOneWorkerRDP.cscfg" />
447-
<None Include="Resources\overwrite_VHD.csv" />
448-
<None Include="Resources\package.csv" />
449-
<None Include="Resources\packageADDomain.csv" />
450-
<None Include="Resources\packageReservedIP.csv" />
451-
<None Include="Resources\packageScenario.csv" />
452-
<None Include="Resources\patch_VHD.csv" />
453-
<None Include="Resources\rdpcert.pfx" />
454-
<None Include="Resources\ReservedIPConfig1.cscfg" />
455-
<None Include="Resources\ReservedIPConfig1update.cscfg" />
456-
<None Include="Resources\ReservedIPConfig2.cscfg" />
457-
<None Include="Resources\ReservedIPConfig2update.cscfg" />
458-
<None Include="Resources\resume_VHD.csv" />
459-
<None Include="Resources\SampleAppV1.cscfg" />
460-
<None Include="Resources\SampleAppV2.cscfg" />
461-
<None Include="Resources\SampleAppV3.cscfg" />
462-
<None Include="Resources\StaticCAvnetconfig.netcfg" />
463-
<None Include="Resources\storageAccountTestData.csv" />
464-
<None Include="Resources\DSC\DscExtensionTestConfiguration.ps1" />
465-
<None Include="Resources\test1.ps1" />
466-
<None Include="Resources\test2.ps1" />
467-
<None Include="Resources\thread_VHD.csv" />
468-
<None Include="Resources\upload_VHD.csv" />
469-
<None Include="Resources\vnetconfig.netcfg" />
445+
<None Include="Resources\download_VHD.csv">
446+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
447+
</None>
448+
<None Include="Resources\DSC\DscExtensionTestConfigurationData.psd1">
449+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
450+
</None>
451+
<None Include="Resources\HelloNoDiag.cscfg">
452+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
453+
</None>
454+
<None Include="Resources\nodiagpackage.csv">
455+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
456+
</None>
457+
<None Include="Resources\OneWebOneWorker.cscfg">
458+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
459+
</None>
460+
<None Include="Resources\OneWebOneWorkerRDP.cscfg">
461+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
462+
</None>
463+
<None Include="Resources\overwrite_VHD.csv">
464+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
465+
</None>
466+
<None Include="Resources\package.csv">
467+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
468+
</None>
469+
<None Include="Resources\packageADDomain.csv">
470+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
471+
</None>
472+
<None Include="Resources\packageReservedIP.csv">
473+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
474+
</None>
475+
<None Include="Resources\packageScenario.csv">
476+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
477+
</None>
478+
<None Include="Resources\patch_VHD.csv">
479+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
480+
</None>
481+
<None Include="Resources\rdpcert.pfx">
482+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
483+
</None>
484+
<None Include="Resources\ReservedIPConfig.cscfg">
485+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
486+
</None>
487+
<None Include="Resources\ReservedIPConfigupdate.cscfg">
488+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
489+
</None>
490+
<None Include="Resources\resume_VHD.csv">
491+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
492+
</None>
493+
<None Include="Resources\SampleAppV1.cscfg">
494+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
495+
</None>
496+
<None Include="Resources\SampleAppV2.cscfg">
497+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
498+
</None>
499+
<None Include="Resources\SampleAppV3.cscfg">
500+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
501+
</None>
502+
<None Include="Resources\StaticCAvnetconfig.netcfg">
503+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
504+
</None>
505+
<None Include="Resources\storageAccountTestData.csv">
506+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
507+
</None>
508+
<None Include="Resources\DSC\DscExtensionTestConfiguration.ps1">
509+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
510+
</None>
511+
<None Include="Resources\test1.ps1">
512+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
513+
</None>
514+
<None Include="Resources\test2.ps1">
515+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
516+
</None>
517+
<None Include="Resources\thread_VHD.csv">
518+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
519+
</None>
520+
<None Include="Resources\upload_VHD.csv">
521+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
522+
</None>
523+
<None Include="Resources\vnetconfig.netcfg">
524+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
525+
</None>
470526
<None Include="Resources\VnetconfigWithLocation.netcfg">
471-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
527+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
528+
</None>
529+
<None Include="Resources\wrongPara_VHD.csv">
530+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
472531
</None>
473-
<None Include="Resources\wrongPara_VHD.csv" />
474532
</ItemGroup>
475533
<ItemGroup>
476534
<Content Include="FunctionalTests\ExtensionTests\MicrosoftAntimalware\AntimalwareConfig.xml" />
477535
<Content Include="FunctionalTests\Readme.txt" />
478536
<Content Include="lib\Security.Cryptography.dll" />
479-
<Content Include="Resources\clxtshar.dll" />
480-
<Content Include="Resources\da.xml" />
481-
<Content Include="Resources\PrivateConfig.xml" />
482-
<Content Include="Resources\PublicConfig.xml" />
483-
<Content Include="Resources\VmAccessExtensionConfiguration.xml" />
537+
<Content Include="Resources\clxtshar.dll">
538+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
539+
</Content>
540+
<Content Include="Resources\da.xml">
541+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
542+
</Content>
543+
<Content Include="Resources\PrivateConfig.xml">
544+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
545+
</Content>
546+
<Content Include="Resources\PublicConfig.xml">
547+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
548+
</Content>
549+
<Content Include="Resources\VmAccessExtensionConfiguration.xml">
550+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
551+
</Content>
484552
</ItemGroup>
485553
<ItemGroup>
486554
<Folder Include="TestScripts\" />

‎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/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)