Skip to content

Commit d691559

Browse files
Image name
1 parent 03392cf commit d691559

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/ResourceManager/Common/Commands.Common.Strategies/Compute/VirtualMachineStrategy.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
2121
string name,
2222
ResourceConfig<NetworkInterface> networkInterface,
2323
string adminUsername,
24-
string adminPassword)
24+
string adminPassword,
25+
Image image)
2526
=> Strategy.CreateConfig(
2627
resourceGroup,
2728
name,
@@ -54,10 +55,10 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
5455
{
5556
ImageReference = new ImageReference
5657
{
57-
Publisher = "MicrosoftWindowsServer",
58-
Offer = "WindowsServer",
59-
Sku = "2016-Datacenter",
60-
Version = "latest"
58+
Publisher = image.publisher,
59+
Offer = image.offer,
60+
Sku = image.sku,
61+
Version = image.version
6162
}
6263
},
6364
},

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
using System.Collections;
3535
using System.Linq;
3636
using System.Management.Automation;
37+
using System.Net;
3738
using System.Reflection;
3839
using System.Threading;
3940
using CM = Microsoft.Azure.Management.Compute.Models;
@@ -189,7 +190,7 @@ public void StrategyExecuteCmdlet()
189190
VirtualNetworkName = VirtualNetworkName ?? Name;
190191
SubnetName = SubnetName ?? Name;
191192
PublicIpAddressName = PublicIpAddressName ?? Name;
192-
DomainNameLabel = DomainNameLabel ?? (Name + ResourceGroupName);
193+
DomainNameLabel = DomainNameLabel ?? (Name + ResourceGroupName).ToLower();
193194
SecurityGroupName = SecurityGroupName ?? Name;
194195

195196
// get image
@@ -199,6 +200,9 @@ public void StrategyExecuteCmdlet()
199200
new { OsType = osAndMap.Key, Image = osAndMap.Value.GetOrNull(ImageName) })
200201
.First(osAndImage => osAndImage.Image != null);
201202

203+
OpenPorts = OpenPorts
204+
?? (image.OsType == "Windows" ? new[] { 3389, 5985 } : new[] { 22 });
205+
202206
var resourceGroup = ResourceGroupStrategy.CreateResourceGroupConfig(ResourceGroupName);
203207
var virtualNetwork = resourceGroup.CreateVirtualNetworkConfig(
204208
name: VirtualNetworkName, addressPrefix: AddressPrefix);
@@ -213,10 +217,11 @@ public void StrategyExecuteCmdlet()
213217
var networkInterface = resourceGroup.CreateNetworkInterfaceConfig(
214218
Name, subnet, publicIpAddress, networkSecurityGroup);
215219
var virtualMachine = resourceGroup.CreateVirtualMachineConfig(
216-
Name,
217-
networkInterface,
218-
Credential.UserName,
219-
new System.Net.NetworkCredential(string.Empty, Credential.Password).Password);
220+
name: Name,
221+
networkInterface: networkInterface,
222+
adminUsername: Credential.UserName,
223+
adminPassword: new NetworkCredential(string.Empty, Credential.Password).Password,
224+
image: image.Image);
220225

221226
//
222227
var client = new Client(DefaultProfile.DefaultContext);

0 commit comments

Comments
 (0)