Skip to content

Commit f42c8f8

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#134 from huangpf/crp2
CRP lib update => 5.0.0
2 parents 3b3183e + 8e47d2d commit f42c8f8

22 files changed

+252
-127
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Compute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.4.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Compute, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.5.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
71+
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,131 @@ function Retry-IfException
8383

8484
$ErrorActionPreference = $oldErrorActionPreferenceValue;
8585
}
86+
87+
<#
88+
.SYNOPSIS
89+
Gets random resource name
90+
#>
91+
function Get-RandomItemName
92+
{
93+
param([string] $prefix = "pslibtest")
94+
95+
if ($prefix -eq $null -or $prefix -eq '')
96+
{
97+
$prefix = "pslibtest";
98+
}
99+
100+
$str = $prefix + ((Get-Random) % 10000);
101+
return $str;
102+
}
103+
104+
<#
105+
.SYNOPSIS
106+
Gets default VM size string
107+
#>
108+
function Get-DefaultVMSize
109+
{
110+
param([string] $location = "eastasia")
111+
112+
$vmSizes = Get-AzureVMSize -Location $location | where { $_.NumberOfCores -ge 4 -and $_.MaxDataDiskCount -ge 8 };
113+
114+
foreach ($sz in $vmSizes)
115+
{
116+
if ($sz.Name -eq 'Standard_A3')
117+
{
118+
return $sz.Name;
119+
}
120+
}
121+
122+
return $vmSizes[0].Name;
123+
}
124+
125+
<#
126+
.SYNOPSIS
127+
Gets default RDFE Image
128+
#>
129+
function Get-DefaultRDFEImage
130+
{
131+
param([string] $loca = "East Asia", [string] $query = '*Windows*Data*Center*')
132+
133+
$d = (Azure\Get-AzureVMImage | where {$_.ImageName -like $query -and ($_.Location -like "*;$loca;*" -or $_.Location -like "$loca;*" -or $_.Location -like "*;$loca" -or $_.Location -eq "$loca")});
134+
135+
if ($d -eq $null)
136+
{
137+
return $null;
138+
}
139+
else
140+
{
141+
return $d[-1].ImageName;
142+
}
143+
}
144+
145+
<#
146+
.SYNOPSIS
147+
Gets default RDFE Image
148+
#>
149+
function Get-DefaultCRPImage
150+
{
151+
param([string] $loca = "eastasia", [string] $query = '*Microsoft*Windows*Server')
152+
153+
$result = (Get-AzureVMImagePublisher -Location $loc).Resources | select -ExpandProperty Name | where { $_ -like $query };
154+
if ($result.Count -eq 1)
155+
{
156+
$defaultPublisher = $result;
157+
}
158+
else
159+
{
160+
$defaultPublisher = $result[0];
161+
}
162+
163+
$result = (Get-AzureVMImageOffer -Location $loc -PublisherName $defaultPublisher).Resources | select -ExpandProperty Name | where { $_ -like '*Windows*' };
164+
if ($result.Count -eq 1)
165+
{
166+
$defaultOffer = $result;
167+
}
168+
else
169+
{
170+
$defaultOffer = $result[0];
171+
}
172+
173+
$result = (Get-AzureVMImageSku -Location $loc -PublisherName $defaultPublisher -Offer $defaultOffer).Resources | select -ExpandProperty Name;
174+
if ($result.Count -eq 1)
175+
{
176+
$defaultSku = $result;
177+
}
178+
else
179+
{
180+
$defaultSku = $result[0];
181+
}
182+
183+
$result = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku).Resources | select -ExpandProperty Name;
184+
if ($result.Count -eq 1)
185+
{
186+
$defaultVersion = $result;
187+
}
188+
else
189+
{
190+
$defaultVersion = $result[0];
191+
}
192+
193+
$vmimg = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion).VirtualMachineImage;
194+
195+
return $vmimg;
196+
}
197+
198+
<#
199+
.SYNOPSIS
200+
Gets default VM config object
201+
#>
202+
function Get-DefaultVMConfig
203+
{
204+
param([string] $location = "eastasia")
205+
206+
# VM Profile & Hardware
207+
$vmsize = Get-DefaultVMSize $location;
208+
$vmname = Get-RandomItemName 'pstestvm';
209+
210+
$vm = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
211+
212+
return $vm;
213+
}

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

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,12 @@ function Test-VirtualMachineExtension
9595

9696
$p.StorageProfile.OSDisk = $null;
9797
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
98-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
98+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
9999

100100
Assert-AreEqual $p.OSProfile.AdminUsername $user;
101101
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
102102
Assert-AreEqual $p.OSProfile.AdminPassword $password;
103103
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
104-
Assert-AreEqual $p.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
105104
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
106105

107106
# Virtual Machine
@@ -169,7 +168,6 @@ function Test-VirtualMachineExtension
169168
Assert-AreEqual $vm1.Name $vmname;
170169
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
171170
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
172-
Assert-AreEqual $vm1.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
173171
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
174172
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
175173
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
@@ -275,13 +273,12 @@ function Test-VirtualMachineCustomScriptExtension
275273

276274
$p.StorageProfile.OSDisk = $null;
277275
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
278-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
276+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
279277

280278
Assert-AreEqual $p.OSProfile.AdminUsername $user;
281279
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
282280
Assert-AreEqual $p.OSProfile.AdminPassword $password;
283281
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
284-
Assert-AreEqual $p.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
285282
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
286283

287284
# Virtual Machine
@@ -291,12 +288,12 @@ function Test-VirtualMachineCustomScriptExtension
291288
# Virtual Machine Extension
292289
$extname = 'csetest';
293290
$extver = '1.1';
294-
$publisher = 'Microsoft.Compute';
291+
$publisher = 'Microsoft.Compute';
295292
$exttype = 'CustomScriptExtension';
296-
$fileToExecute = "a.exe";
297-
$containderName = "script"
293+
$fileToExecute = "a.exe";
294+
$containderName = "script"
298295

299-
# Set custom script extension
296+
# Set custom script extension
300297
Set-AzureVMCustomScriptExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -StorageAccountName $stoname -StorageAccountKey $stokey -FileName $fileToExecute -ContainerName $containderName;
301298

302299
# Get VM Extension
@@ -306,8 +303,8 @@ function Test-VirtualMachineCustomScriptExtension
306303
Assert-AreEqual $ext.Publisher $publisher;
307304
Assert-AreEqual $ext.ExtensionType $exttype;
308305
Assert-AreEqual $ext.TypeHandlerVersion $extver;
309-
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
310-
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
306+
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
307+
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
311308
Assert-NotNull $ext.ProvisioningState;
312309

313310
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Status;
@@ -316,8 +313,8 @@ function Test-VirtualMachineCustomScriptExtension
316313
Assert-AreEqual $ext.Publisher $publisher;
317314
Assert-AreEqual $ext.ExtensionType $exttype;
318315
Assert-AreEqual $ext.TypeHandlerVersion $extver;
319-
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
320-
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
316+
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
317+
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
321318
Assert-NotNull $ext.ProvisioningState;
322319
Assert-NotNull $ext.Statuses;
323320

@@ -326,7 +323,6 @@ function Test-VirtualMachineCustomScriptExtension
326323
Assert-AreEqual $vm1.Name $vmname;
327324
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
328325
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
329-
Assert-AreEqual $vm1.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
330326
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
331327
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
332328
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
@@ -434,13 +430,12 @@ function Test-VirtualMachineAccessExtension
434430

435431
$p.StorageProfile.OSDisk = $null;
436432
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
437-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
433+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
438434

439435
Assert-AreEqual $p.OSProfile.AdminUsername $user;
440436
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
441437
Assert-AreEqual $p.OSProfile.AdminPassword $password;
442438
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
443-
Assert-AreEqual $p.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
444439
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
445440

446441
# Virtual Machine
@@ -450,13 +445,13 @@ function Test-VirtualMachineAccessExtension
450445
# Virtual Machine Extension
451446
$extname = 'csetest';
452447
$extver = '2.0';
453-
$user2 = "Bar12";
448+
$user2 = "Bar12";
454449
$password2 = 'FoO@123' + $rgname;
455450

456-
# Set custom script extension
451+
# Set custom script extension
457452
Set-AzureVMAccessExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -UserName $user2 -Password $password2;
458453

459-
$publisher = 'Microsoft.Compute';
454+
$publisher = 'Microsoft.Compute';
460455
$exttype = 'VMAccessAgent';
461456

462457
# Get VM Extension
@@ -466,7 +461,7 @@ function Test-VirtualMachineAccessExtension
466461
Assert-AreEqual $ext.Publisher $publisher;
467462
Assert-AreEqual $ext.ExtensionType $exttype;
468463
Assert-AreEqual $ext.TypeHandlerVersion $extver;
469-
Assert-AreEqual $ext.UserName $user2;
464+
Assert-AreEqual $ext.UserName $user2;
470465
Assert-NotNull $ext.ProvisioningState;
471466

472467
$ext = Get-AzureVMAccessExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Status;
@@ -483,7 +478,6 @@ function Test-VirtualMachineAccessExtension
483478
Assert-AreEqual $vm1.Name $vmname;
484479
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
485480
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
486-
Assert-AreEqual $vm1.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
487481
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
488482
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
489483
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,11 @@ function Test-SingleNetworkInterface
9494

9595
$p.StorageProfile.OSDisk = $null;
9696
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
97-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
97+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
9898

9999
Assert-AreEqual $p.OSProfile.AdminUsername $user;
100100
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
101101
Assert-AreEqual $p.OSProfile.AdminPassword $password;
102-
Assert-AreEqual $p.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
103102
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
104103

105104
# Virtual Machine
@@ -111,7 +110,6 @@ function Test-SingleNetworkInterface
111110
Assert-AreEqual $vm1.Name $vmname;
112111
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
113112
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
114-
Assert-AreEqual $vm1.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
115113
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
116114
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
117115
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
@@ -202,7 +200,7 @@ function Test-SingleNetworkInterfaceDnsSettings
202200

203201
$p.StorageProfile.OSDisk = $null;
204202
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
205-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
203+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
206204

207205
# Virtual Machine
208206
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
@@ -313,12 +311,11 @@ function Test-MultipleNetworkInterface
313311

314312
$p.StorageProfile.OSDisk = $null;
315313
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
316-
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
314+
$p = Set-AzureVMSourceImage -VM $p -Name $img;
317315

318316
Assert-AreEqual $p.OSProfile.AdminUsername $user;
319317
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
320318
Assert-AreEqual $p.OSProfile.AdminPassword $password;
321-
Assert-AreEqual $p.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
322319
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
323320

324321
# Virtual Machine
@@ -331,7 +328,6 @@ function Test-MultipleNetworkInterface
331328
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 2;
332329
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nic1.Id;
333330
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[1].ReferenceUri $nic2.Id;
334-
Assert-AreEqual $vm1.StorageProfile.DestinationVhdsContainer.ToString() $vhdContainer;
335331
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
336332
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
337333
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;

0 commit comments

Comments
 (0)