Skip to content

Commit dba029c

Browse files
imagename case insensetive
1 parent b5d723f commit dba029c

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

src/ResourceManager/Common/Commands.Common.Strategies/Network/VirtualNetworkStrategy.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.Azure.Management.Network;
1616
using Microsoft.Azure.Management.Network.Models;
1717
using Microsoft.Azure.Management.ResourceManager.Models;
18-
using System;
1918

2019
namespace Microsoft.Azure.Commands.Common.Strategies.Network
2120
{

src/ResourceManager/Compute/Commands.Compute/Common/ComputeClientBaseCmdlet.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ public abstract class ComputeClientBaseCmdlet : Microsoft.Azure.Commands.Resourc
2121
{
2222
protected const string VirtualMachineExtensionType = "Microsoft.Compute/virtualMachines/extensions";
2323

24-
protected override bool IsUsageMetricEnabled
25-
{
26-
get { return true; }
27-
}
24+
protected override bool IsUsageMetricEnabled => true;
2825

2926
private ComputeClient computeClient;
3027

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ public ProgressReportType(Cmdlet cmdlet)
210210
public void Report<TModel>(ResourceConfig<TModel> config, double progress)
211211
where TModel : class
212212
{
213-
214213
}
215214
/*
216215
=> _Cmdlet.WriteVerbose(
@@ -231,9 +230,11 @@ public void StrategyExecuteCmdlet()
231230
// get image
232231
var image = Images
233232
.Instance
234-
.Select(osAndMap =>
235-
new { OsType = osAndMap.Key, Image = osAndMap.Value.GetOrNull(ImageName) })
236-
.First(osAndImage => osAndImage.Image != null);
233+
.SelectMany(osAndMap => osAndMap
234+
.Value
235+
.Where(nameAndImage => nameAndImage.Key.ToLower() == ImageName.ToLower())
236+
.Select(nameAndImage => new { OsType = osAndMap.Key, Image = nameAndImage.Value }))
237+
.FirstOrDefault();
237238

238239
OpenPorts = OpenPorts
239240
?? (image.OsType == "Windows" ? new[] { 3389, 5985 } : new[] { 22 });
@@ -258,6 +259,7 @@ public void StrategyExecuteCmdlet()
258259
adminPassword: new NetworkCredential(string.Empty, Credential.Password).Password,
259260
image: image.Image);
260261

262+
// get state
261263
var client = new Client(DefaultProfile.DefaultContext);
262264
var current = virtualMachine
263265
.GetStateAsync(client, new CancellationToken())
@@ -273,8 +275,10 @@ public void StrategyExecuteCmdlet()
273275
}
274276
}
275277

278+
// create target state
276279
var target = virtualMachine.GetTargetState(current, client.SubscriptionId, Location);
277280

281+
// apply target state
278282
var result = virtualMachine
279283
.UpdateStateAsync(
280284
client,

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/VirtualMachineBaseCmdlet.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,8 @@ public abstract class VirtualMachineBaseCmdlet : ComputeClientBaseCmdlet
2828
{
2929
protected const InstanceViewTypes InstanceViewExpand = InstanceViewTypes.InstanceView;
3030

31-
public IVirtualMachinesOperations VirtualMachineClient
32-
{
33-
get
34-
{
35-
return ComputeClient.ComputeManagementClient.VirtualMachines;
36-
}
37-
}
31+
public IVirtualMachinesOperations VirtualMachineClient
32+
=> ComputeClient.ComputeManagementClient.VirtualMachines;
3833

3934
public static string FormatObject(Object obj)
4035
{

0 commit comments

Comments
 (0)