Skip to content

Commit 9f910dd

Browse files
unknownunknown
unknown
authored and
unknown
committed
Fix for combining image and imagedetails
1 parent 8dedf30 commit 9f910dd

File tree

9 files changed

+55
-35
lines changed

9 files changed

+55
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ function Get-DefaultCRPImage
211211
$defaultVersion = $result[0];
212212
}
213213

214-
$vmimg = Get-AzureVMImageDetail -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion;
214+
$vmimg = Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion;
215215

216216
return $vmimg;
217217
}

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,15 @@ function Test-VirtualMachineImageList
252252
{
253253
$versions = $s4 | select -ExpandProperty Version;
254254

255-
$s6 = Get-AzureVMImage -Location $locStr -PublisherName $pub -Offer $offer -Sku $sku -FilterExpression ('name -eq *');
256-
Assert-NotNull $s6;
257-
Assert-NotNull $s6.Count -gt 0;
258-
$verNames = $s6 | select -ExpandProperty Version;
255+
$s5 = Get-AzureVMImage -Location $locStr -PublisherName $pub -Offer $offer -Sku $sku -FilterExpression ('name -eq *');
256+
Assert-NotNull $s5;
257+
Assert-NotNull $s5.Count -gt 0;
258+
$verNames = $s5 | select -ExpandProperty Version;
259259

260260
foreach ($ver in $versions)
261261
{
262262
if ($ver -eq $null -or $ver -eq '') { continue; }
263-
#$s6 = Get-AzureVMImageDetail -Location $locStr -PublisherName $pub -Offer $offer -Sku $sku -Version $ver;
264-
$s6 = Get-AzureVMImage -Location $locStr -PublisherName $pub -Offer $offer -Sku $sku -Version $ver;
263+
$s6 = Get-AzureVMImage -Location $locStr -PublisherName $pub -Offer $offer -Sku $sku -Version $ver;
265264
Assert-NotNull $s6;
266265
$s6;
267266

@@ -300,7 +299,7 @@ function Test-VirtualMachineImageList
300299
$versions = $s2 | select -ExpandProperty Version;
301300
foreach ($ver in $versions)
302301
{
303-
$s3 = Get-AzureVMExtensionImageDetail -Location $locStr -PublisherName $pub -Type $type -Version $ver -FilterExpression '*';
302+
$s3 = Get-AzureVMExtensionImage -Location $locStr -PublisherName $pub -Type $type -Version $ver -FilterExpression '*';
304303

305304
Assert-NotNull $s3;
306305
Assert-True { $s3.Version -eq $ver; }
@@ -317,11 +316,11 @@ function Test-VirtualMachineImageList
317316

318317
# Test Piping
319318
$pubNameFilter = '*Microsoft*Windows*Server*';
320-
$imgs = Get-AzureVMImagePublisher -Location $locStr | where { $_.PublisherName -like $pubNameFilter } | Get-AzureVMImageOffer | Get-AzureVMImageSku | Get-AzureVMImage | Get-AzureVMImageDetail;
319+
$imgs = Get-AzureVMImagePublisher -Location $locStr | where { $_.PublisherName -like $pubNameFilter } | Get-AzureVMImageOffer | Get-AzureVMImageSku | Get-AzureVMImage | Get-AzureVMImage;
321320
Assert-True { $imgs.Count -gt 0 };
322321

323322
$pubNameFilter = '*Microsoft.Compute*';
324-
$extimgs = Get-AzureVMImagePublisher -Location $locStr | where { $_.PublisherName -like $pubNameFilter } | Get-AzureVMExtensionImageType | Get-AzureVMExtensionImage | Get-AzureVMExtensionImageDetail;
323+
$extimgs = Get-AzureVMImagePublisher -Location $locStr | where { $_.PublisherName -like $pubNameFilter } | Get-AzureVMExtensionImageType | Get-AzureVMExtensionImage | Get-AzureVMExtensionImage;
325324
Assert-True { $extimgs.Count -gt 0 };
326325

327326
# Negative Tests
@@ -342,12 +341,12 @@ function Test-VirtualMachineImageList
342341
Assert-ThrowsContains { $s5 = Get-AzureVMImage -Location $locStr -PublisherName $publisherName -Offer $offerName -Skus $skusName -FilterExpression $filter; } "was not found";
343342

344343
$version = '1.0.0';
345-
Assert-ThrowsContains { $s6 = Get-AzureVMImageDetail -Location $locStr -PublisherName $publisherName -Offer $offerName -Skus $skusName -Version $version; } "was not found";
344+
Assert-ThrowsContains { $s6 = Get-AzureVMImage -Location $locStr -PublisherName $publisherName -Offer $offerName -Skus $skusName -Version $version; } "was not found";
346345

347346
# Extension Images
348347
$type = Get-ComputeTestResourceName;
349-
Assert-ThrowsContains { $s7 = Get-AzureVMExtensionImageDetail -Location $locStr -PublisherName $publisherName -Type $type -FilterExpression $filter -Version $version; } "was not found";
350-
348+
Assert-ThrowsContains { $s7 = Get-AzureVMExtensionImage -Location $locStr -PublisherName $publisherName -Type $type -FilterExpression $filter -Version $version; } "was not found";
349+
351350
Assert-ThrowsContains { $s8 = Get-AzureVMExtensionImageType -Location $locStr -PublisherName $publisherName; } "was not found";
352351

353352
Assert-ThrowsContains { $s9 = Get-AzureVMExtensionImage -Location $locStr -PublisherName $publisherName -Type $type -FilterExpression $filter; } "was not found";
@@ -988,7 +987,7 @@ function Test-VirtualMachinePlan2
988987
$vmmImgOfferName = 'a10-vthunder-adc';
989988
$vmmImgSkusName = 'vthunder_byol';
990989
$vmmImgVerName = '1.0.0';
991-
$imgRef = Get-AzureVMImageDetail -PublisherName $vmmImgPubName -Location $loc -Offer $vmmImgOfferName -Skus $vmmImgSkusName -Version $vmmImgVerName;
990+
$imgRef = Get-AzureVMImage -PublisherName $vmmImgPubName -Location $loc -Offer $vmmImgOfferName -Skus $vmmImgSkusName -Version $vmmImgVerName;
992991
$plan = $imgRef.PurchasePlan;
993992
$p = Set-AzureVMSourceImage -VM $p -PublisherName $imgRef.PublisherName -Offer $imgRef.Offer -Skus $imgRef.Skus -Version $imgRef.Version;
994993
$p.Plan = New-Object Microsoft.Azure.Management.Compute.Models.Plan;

‎src/ResourceManager/Compute/Commands.Compute/ExtensionImages/GetAzureVMExtensionImageCommand.cs‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@
2222
namespace Microsoft.Azure.Commands.Compute
2323
{
2424
[Cmdlet(VerbsCommon.Get,
25-
ProfileNouns.VirtualMachineExtensionImage,
26-
DefaultParameterSetName = ListVMImageExtensionParamSetName)]
27-
[OutputType(typeof(PSVirtualMachineExtensionImage),
28-
ParameterSetName = new[] { ListVMImageExtensionParamSetName })]
29-
[OutputType(typeof(PSVirtualMachineExtensionImageDetails),
30-
ParameterSetName = new[] { GetVMImageExtensionDetailParamSetName })]
25+
ProfileNouns.VirtualMachineExtensionImage)]
26+
[OutputType(typeof(PSVirtualMachineExtensionImageDetails))]
3127
public class GetAzureVMExtensionImageCommand : VirtualMachineExtensionImageBaseCmdlet
3228
{
33-
protected const string ListVMImageExtensionParamSetName = "ListVMImageExtension";
34-
protected const string GetVMImageExtensionDetailParamSetName = "GetVMImageExtensionDetail";
35-
3629
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true), ValidateNotNullOrEmpty]
3730
public string Location { get; set; }
3831

@@ -45,17 +38,14 @@ public class GetAzureVMExtensionImageCommand : VirtualMachineExtensionImageBaseC
4538
[Parameter, ValidateNotNullOrEmpty]
4639
public string FilterExpression { get; set; }
4740

48-
[Parameter(ParameterSetName = GetVMImageExtensionDetailParamSetName,
49-
Mandatory = true,
50-
ValueFromPipelineByPropertyName = true),
51-
ValidateNotNullOrEmpty]
41+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true)]
5242
public string Version { get; set; }
5343

5444
public override void ExecuteCmdlet()
5545
{
5646
base.ExecuteCmdlet();
5747

58-
if (this.PagingParameters.Equals(ListVMImageExtensionParamSetName))
48+
if (string.IsNullOrEmpty(this.Version))
5949
{
6050
var parameters = new VirtualMachineExtensionImageListVersionsParameters
6151
{

‎src/ResourceManager/Compute/Commands.Compute/ExtensionImages/GetAzureVMExtensionImageDetailCommand.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public override void ExecuteCmdlet()
4343
{
4444
base.ExecuteCmdlet();
4545

46+
WriteWarning(Properties.Resources.DeprecationOfGetAzureVMExtensionImageDetail);
47+
4648
var parameters = new VirtualMachineExtensionImageGetParameters
4749
{
4850
Location = Location.Canonicalize(),

‎src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImageCommand.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
namespace Microsoft.Azure.Commands.Compute
2323
{
2424
[Cmdlet(VerbsCommon.Get,
25-
ProfileNouns.VirtualMachineImage,
26-
DefaultParameterSetName = ListVMImageParamSetName)]
25+
ProfileNouns.VirtualMachineImage)]
2726
[OutputType(typeof(PSVirtualMachineImage),
2827
ParameterSetName = new [] {ListVMImageParamSetName})]
2928
[OutputType(typeof(PSVirtualMachineImageDetail),
@@ -70,7 +69,7 @@ public class GetAzureVMImageCommand : VirtualMachineImageBaseCmdlet
7069
public string Skus { get; set; }
7170

7271
[Parameter(ParameterSetName = ListVMImageParamSetName,
73-
ValueFromPipelineByPropertyName = true),
72+
ValueFromPipelineByPropertyName = false),
7473
ValidateNotNullOrEmpty]
7574
public string FilterExpression { get; set; }
7675

@@ -132,6 +131,7 @@ public override void ExecuteCmdlet()
132131
StatusCode = response.StatusCode,
133132
Id = response.VirtualMachineImage.Id,
134133
Location = response.VirtualMachineImage.Location,
134+
Name = response.VirtualMachineImage.Name,
135135
Version = response.VirtualMachineImage.Name,
136136
PublisherName = this.PublisherName,
137137
Offer = this.Offer,

‎src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImageDetailCommand.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public override void ExecuteCmdlet()
4444
{
4545
base.ExecuteCmdlet();
4646

47+
WriteWarning(Properties.Resources.DeprecationOfGetAzureVMImageDetail);
48+
4749
var parameters = new VirtualMachineImageGetParameters
4850
{
4951
Location = Location.Canonicalize(),
@@ -61,13 +63,14 @@ public override void ExecuteCmdlet()
6163
StatusCode = response.StatusCode,
6264
Id = response.VirtualMachineImage.Id,
6365
Location = response.VirtualMachineImage.Location,
64-
Version = response.VirtualMachineImage.Name,
65-
PublisherName = this.PublisherName,
66-
Offer = this.Offer,
67-
Skus = this.Skus,
66+
Name = response.VirtualMachineImage.Name,
6867
OSDiskImage = response.VirtualMachineImage.OSDiskImage,
6968
DataDiskImages = response.VirtualMachineImage.DataDiskImages,
7069
PurchasePlan = response.VirtualMachineImage.PurchasePlan,
70+
PublisherName = this.PublisherName,
71+
Offer = this.Offer,
72+
Skus = this.Skus,
73+
Version = this.Version
7174
};
7275

7376
WriteObject(image);

‎src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineImage.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ public class PSVirtualMachineImage : PSVirtualMachineImageSku
4949

5050
public class PSVirtualMachineImageDetail : PSVirtualMachineImage
5151
{
52+
public string Name { get; set; }
53+
5254
public OSDiskImage OSDiskImage { get; set; }
5355

5456
public PurchasePlan PurchasePlan { get; set; }

‎src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@
129129
<data name="CustomScriptExtensionTryToUseTheFirstSpecifiedFileAsRunScript" xml:space="preserve">
130130
<value>No Run File has been assigned, and the Custom Script extension will try to use the first specified File Name as the Run File.</value>
131131
</data>
132+
<data name="DeprecationOfGetAzureVMExtensionImageDetail" xml:space="preserve">
133+
<value>Get-AzureVMExtensionImageDetail cmdlet will be deprecated in a future release of Azure PowerShell. The functionality is merged into Get-AzureVMExtensionImage cmdlet.</value>
134+
</data>
135+
<data name="DeprecationOfGetAzureVMImageDetail" xml:space="preserve">
136+
<value>Get-AzureVMImageDetail cmdlet will be deprecated in a future release of Azure PowerShell. The functionality is merged into Get-AzureVMImage cmdlet.</value>
137+
</data>
132138
<data name="VirtualMachineExtensionRemovalCaption" xml:space="preserve">
133139
<value>Virtual machine extension removal operation</value>
134140
</data>

0 commit comments

Comments
 (0)