Skip to content

Commit 30c5052

Browse files
AzureRTAzureRT
committed
Merge pull request #26 from huangpf/dev
AzureRT PR S50 - Update Client Library & Tests
2 parents 5b7e101 + 40726f6 commit 30c5052

File tree

38 files changed

+4809
-5211
lines changed

38 files changed

+4809
-5211
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
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=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.6.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Compute, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.7.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -250,6 +250,9 @@
250250
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfileWithoutAUC.json">
251251
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
252252
</None>
253+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestGetVMSizeFromAllLocations.json">
254+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
255+
</None>
253256
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestLinuxVirtualMachine.json">
254257
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
255258
</None>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ function Test-AvailabilitySet
4343
Assert-AreEqual $aset.PlatformUpdateDomainCount $nonDefaultUD;
4444
Assert-AreEqual $aset.PlatformFaultDomainCount $nonDefaultFD;
4545

46-
Assert-ThrowsContains { Remove-AzureAvailabilitySet -ResourceGroupName $rgname -Name $asetName; } "This cmdlet will remove the specified availability set. Do you want to continue?"
47-
4846
Remove-AzureAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force;
4947

5048
$asets = Get-AzureAvailabilitySet -ResourceGroupName $rgname;

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

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Get-ComputeTestResourceName
3333

3434
try
3535
{
36-
$assetName = [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::GetAssetName($testName, "pstestrg");
36+
$assetName = [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::GetAssetName($testName, "crptestps");
3737
}
3838
catch
3939
{
@@ -197,26 +197,6 @@ function Get-DefaultVMSize
197197
return $vmSizes[0].Name;
198198
}
199199

200-
<#
201-
.SYNOPSIS
202-
Gets default RDFE Image
203-
#>
204-
function Get-DefaultRDFEImage
205-
{
206-
param([string] $loca = "East Asia", [string] $query = '*Windows*Data*Center*')
207-
208-
$d = (Azure\Get-AzureVMImage | where {$_.ImageName -like $query -and ($_.Location -like "*;$loca;*" -or $_.Location -like "$loca;*" -or $_.Location -like "*;$loca" -or $_.Location -eq "$loca")});
209-
210-
if ($d -eq $null)
211-
{
212-
return $null;
213-
}
214-
else
215-
{
216-
return $d[-1].ImageName;
217-
}
218-
}
219-
220200
<#
221201
.SYNOPSIS
222202
Gets default CRP Image
@@ -270,6 +250,32 @@ function Get-DefaultCRPImage
270250
return $vmimg;
271251
}
272252

253+
# Create Image Object
254+
function Create-ComputeVMImageObject
255+
{
256+
param ([string] $publisherName, [string] $offer, [string] $skus, [string] $version)
257+
258+
$img = New-Object -TypeName 'Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineImage';
259+
$img.PublisherName = $publisherName;
260+
$img.Offer = $offer;
261+
$img.Skus = $skus;
262+
$img.Version = $version;
263+
264+
return $img;
265+
}
266+
267+
# Get Default CRP Windows Image Object Offline
268+
function Get-DefaultCRPWindowsImageOffline
269+
{
270+
return Create-ComputeVMImageObject 'MicrosoftWindowsServer' 'WindowsServer' '2008-R2-SP1' 'latest';
271+
}
272+
273+
# Get Default CRP Linux Image Object Offline
274+
function Get-DefaultCRPLinuxImageOffline
275+
{
276+
return Create-ComputeVMImageObject 'SUSE' 'openSUSE' '13.2' 'latest';
277+
}
278+
273279
<#
274280
.SYNOPSIS
275281
Gets VMM Images

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest1.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ function setup_image_and_disks
105105

106106
$vmconfig = Set-AzureVMOSDisk -VM $vmconfig -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
107107

108-
# Image Reference;
109-
$vmconfig.StorageProfile.SourceImage = $null;
108+
# Image Reference
110109
$imgRef = Get-DefaultCRPImage -loc $loc;
111110
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
112111

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest2.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ function setup_image_and_disks
105105

106106
$vmconfig = Set-AzureVMOSDisk -VM $vmconfig -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
107107

108-
# Image Reference;
109-
$vmconfig.StorageProfile.SourceImage = $null;
108+
# Image Reference
110109
$imgRef = Get-DefaultCRPImage -loc $loc;
111110
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
112111

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest3.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ function setup_image_and_disks
105105

106106
$vmconfig = Set-AzureVMOSDisk -VM $vmconfig -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
107107

108-
# Image Reference;
109-
$vmconfig.StorageProfile.SourceImage = $null;
108+
# Image Reference
110109
$imgRef = Get-DefaultCRPImage -loc $loc;
111110
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
112111

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ function setup_image_and_disks
236236
237237
$vmconfig = Set-AzureVMOSDisk -VM $vmconfig -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
238238
239-
# Image Reference;
240-
$vmconfig.StorageProfile.SourceImage = $null;
239+
# Image Reference
241240
$imgRef = Get-DefaultCRPImage -loc $loc;
242241
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
243242

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

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,23 @@ function Test-VirtualMachineExtension
9191
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
9292
$computerName = 'test';
9393
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
94-
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
9594

9695
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
97-
$p = Set-AzureVMSourceImage -VM $p -Name $img;
96+
97+
$imgRef = Get-DefaultCRPWindowsImageOffline;
98+
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
9899

99100
Assert-AreEqual $p.OSProfile.AdminUsername $user;
100101
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
101102
Assert-AreEqual $p.OSProfile.AdminPassword $password;
102103
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
103-
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
104+
105+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
106+
#
107+
# Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
108+
# Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
109+
# Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
110+
# Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
104111

105112
# Virtual Machine
106113
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
@@ -167,7 +174,14 @@ function Test-VirtualMachineExtension
167174
Assert-AreEqual $vm1.Name $vmname;
168175
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
169176
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
170-
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
177+
178+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
179+
#
180+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Offer $imgRef.Offer;
181+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
182+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Sku $imgRef.Skus;
183+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Version $imgRef.Version;
184+
171185
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
172186
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
173187
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
@@ -265,16 +279,23 @@ function Test-VirtualMachineCustomScriptExtension
265279
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
266280
$computerName = 'test';
267281
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
268-
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
269282

270283
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
271-
$p = Set-AzureVMSourceImage -VM $p -Name $img;
284+
285+
$imgRef = Get-DefaultCRPWindowsImageOffline;
286+
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
272287

273288
Assert-AreEqual $p.OSProfile.AdminUsername $user;
274289
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
275290
Assert-AreEqual $p.OSProfile.AdminPassword $password;
276291
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
277-
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
292+
293+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
294+
#
295+
# Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
296+
# Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
297+
# Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
298+
# Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
278299

279300
# Virtual Machine
280301
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
@@ -321,7 +342,14 @@ function Test-VirtualMachineCustomScriptExtension
321342
Assert-AreEqual $vm1.Name $vmname;
322343
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
323344
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
324-
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
345+
346+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
347+
#
348+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Offer $imgRef.Offer;
349+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
350+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Sku $imgRef.Skus;
351+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Version $imgRef.Version;
352+
325353
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
326354
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
327355
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
@@ -421,16 +449,23 @@ function Test-VirtualMachineAccessExtension
421449
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
422450
$computerName = 'test';
423451
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
424-
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
425452

426453
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
427-
$p = Set-AzureVMSourceImage -VM $p -Name $img;
454+
455+
$imgRef = Get-DefaultCRPWindowsImageOffline;
456+
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
428457

429458
Assert-AreEqual $p.OSProfile.AdminUsername $user;
430459
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
431460
Assert-AreEqual $p.OSProfile.AdminPassword $password;
432461
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
433-
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
462+
463+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
464+
#
465+
# Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
466+
# Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
467+
# Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
468+
# Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
434469

435470
# Virtual Machine
436471
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
@@ -472,7 +507,14 @@ function Test-VirtualMachineAccessExtension
472507
Assert-AreEqual $vm1.Name $vmname;
473508
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
474509
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
475-
Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
510+
511+
# TODO : The test is outdated, need re-recording and re-enabling these fields for validation
512+
#
513+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Offer $imgRef.Offer;
514+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
515+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Sku $imgRef.Skus;
516+
# Assert-AreEqual $vm1.StorageProfile.ImageReference.Version $imgRef.Version;
517+
476518
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
477519
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
478520
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ function Test-SingleNetworkInterface
9999
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
100100
Assert-AreEqual $p.OSProfile.AdminPassword $password;
101101

102-
# Image Reference;
103-
$p.StorageProfile.SourceImage = $null;
102+
# Image Reference
104103
$imgRef = Get-DefaultCRPImage;
105104
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
106105
Assert-NotNull $p.StorageProfile.ImageReference;
@@ -205,8 +204,7 @@ function Test-SingleNetworkInterfaceDnsSettings
205204
# $p.StorageProfile.OSDisk = $null;
206205
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
207206

208-
# Image Reference;
209-
$p.StorageProfile.SourceImage = $null;
207+
# Image Reference
210208
$imgRef = Get-DefaultCRPImage;
211209
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
212210
Assert-NotNull $p.StorageProfile.ImageReference;
@@ -315,8 +313,7 @@ function Test-MultipleNetworkInterface
315313
# $p.StorageProfile.OSDisk = $null;
316314
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
317315

318-
# Image Reference;
319-
$p.StorageProfile.SourceImage = $null;
316+
# Image Reference
320317
$imgRef = Get-DefaultCRPImage;
321318
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
322319
Assert-NotNull $p.StorageProfile.ImageReference;

0 commit comments

Comments
 (0)