Skip to content

Commit ccae361

Browse files
praries880praries880
committed
Fix test cases
1 parent 4ec8ff1 commit ccae361

File tree

2 files changed

+330
-341
lines changed

2 files changed

+330
-341
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.ps1

Lines changed: 68 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -14,92 +14,89 @@ function Test-GetAzureRmVMDscExtension
1414
$rgname = Get-ComputeTestResourceName
1515
$loc = Get-ComputeVMLocation
1616

17-
try
18-
{
19-
# Common
20-
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
17+
# Common
18+
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
2119

22-
# VM Profile & Hardware
23-
$vmsize = 'Standard_A2';
24-
$vmname = 'vm' + $rgname;
25-
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
26-
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
20+
# VM Profile & Hardware
21+
$vmsize = 'Standard_A2';
22+
$vmname = 'vm' + $rgname;
23+
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
24+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
2725

28-
# NRP
29-
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
30-
$vnet = New-AzureRmVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
31-
$vnet = Get-AzureRmVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
32-
$subnetId = $vnet.Subnets[0].Id;
33-
$pubip = New-AzureRmPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
34-
$pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
35-
$pubipId = $pubip.Id;
36-
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
37-
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
38-
$nicId = $nic.Id;
26+
# NRP
27+
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
28+
$vnet = New-AzureRmVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
29+
$vnet = Get-AzureRmVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
30+
$subnetId = $vnet.Subnets[0].Id;
31+
$pubip = New-AzureRmPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
32+
$pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
33+
$pubipId = $pubip.Id;
34+
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
35+
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
36+
$nicId = $nic.Id;
3937

40-
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
41-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
42-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
38+
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
39+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
40+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
4341

44-
# Storage Account
45-
$stoname = 'sto' + $rgname;
46-
$stotype = 'Standard_GRS';
47-
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
48-
Retry-IfException { $global:stoaccount = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
42+
# Storage Account
43+
$stoname = 'sto' + $rgname;
44+
$stotype = 'Standard_GRS';
45+
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
46+
Retry-IfException { $global:stoaccount = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
4947

50-
$osDiskName = 'osDisk';
51-
$osDiskCaching = 'ReadWrite';
52-
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
53-
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
48+
$osDiskName = 'osDisk';
49+
$osDiskCaching = 'ReadWrite';
50+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
51+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
5452

55-
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
56-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
53+
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
54+
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
5755

58-
# OS & Image
59-
$user = "localadmin";
60-
$password = $PLACEHOLDER;
61-
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
62-
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
63-
$computerName = 'test';
64-
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
56+
# OS & Image
57+
$user = "localadmin";
58+
$password = $PLACEHOLDER;
59+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
60+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
61+
$computerName = 'test';
62+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
6563

66-
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
67-
$p = Set-AzureRmVMSourceImage -VM $p -PublisherName MicrosoftWindowsServer -Offer WindowsServer -Skus 2012-R2-Datacenter -Version "latest"
64+
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
65+
$p = Set-AzureRmVMSourceImage -VM $p -PublisherName MicrosoftWindowsServer -Offer WindowsServer -Skus 2012-R2-Datacenter -Version "latest"
6866

69-
# Virtual Machine
70-
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
67+
# Virtual Machine
68+
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
7169

72-
# Test DSC Extension
73-
$version = '2.19';
70+
# Test DSC Extension
71+
$version = '2.19';
7472

75-
# Publish DSC Configuration
76-
#TODO: Find a way to mock calls with storage
77-
#$configPath = '.\ScenarioTests\DummyConfig.ps1'
78-
#Publish-AzureRmVMDscConfiguration -ConfigurationPath $configPath -ResourceGroupName $rgname -StorageAccountName $stoname -Force -Verbose
73+
# Publish DSC Configuration
74+
#TODO: Find a way to mock calls with storage
75+
#$configPath = '.\ScenarioTests\DummyConfig.ps1'
76+
#Publish-AzureRmVMDscConfiguration -ConfigurationPath $configPath -ResourceGroupName $rgname -StorageAccountName $stoname -Force -Verbose
7977

80-
#Install DSC Extension handler
81-
Set-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname -ArchiveBlobName $null -ArchiveStorageAccountName $stoname -Version $version -Force -Location $loc
78+
#Install DSC Extension handler
79+
Set-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname -ArchiveBlobName $null -ArchiveStorageAccountName $stoname -Version $version -Force -Location $loc
8280

83-
$extension = Get-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname
84-
Assert-NotNull $extension
85-
Assert-AreEqual $extension.ResourceGroupName $rgname
86-
Assert-AreEqual $extension.Name "Microsoft.Powershell.DSC"
87-
Assert-AreEqual $extension.Publisher "Microsoft.Powershell"
88-
Assert-AreEqual $extension.ExtensionType "DSC"
89-
Assert-AreEqual $extension.TypeHandlerVersion $version
90-
Assert-NotNull $extension.ProvisioningState
81+
$extension = Get-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname
82+
Assert-NotNull $extension
83+
Assert-AreEqual $extension.ResourceGroupName $rgname
84+
Assert-AreEqual $extension.Name "Microsoft.Powershell.DSC"
85+
Assert-AreEqual $extension.Publisher "Microsoft.Powershell"
86+
Assert-AreEqual $extension.ExtensionType "DSC"
87+
Assert-AreEqual $extension.TypeHandlerVersion $version
88+
Assert-NotNull $extension.ProvisioningState
9189

92-
$status = Get-AzureRmVMDscExtensionStatus -ResourceGroupName $rgname -VMName $vmname
93-
Assert-NotNull $status
94-
Assert-AreEqual $status.ResourceGroupName $rgname
95-
Assert-AreEqual $status.VmName $vmname
96-
Assert-AreEqual $status.Version $version
97-
Assert-NotNull $status.Status
98-
Assert-NotNull $status.Timestamp
90+
$status = Get-AzureRmVMDscExtensionStatus -ResourceGroupName $rgname -VMName $vmname
91+
Assert-NotNull $status
92+
Assert-AreEqual $status.ResourceGroupName $rgname
93+
Assert-AreEqual $status.VmName $vmname
94+
Assert-AreEqual $status.Version $version
95+
Assert-NotNull $status.Status
96+
Assert-NotNull $status.Timestamp
9997

100-
# Remove Extension
101-
Remove-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname
102-
}
98+
# Remove Extension
99+
Remove-AzureRmVMDscExtension -ResourceGroupName $rgname -VMName $vmname
103100
}
104101

105102
#helper methods for ARM

0 commit comments

Comments
 (0)