Skip to content

Commit fbdf129

Browse files
author
unknown
committed
Fix RoleSize tests
1 parent d1f3853 commit fbdf129

File tree

3 files changed

+27
-31
lines changed

3 files changed

+27
-31
lines changed

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ConfigDataInfo/InstanceSize.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ public enum InstanceSize
2121
Medium,
2222
Large,
2323
ExtraLarge,
24+
}
25+
26+
public enum HiMemInstanceSize
27+
{
2428
A5,
2529
A6,
2630
A7,
27-
A8,
28-
A9
2931
}
3032
}

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

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -390,44 +390,44 @@ public void HiMemVMSizeTest()
390390
try
391391
{
392392
// New-AzureQuickVM test for VM size 'A5'
393-
vmPowershellCmdlets.NewAzureQuickVM(OS.Windows, vmName, serviceName, imageName, username, password, locationName, InstanceSize.A5.ToString());
393+
vmPowershellCmdlets.NewAzureQuickVM(OS.Windows, vmName, serviceName, imageName, username, password, locationName, HiMemInstanceSize.A5.ToString());
394394
PersistentVMRoleContext result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
395395
RoleSizeContext returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
396-
Assert.AreEqual(InstanceSize.A5.ToString(), returnedSize.InstanceSize);
397-
Console.WriteLine("VM size, {0}, is verified for New-AzureQuickVM", InstanceSize.A5);
396+
Assert.AreEqual(HiMemInstanceSize.A5.ToString(), returnedSize.InstanceSize);
397+
Console.WriteLine("VM size, {0}, is verified for New-AzureQuickVM", HiMemInstanceSize.A5);
398398
vmPowershellCmdlets.RemoveAzureService(serviceName);
399399

400400
// New-AzureQuickVM test for VM size 'A6'
401-
vmPowershellCmdlets.NewAzureQuickVM(OS.Windows, vmName, serviceName, imageName, username, password, locationName, InstanceSize.A6.ToString());
401+
vmPowershellCmdlets.NewAzureQuickVM(OS.Windows, vmName, serviceName, imageName, username, password, locationName, HiMemInstanceSize.A6.ToString());
402402
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
403403
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
404-
Assert.AreEqual(InstanceSize.A6.ToString(), returnedSize.InstanceSize);
405-
Console.WriteLine("VM size, {0}, is verified for New-AzureQuickVM", InstanceSize.A6);
404+
Assert.AreEqual(HiMemInstanceSize.A6.ToString(), returnedSize.InstanceSize);
405+
Console.WriteLine("VM size, {0}, is verified for New-AzureQuickVM", HiMemInstanceSize.A6);
406406
vmPowershellCmdlets.RemoveAzureService(serviceName);
407407

408408
// New-AzureVMConfig test for VM size 'A7'
409-
var azureVMConfigInfo = new AzureVMConfigInfo(vmName, InstanceSize.A7.ToString(), imageName);
409+
var azureVMConfigInfo = new AzureVMConfigInfo(vmName, HiMemInstanceSize.A7.ToString(), imageName);
410410
var azureProvisioningConfig = new AzureProvisioningConfigInfo(OS.Windows, username, password);
411411
var persistentVMConfigInfo = new PersistentVMConfigInfo(azureVMConfigInfo, azureProvisioningConfig, null, null);
412412
PersistentVM vm = vmPowershellCmdlets.GetPersistentVM(persistentVMConfigInfo);
413413
vmPowershellCmdlets.NewAzureVM(serviceName, new[] { vm }, locationName);
414414
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
415415
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
416-
Assert.AreEqual(InstanceSize.A7.ToString(), returnedSize.InstanceSize);
417-
Console.WriteLine("VM size, {0}, is verified for New-AzureVMConfig", InstanceSize.A7);
416+
Assert.AreEqual(HiMemInstanceSize.A7.ToString(), returnedSize.InstanceSize);
417+
Console.WriteLine("VM size, {0}, is verified for New-AzureVMConfig", HiMemInstanceSize.A7);
418418

419419
// Set-AzureVMSize test for Hi-MEM VM size (A7 to A6)
420-
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(InstanceSize.A6.ToString()));
420+
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(HiMemInstanceSize.A6.ToString()));
421421
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
422422
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
423-
Assert.AreEqual(InstanceSize.A6.ToString(), returnedSize.InstanceSize);
423+
Assert.AreEqual(HiMemInstanceSize.A6.ToString(), returnedSize.InstanceSize);
424424
Console.WriteLine("SetVMSize is verified from A7 to A6");
425425

426426
// Set-AzureVMSize test for Hi-MEM VM size (A6 to A5)
427-
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(InstanceSize.A5.ToString()));
427+
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(HiMemInstanceSize.A5.ToString()));
428428
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
429429
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
430-
Assert.AreEqual(InstanceSize.A5.ToString(), returnedSize.InstanceSize);
430+
Assert.AreEqual(HiMemInstanceSize.A5.ToString(), returnedSize.InstanceSize);
431431
Console.WriteLine("SetVMSize is verified from A6 to A5");
432432

433433
pass = true;
@@ -455,10 +455,11 @@ public void RegularVMSizeTest()
455455
{
456456
string serviceName = Utilities.GetUniqueShortName(serviceNamePrefix);
457457
string vmName = Utilities.GetUniqueShortName(vmNamePrefix);
458+
string [] regularSizes = Enum.GetNames(typeof(InstanceSize));
458459

459460
try
460461
{
461-
var instanceSizes = vmPowershellCmdlets.GetAzureRoleSize().ToArray();
462+
var instanceSizes = vmPowershellCmdlets.GetAzureRoleSize().Where(s => regularSizes.Contains(s.InstanceSize)).ToArray();
462463
vmPowershellCmdlets.NewAzureQuickVM(OS.Windows, vmName, serviceName, imageName, username, password, locationName, instanceSizes[1].InstanceSize);
463464

464465
foreach (var instanceSize in instanceSizes)
@@ -467,20 +468,13 @@ public void RegularVMSizeTest()
467468
RoleSizeContext returnedSize;
468469

469470
var size = instanceSize.InstanceSize;
470-
if (!size.Equals(InstanceSize.A5.ToString()) &&
471-
!size.Equals(InstanceSize.A6.ToString()) &&
472-
!size.Equals(InstanceSize.A7.ToString()) &&
473-
!size.Equals(InstanceSize.A8.ToString()) &&
474-
!size.Equals(InstanceSize.A9.ToString()) &&
475-
!size.Contains("Standard_"))
476-
{
477-
// Set-AzureVMSize test for regular VM size
478-
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(size));
479-
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
480-
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
481-
Assert.AreEqual(size, returnedSize.InstanceSize);
482-
Console.WriteLine("VM size, {0}, is verified for Set-AzureVMSize", size);
483-
}
471+
472+
// Set-AzureVMSize test for regular VM size
473+
vmPowershellCmdlets.SetVMSize(vmName, serviceName, new SetAzureVMSizeConfig(size));
474+
result = vmPowershellCmdlets.GetAzureVM(vmName, serviceName);
475+
returnedSize = vmPowershellCmdlets.GetAzureRoleSize(result.InstanceSize)[0];
476+
Assert.AreEqual(size, returnedSize.InstanceSize);
477+
Console.WriteLine("VM size, {0}, is verified for Set-AzureVMSize", size);
484478

485479
if (size.Equals(InstanceSize.ExtraLarge.ToString()))
486480
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ public void CreateVirtualMachineUsingVMImageWithDataDisks()
589589

590590
// New-AzureVMConfig
591591
var vmName = Utilities.GetUniqueShortName(vmNamePrefix);
592-
var vmSize = vmPowershellCmdlets.GetAzureRoleSize().Where(t => t.MaxDataDiskCount != null && t.MaxDataDiskCount >= vmImage.DataDiskConfigurations.Count()).Select(t => t.InstanceSize).First();
592+
var vmSize = InstanceSize.ExtraLarge.ToString();
593593
var currentStorage = vmPowershellCmdlets.GetAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccountName).First();
594594
var mediaLocationStr = ("mloc" + vmName).ToLower();
595595
var vmMediaLocation = currentStorage.Endpoints.Where(p => p.Contains("blob")).First() + mediaLocationStr;

0 commit comments

Comments
 (0)