Skip to content

Commit 657918c

Browse files
committed
Update DLL & Tests
1 parent 2d8f333 commit 657918c

File tree

17 files changed

+23281
-347
lines changed

17 files changed

+23281
-347
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Compute, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.9.0.1-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.9.0.2-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">

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,15 @@ function Test-VirtualMachineScaleSet
7676
$vmss.Type = 'Microsoft.Compute/virtualMachineScaleSets';
7777
$vmss.Location = $loc;
7878

79-
$vmss.NetworkProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetNetworkProfile;
79+
$vmss.VirtualMachineProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetVMProfile;
80+
$vmss.VirtualMachineProfile.Extensions = $null;
81+
$vmss.Sku = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetSku;
82+
$vmss.Sku.Capacity = 2;
83+
$vmss.Sku.Name = 'Standard_A0';
84+
$vmss.UpgradePolicy = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetUpgradePolicy;
85+
$vmss.UpgradePolicy.Mode = 'automatic';
8086

87+
$vmss.VirtualMachineProfile.NetworkProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetNetworkProfile;
8188
$ipCfg = New-Object Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetIPConfiguration;
8289
$ipcfg.Name = 'test';
8390
$ipCfg.LoadBalancerBackendAddressPools = $null;
@@ -87,14 +94,8 @@ function Test-VirtualMachineScaleSet
8794
$netCfg.Name = 'test';
8895
$netCfg.Primary = $true;
8996
$netCfg.IPConfigurations.Add($ipCfg);
90-
$vmss.NetworkProfile.NetworkConfigurations.Add($netCfg);
97+
$vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations.Add($netCfg);
9198

92-
$vmss.Sku = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetSku;
93-
$vmss.Sku.Capacity = 2;
94-
$vmss.Sku.Name = $vmsize;
95-
96-
$vmss.VirtualMachineProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetVMProfile;
97-
$vmss.VirtualMachineProfile.Extensions = $null;
9899
$vmss.VirtualMachineProfile.OSProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetOSProfile;
99100
$vmss.VirtualMachineProfile.OSProfile.ComputerNamePrefix = 'test';
100101
$vmss.VirtualMachineProfile.OSProfile.AdminUsername = 'Foo12';
@@ -103,21 +104,20 @@ function Test-VirtualMachineScaleSet
103104
$vmss.VirtualMachineProfile.StorageProfile = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetStorageProfile;
104105
$imgRef = Get-DefaultCRPImage -loc $loc;
105106
$vmss.VirtualMachineProfile.StorageProfile.ImageReference = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetImageReference;
106-
$vmss.VirtualMachineProfile.StorageProfile.ImageReference.Publisher = $imgRef.Publisher;
107+
$vmss.VirtualMachineProfile.StorageProfile.ImageReference.Publisher = $imgRef.PublisherName;
107108
$vmss.VirtualMachineProfile.StorageProfile.ImageReference.Offer = $imgRef.Offer;
108109
$vmss.VirtualMachineProfile.StorageProfile.ImageReference.Sku = $imgRef.Skus;
109110
$vmss.VirtualMachineProfile.StorageProfile.ImageReference.Version = $imgRef.Version;
110111
$vmss.VirtualMachineProfile.StorageProfile.OSDisk = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetOSDisk;
111112
$vmss.VirtualMachineProfile.StorageProfile.OSDisk.Caching = 'None';
112113
$vmss.VirtualMachineProfile.StorageProfile.OSDisk.CreateOption = 'FromImage';
113114
$vmss.VirtualMachineProfile.StorageProfile.OSDisk.Name = 'test';
114-
$vmss.VirtualMachineProfile.StorageProfile.OSDisk.OperatingSystemType = 'Windows';
115-
$vhdContainer = "https://" + $stoname + ".blob.core.windows.net/" + $vmssname;
115+
$vhdContainer = "https://" + $stoname + ".blob.core.windows.net/" + $vmss.Name;
116116
$vmss.VirtualMachineProfile.StorageProfile.OSDisk.VirtualHardDiskContainers.Add($vhdContainer);
117117

118-
# $st = New-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VirtualMachineScaleSetCreateOrUpdateParameters $vmss;
119-
# $vmssResult = Get-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VMScaleSetName $vmss.Name;
120-
# Assert-True { $vmss.Name -eq $vmssResult.Name };
118+
$st = New-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VirtualMachineScaleSetCreateOrUpdateParameters $vmss;
119+
$vmssResult = Get-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VMScaleSetName $vmss.Name;
120+
Assert-True { $vmss.Name -eq $vmssResult.VirtualMachineScaleSet.Name };
121121

122122
# List All
123123
$all_vmss = Get-AzureVirtualMachineScaleSetAllList -VirtualMachineScaleSetListAllParameters $null;

0 commit comments

Comments
 (0)