@@ -370,7 +370,7 @@ function Test-AddNetworkInterface
370
370
New-AzureResourceGroup - Name $rgname - Location $loc - Force;
371
371
372
372
# VM Profile & Hardware
373
- $vmsize = ' Standard_A4 ' ;
373
+ $vmsize = ' Standard_A2 ' ;
374
374
$vmname = ' vm' + $rgname ;
375
375
$p = New-AzureVMConfig - VMName $vmname - VMSize $vmsize ;
376
376
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize ;
@@ -384,14 +384,14 @@ function Test-AddNetworkInterface
384
384
$pubip = Get-AzurePublicIpAddress - Name (' pubip' + $rgname ) - ResourceGroupName $rgname ;
385
385
$pubipId = $pubip.Id ;
386
386
$nic = New-AzureNetworkInterface - Force - Name (' nic' + $rgname ) - ResourceGroupName $rgname - Location $loc - SubnetId $subnetId - PublicIpAddressId $pubip.Id ;
387
- $nicId = $nic.Id ;
387
+ $nicId = $nic.Id ;
388
388
389
389
$nicList = Get-AzureNetworkInterface - ResourceGroupName $rgname ;
390
- $nicList [0 ].Primary = $true ;
390
+ $nicList [0 ].Primary = $true ;
391
391
$p = Add-AzureVMNetworkInterface - VM $p - NetworkInterface $nicList ;
392
392
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1 ;
393
393
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces [0 ].ReferenceUri $nicList [0 ].Id;
394
- Assert-AreEqual $p.NetworkProfile.NetworkInterfaces [0 ].Primary $true ;
394
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces [0 ].Primary $true ;
395
395
396
396
# Storage Account (SA)
397
397
$stoname = ' sto' + $rgname ;
@@ -424,23 +424,23 @@ function Test-AddNetworkInterface
424
424
Assert-AreEqual $p.StorageProfile.DataDisks [1 ].Lun 2 ;
425
425
Assert-AreEqual $p.StorageProfile.DataDisks [1 ].VirtualHardDisk.Uri $dataDiskVhdUri2 ;
426
426
427
- # OS & Image
427
+ # OS & Image
428
428
$user = " Foo12" ;
429
429
$password = ' BaR@123' + $rgname ;
430
430
$securePassword = ConvertTo-SecureString $password - AsPlainText - Force;
431
431
$cred = New-Object System.Management.Automation.PSCredential ($user , $securePassword );
432
432
$computerName = ' test' ;
433
- $vhdContainer = " https://$stoname .blob.core.windows.net/test" ;
434
- $img = ' a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd' ;
435
-
436
- # $p.StorageProfile.OSDisk = $null;
437
433
$p = Set-AzureVMOperatingSystem - VM $p - Windows - ComputerName $computerName - Credential $cred ;
438
- $p = Set-AzureVMSourceImage - VM $p - Name $img ;
439
434
440
435
Assert-AreEqual $p.OSProfile.AdminUsername $user ;
441
436
Assert-AreEqual $p.OSProfile.ComputerName $computerName ;
442
437
Assert-AreEqual $p.OSProfile.AdminPassword $password ;
443
- Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri (' /' + (Get-AzureSubscription - Current).SubscriptionId + ' /services/images/' + $img );
438
+
439
+ # Image Reference
440
+ $imgRef = Get-DefaultCRPImage ;
441
+ $p = ($imgRef | Set-AzureVMSourceImage - VM $p );
442
+ Assert-NotNull $p.StorageProfile.ImageReference ;
443
+ Assert-Null $p.StorageProfile.SourceImageId ;
444
444
445
445
# TODO: Remove Data Disks for now
446
446
$p.StorageProfile.DataDisks = $null ;
@@ -449,36 +449,10 @@ function Test-AddNetworkInterface
449
449
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
450
450
New-AzureVM - ResourceGroupName $rgname - Location $loc - Name $vmname - VM $p ;
451
451
452
- # Get VM
453
452
$vm1 = Get-AzureVM - Name $vmname - ResourceGroupName $rgname ;
454
453
Assert-AreEqual $vm1.Name $vmname ;
455
454
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1 ;
456
455
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces [0 ].ReferenceUri $nicId ;
457
- Assert-AreEqual $vm1.StorageProfile.SourceImage.ReferenceUri (' /' + (Get-AzureSubscription - Current).SubscriptionId + ' /services/images/' + $img );
458
- Assert-AreEqual $vm1.OSProfile.AdminUsername $user ;
459
- Assert-AreEqual $vm1.OSProfile.ComputerName $computerName ;
460
- Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize ;
461
-
462
- # Update
463
- $p.Location = $vm1.Location ;
464
- Update-AzureVM - ResourceGroupName $rgname - Name $vmname - VM $p ;
465
-
466
- $vm2 = Get-AzureVM - Name $vmname - ResourceGroupName $rgname ;
467
- Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces.Count 1 ;
468
- Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces [0 ].ReferenceUri $nicId ;
469
- Assert-AreEqual $vm2.StorageProfile.SourceImage.ReferenceUri (' /' + (Get-AzureSubscription - Current).SubscriptionId + ' /services/images/' + $img );
470
- Assert-AreEqual $vm2.OSProfile.AdminUsername $user ;
471
- Assert-AreEqual $vm2.OSProfile.ComputerName $computerName ;
472
- Assert-AreEqual $vm2.HardwareProfile.VirtualMachineSize $vmsize ;
473
- Assert-NotNull $vm2.Location ;
474
-
475
- $vms = Get-AzureVM - ResourceGroupName $rgname ;
476
- Assert-AreNotEqual $vms $null ;
477
-
478
- # Remove All VMs
479
- Get-AzureVM - ResourceGroupName $rgname | Remove-AzureVM - ResourceGroupName $rgname - Force;
480
- $vms = Get-AzureVM - ResourceGroupName $rgname ;
481
- Assert-AreEqual $vms $null ;
482
456
}
483
457
finally
484
458
{
0 commit comments