Skip to content

Commit a941617

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#5073 from hyonholee/preview
[Compute] Update Compute client library to versing 17.0.0.
2 parents 21dc0cc + 4c72a8d commit a941617

File tree

66 files changed

+613577
-623534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+613577
-623534
lines changed

‎src/ResourceManager/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Get-AzureRmComputeResourceSku shows zone information.
2122
* Update Disable-AzureRmVmssDiskEncryption to fix issue https://github.com/Azure/azure-powershell/issues/5038
2223

2324
## Version 4.0.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Compute">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.16.3.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.17.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=15.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.15.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ function Get-DefaultCRPWindowsImageOffline
400400
# Get Default CRP Linux Image Object Offline
401401
function Get-DefaultCRPLinuxImageOffline
402402
{
403-
return Create-ComputeVMImageObject 'SUSE' 'openSUSE' '13.2' 'latest';
403+
return Create-ComputeVMImageObject 'SUSE' 'openSUSE-Leap' '42.3' 'latest';
404404
}
405405

406406
<#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ Test List Resource Skus
1818
#>
1919
function Test-GetResourceSku
2020
{
21-
$skulist = Get-AzureRmComputeResourceSku | where {$_.Locations -eq "eastus2"};
21+
$skulist = Get-AzureRmComputeResourceSku | where {$_.Locations -eq "eastus"};
2222
Assert-True { $skulist.Count -gt 0; }
2323
$output = $skulist | Out-String;
2424
Assert-True { $output.Contains("availabilitySets"); }
2525
Assert-True { $output.Contains("virtualMachines"); }
26+
Assert-True { $output.Contains("Zones"); }
2627
}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -499,18 +499,19 @@ function Test-VirtualMachineScaleSetReimageUpdate
499499
$vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
500500
Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;
501501

502-
Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId "0";
502+
$vmssVMs = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName
503+
$id = $vmssVMs[0].InstanceId
504+
505+
Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id;
503506
$vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
504507
$vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
505508
Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;
506509

507510
# Reimage operation
508-
Assert-ThrowsContains {
509-
Set-AzureRmVmss -Reimage -ResourceGroupName $rgname -VMScaleSetName $vmssName; } `
510-
"Conflict";
511+
Set-AzureRmVmss -Reimage -ResourceGroupName $rgname -VMScaleSetName $vmssName;
511512

512513
# Remove
513-
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
514+
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id -Force;
514515
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
515516
}
516517
finally
@@ -665,7 +666,7 @@ function Test-VirtualMachineScaleSetLB
665666
$vmssList = Get-AzureRmVmss | ? Name -like 'vmsscrptestps*';
666667
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
667668
$output = $vmssList | Out-String;
668-
Assert-AreEqual 1 $vmssList.Count
669+
Assert-True { $vmssList.Count -ge 0 }
669670
Write-Verbose ($output);
670671
Assert-False { $output.Contains("VirtualMachineProfile") };
671672

@@ -1160,7 +1161,7 @@ function Test-VirtualMachineScaleSetRollingUpgrade
11601161
$vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
11611162

11621163
Assert-ThrowsContains { Start-AzureRmVmssRollingOSUpgrade -ResourceGroupName $rgname -VMScaleSetName $vmssName } `
1163-
"unless the VM Scale Set has upgradePolicy.mode set to Rolling";
1164+
"unless the VM Scale Set has some instances which have imageReference.version set to latest";
11641165

11651166
Assert-ThrowsContains { Stop-AzureRmVmssRollingUpgrade -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force } `
11661167
"There is no ongoing Rolling Upgrade to cancel.";

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -497,27 +497,14 @@ Test Virtual Machine Size and Usage
497497
#>
498498
function Test-VirtualMachineList
499499
{
500-
# Setup
501-
$passed = $false;
502-
503-
try
504-
{
505-
$s1 = Get-AzureRmVM;
506-
$s2 = Get-AzureRmVM;
507-
508-
if ($s2 -ne $null)
509-
{
510-
Assert-NotNull $s2[0].Id;
511-
}
512-
513-
Assert-ThrowsContains { $s3 = Get-AzureRmVM -NextLink "http://www.test.com/test"; } "Unable to deserialize the response"
500+
$s1 = Get-AzureRmVM;
501+
$s2 = Get-AzureRmVM;
514502

515-
$passed = $true;
516-
}
517-
finally
503+
if ($s2 -ne $null)
518504
{
519-
Assert-True { $passed };
505+
Assert-NotNull $s2[0].Id;
520506
}
507+
Assert-ThrowsContains { $s3 = Get-AzureRmVM -NextLink "https://www.test.com/test"; } "Unable to deserialize the response"
521508
}
522509

523510
<#
@@ -1450,7 +1437,7 @@ function Test-VirtualMachineDataDiskNegative
14501437
$p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
14511438

14521439
# Negative Tests on A0 Size + 2 Data Disks
1453-
Assert-ThrowsContains { New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p; } "The maximum number of data disks allowed to be attached to a VM is 1.";
1440+
Assert-ThrowsContains { New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p; } "The maximum number of data disks allowed to be attached to a VM of this size is 1.";
14541441
}
14551442
finally
14561443
{
@@ -1952,7 +1939,7 @@ function Test-VMImageCmdletOutputFormat
19521939

19531940
Assert-OutputContains " Get-AzureRmVMImagePublisher -Location '$locStr' | ? { `$_.PublisherName -eq `'$publisher`' } | Get-AzureRmVMImageOffer | Get-AzureRmVMImageSku " @('Id', 'Location', 'PublisherName', 'Offer', 'Sku');
19541941

1955-
Assert-OutputContains " Get-AzureRmVMImagePublisher -Location '$locStr' | ? { `$_.PublisherName -eq `'$publisher`' } | Get-AzureRmVMImageOffer | Get-AzureRmVMImageSku | Get-AzureRmVMImage " @('Id', 'Location', 'PublisherName', 'Offer', 'Sku', 'Version', 'FilterExpression');
1942+
Assert-OutputContains " Get-AzureRmVMImagePublisher -Location '$locStr' | ? { `$_.PublisherName -eq `'$publisher`' } | Get-AzureRmVMImageOffer | Get-AzureRmVMImageSku | Get-AzureRmVMImage " @('Version', 'FilterExpression', 'Skus', 'Offer', 'PublisherName');
19561943

19571944
Assert-OutputContains " Get-AzureRmVMImage -Location '$locStr' -PublisherName $publisher -Offer $offer -Skus $sku -Version $ver " @('Id', 'Location', 'PublisherName', 'Offer', 'Sku', 'Version', 'FilterExpression', 'Name', 'DataDiskImages', 'OSDiskImage', 'PurchasePlan');
19581945

@@ -1980,17 +1967,18 @@ function get_all_vm_locations
19801967
$namespace = "Microsoft.Compute"
19811968
$type = "virtualMachines"
19821969
$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
1983-
1970+
19841971
if ($location -eq $null)
19851972
{
1986-
return @("West US", "East US")
1987-
} else
1973+
return @("East US")
1974+
}
1975+
else
19881976
{
19891977
return $location.Locations
19901978
}
19911979
}
19921980

1993-
return @("West US", "East US")
1981+
return @("East US")
19941982
}
19951983

19961984
<#

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AvailabilitySetTests/TestAvailabilitySet.json

Lines changed: 203 additions & 179 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)