Merge pull request #5734 from sergey-shandar/sergey-vmss-disks

cormacpayne · web-flow · commit 65f18f8a996d · 2018-03-20T08:40:26.000-07:00
New-AzureRmVM/VMSS: DataDiskSizeInGb parameter
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/Extensions.cs b/src/ResourceManager/Common/Commands.Common.Strategies/Extensions.cs
@@ -21,6 +21,9 @@ namespace Microsoft.Azure.Commands.Common.Strategies
 {
     public static class Extensions
     {
+        public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T> v)
+            => v ?? Enumerable.Empty<T>();
+
         public static TValue GetOrNull<TKey, TValue>(
             this IDictionary<TKey, TValue> dictionary, TKey key)
             where TValue : class
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -270,7 +270,9 @@
     <Compile Include="Strategies\Client.cs" />
     <Compile Include="Strategies\ComputeRp\AvailabilitySetStrategy.cs" />
     <Compile Include="Strategies\ComputeRp\ComputeStrategy.cs" />
+    <Compile Include="Strategies\ComputeRp\DataDiskStrategy.cs" />
     <Compile Include="Strategies\ComputeRp\ImageAndOsType.cs" />
+    <Compile Include="Strategies\ComputeRp\ImageDataDiskStrategy.cs" />
     <Compile Include="Strategies\ComputeRp\ImageEx.cs" />
     <Compile Include="Strategies\ComputeRp\Images.cs" />
     <Compile Include="Strategies\ComputeRp\ApiEntityReferenceStrategy.cs" />
diff --git a/src/ResourceManager/Compute/Commands.Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs
@@ -114,6 +114,9 @@ public partial class NewAzureRmVmss : ComputeAutomationBaseCmdlet
         [Parameter(ParameterSetName = SimpleParameterSet, Mandatory = false)]
         public int[] NatBackendPort { get; set; }
 
+        [Parameter(ParameterSetName = SimpleParameterSet, Mandatory = false)]
+        public int[] DataDiskSizeInGb { get; set; }
+
         const int FirstPortRangeStart = 50000;
 
         sealed class Parameters : IParameters<VirtualMachineScaleSet>
@@ -218,7 +221,8 @@ public async Task<ResourceConfig<VirtualMachineScaleSet>> CreateConfigAsync()
                     instanceCount: _cmdlet.InstanceCount,
                     upgradeMode: _cmdlet.MyInvocation.BoundParameters.ContainsKey(nameof(UpgradePolicyMode))
                         ? _cmdlet.UpgradePolicyMode
-                        : (UpgradeMode?)null);
+                        : (UpgradeMode?)null,
+                    dataDisks: _cmdlet.DataDiskSizeInGb);
             }
         }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ComputeStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ComputeStrategy.cs
@@ -43,11 +43,13 @@ public static ResourceStrategy<TModel> Create<TModel, TOperations>(
 
         public static string GetConnectionString(
             this ImageAndOsType imageAndOsType, string fqdn, string user, string port = null)
-        {
-            var url = fqdn + (port == null ? string.Empty : ":" + port);
-            return imageAndOsType.OsType == OperatingSystemTypes.Windows
-                ? "mstsc /v:" + url
-                : "ssh " + (user == null ? string.Empty : user + "@") + url;
-        }
+            => imageAndOsType.OsType == OperatingSystemTypes.Windows
+                ? "mstsc /v:" 
+                    + fqdn 
+                    + (port == null ? string.Empty : ":" + port)
+                : "ssh " 
+                    + (user == null ? string.Empty : user + "@") 
+                    + fqdn 
+                    + (port == null ? string.Empty : " -p " + port);
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/DataDiskStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/DataDiskStrategy.cs
@@ -0,0 +1,60 @@
+﻿using Microsoft.Azure.Commands.Common.Strategies;
+using Microsoft.Azure.Management.Compute.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp
+{
+    static class DataDiskStrategy
+    {
+        static IList<T> CreateDataDisks<T>(
+            IEnumerable<int> imageDataDiskLuns,
+            IEnumerable<int> dataDiskSizes,
+            Func<DiskCreateOptionTypes, int, int?, T> createDataDisk)
+        {
+            if (dataDiskSizes == null)
+            {
+                return null;
+            }
+            imageDataDiskLuns = imageDataDiskLuns.EmptyIfNull();
+            var firstLun = imageDataDiskLuns
+                .Select(v => v + 1)
+                .Concat(new[] { 0 })
+                .Max();
+            return imageDataDiskLuns
+                .Select(lun => createDataDisk(DiskCreateOptionTypes.FromImage, lun, null))
+                .Concat(dataDiskSizes.Select((size, i) => createDataDisk(
+                    DiskCreateOptionTypes.Empty,
+                    i + firstLun,
+                    size)))
+                .ToList();
+        }
+
+        public static IList<DataDisk> CreateDataDisks(
+            IEnumerable<int> imageDataDiskLuns,
+            IEnumerable<int> dataDiskSizes)
+            => CreateDataDisks(
+                imageDataDiskLuns,
+                dataDiskSizes,
+                (createOption, lun, size) => new DataDisk
+                {
+                    CreateOption = createOption,
+                    Lun = lun,
+                    DiskSizeGB = size,
+                });
+
+        public static IList<VirtualMachineScaleSetDataDisk> CreateVmssDataDisks(
+            IEnumerable<int> dataDisks,
+            IEnumerable<int> dataDiskSizes)
+            => CreateDataDisks(
+                dataDisks,
+                dataDiskSizes,
+                (createOption, lun, size) => new VirtualMachineScaleSetDataDisk
+                {
+                    CreateOption = createOption,
+                    Lun = lun,
+                    DiskSizeGB = size,
+                });
+    }
+}
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageAndOsType.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageAndOsType.cs
@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Management.Compute.Models;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp
 {
@@ -22,10 +23,13 @@ sealed class ImageAndOsType
 
         public ImageReference Image { get; }
 
-        public ImageAndOsType(OperatingSystemTypes osType, ImageReference image)
+        public IList<int> DataDiskLuns { get; }
+
+        public ImageAndOsType(OperatingSystemTypes osType, ImageReference image, IList<int> dataDiskLuns)
         {
             OsType = osType;
             Image = image;
+            DataDiskLuns = dataDiskLuns;
         }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageDataDiskStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageDataDiskStrategy.cs
@@ -0,0 +1,19 @@
+﻿using Microsoft.Azure.Management.Compute.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp
+{
+    static class ImageDataDiskStrategy
+    {
+        static IList<int> GetLuns<T>(this IEnumerable<T> imageDataDisks, Func<T, int?> getLun)
+            => imageDataDisks.Select(idd => getLun(idd) ?? 0).ToList();
+
+        public static IList<int> GetLuns(this IEnumerable<ImageDataDisk> imageDataDisks)
+            => imageDataDisks.GetLuns(idd => idd.Lun);
+
+        public static IList<int> GetLuns(this IEnumerable<DataDiskImage> imageDataDisks)
+            => imageDataDisks.GetLuns(idd => idd.Lun);
+    }
+}
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageEx.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/ImageEx.cs
@@ -82,8 +82,11 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                 }
                 var imageModel = await compute.VirtualMachineImages.GetAsync(
                     location, image.Publisher, image.Offer, image.Sku, image.Version);
-                return new ImageAndOsType(imageModel.OsDiskImage.OperatingSystem, image);
-            }
+                return new ImageAndOsType(
+                    imageModel.OsDiskImage.OperatingSystem,
+                    image,
+                    imageModel.DataDiskImages.GetLuns());
+            } 
             else if (imageName.Contains("/"))
             {
                 var resourceId = ResourceId.TryParse(imageName);
@@ -99,22 +102,13 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                     throw new ArgumentException(Resources.ComputeMismatchSubscription);
                 }
 
-                var localImage = await compute.Images.GetAsync(
-                    resourceGroupName: resourceId.ResourceGroupName,
-                    imageName: resourceId.Name);
-
-                return new ImageAndOsType(
-                    localImage.StorageProfile.OsDisk.OsType,
-                    new ImageReference { Id = localImage.Id });
+                return await compute.GetImageAndOsTypeAsync(resourceId.ResourceGroupName, resourceId.Name);
             }
             else
             {
                 try
                 {
-                    var localImage = await compute.Images.GetAsync(resourceGroupName, imageName);
-                    return new ImageAndOsType(
-                        localImage.StorageProfile.OsDisk.OsType,
-                        new ImageReference { Id = localImage.Id });
+                    return await compute.GetImageAndOsTypeAsync(resourceGroupName, imageName);
                 }
                 catch
                 {
@@ -130,7 +124,8 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                             osAndMap.Key == "Windows" 
                                 ? OperatingSystemTypes.Windows
                                 : OperatingSystemTypes.Linux,
-                            nameAndImage.Value)))
+                            nameAndImage.Value,
+                            null)))
                     .FirstOrDefault();
 
                 if (result == null)
@@ -141,5 +136,15 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(
                 return result;
             }
         }
+
+        static async Task<ImageAndOsType> GetImageAndOsTypeAsync(
+            this ComputeManagementClient compute, string resourceGroupName, string name)
+        {
+            var localImage = await compute.Images.GetAsync(resourceGroupName, name);
+            return new ImageAndOsType(
+                localImage.StorageProfile.OsDisk.OsType,
+                new ImageReference { Id = localImage.Id },
+                localImage.StorageProfile.DataDisks.GetLuns());
+        }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/VirtualMachineScaleSetStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/VirtualMachineScaleSetStrategy.cs
@@ -47,7 +47,8 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
             string adminPassword,
             string vmSize,
             int instanceCount,
-            UpgradeMode? upgradeMode)
+            UpgradeMode? upgradeMode,
+            IEnumerable<int> dataDisks)
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
                 name: name,
@@ -82,7 +83,9 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
                         },
                         StorageProfile = new VirtualMachineScaleSetStorageProfile
                         {
-                            ImageReference = imageAndOsType?.Image
+                            ImageReference = imageAndOsType?.Image,
+                            DataDisks = DataDiskStrategy.CreateVmssDataDisks(
+                                imageAndOsType?.DataDiskLuns, dataDisks)
                         },
                         NetworkProfile = new VirtualMachineScaleSetNetworkProfile
                         {
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs
@@ -17,6 +17,7 @@
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using Microsoft.Azure.Commands.Common.Strategies;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp
 {
@@ -43,7 +44,8 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
             string adminUsername,
             string adminPassword,
             string size,
-            ResourceConfig<AvailabilitySet> availabilitySet)
+            ResourceConfig<AvailabilitySet> availabilitySet,
+            IEnumerable<int> dataDisks)
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
                 name: name,
@@ -70,7 +72,9 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
                     },
                     StorageProfile = new StorageProfile
                     {
-                        ImageReference = imageAndOsType?.Image
+                        ImageReference = imageAndOsType?.Image,
+                        DataDisks = DataDiskStrategy.CreateDataDisks(
+                            imageAndOsType?.DataDiskLuns, dataDisks)
                     },
                     AvailabilitySet = engine.GetReference(availabilitySet)
                 });
@@ -82,7 +86,8 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
             OperatingSystemTypes osType,
             ResourceConfig<Disk> disk,
             string size,
-            ResourceConfig<AvailabilitySet> availabilitySet)
+            ResourceConfig<AvailabilitySet> availabilitySet,
+            IEnumerable<int> dataDisks)
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
                 name: name,
@@ -107,7 +112,8 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
                             CreateOption = DiskCreateOptionTypes.Attach,
                             OsType = osType,
                             ManagedDisk = engine.GetReference(disk, StorageAccountTypes.PremiumLRS),
-                        }
+                        },
+                        DataDisks = DataDiskStrategy.CreateDataDisks(null, dataDisks)
                     },
                     AvailabilitySet = engine.GetReference(availabilitySet)
                 });
diff --git a/src/ResourceManager/Compute/Commands.Compute/Strategies/StrategyCmdlet.cs b/src/ResourceManager/Compute/Commands.Compute/Strategies/StrategyCmdlet.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Azure.Commands.Common.Strategies;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs
@@ -28,7 +28,6 @@
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
-using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Management.Storage;
@@ -211,6 +210,10 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
 
+        [Parameter(ParameterSetName = SimpleParameterSet, Mandatory = false)]
+        [Parameter(ParameterSetName = DiskFileParameterSet, Mandatory = false)]
+        public int[] DataDiskSizeInGb { get; set; }
+
         public override void ExecuteCmdlet()
         {
             switch (ParameterSetName)
@@ -293,7 +296,8 @@ public async Task<ResourceConfig<VirtualMachine>> CreateConfigAsync()
                         adminPassword:
                             new NetworkCredential(string.Empty, _cmdlet.Credential.Password).Password,
                         size: _cmdlet.Size,
-                        availabilitySet: availabilitySet);
+                        availabilitySet: availabilitySet,
+                        dataDisks: _cmdlet.DataDiskSizeInGb);
                 }
                 else
                 {
@@ -307,7 +311,8 @@ public async Task<ResourceConfig<VirtualMachine>> CreateConfigAsync()
                         osType: ImageAndOsType.OsType,
                         disk: disk,
                         size: _cmdlet.Size,
-                        availabilitySet: availabilitySet);
+                        availabilitySet: availabilitySet,
+                        dataDisks: _cmdlet.DataDiskSizeInGb);
                 }
             }
         }
@@ -341,6 +346,7 @@ async Task StrategyExecuteCmdletAsync(IAsyncCmdlet asyncCmdlet)
                 }
                 parameters.ImageAndOsType = new ImageAndOsType(
                     Linux ? OperatingSystemTypes.Linux : OperatingSystemTypes.Windows,
+                    null,
                     null);
                 var storageClient = AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(
                     DefaultProfile.DefaultContext,

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ namespace Microsoft.Azure.Commands.Common.Strategies`
`21`	`21`	`{`
`22`	`22`	`public static class Extensions`
`23`	`23`	`{`
	`24`	`+ public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T> v)`
	`25`	`+ => v ?? Enumerable.Empty<T>();`
	`26`	`+`
`24`	`27`	`public static TValue GetOrNull<TKey, TValue>(`
`25`	`28`	`this IDictionary<TKey, TValue> dictionary, TKey key)`
`26`	`29`	`where TValue : class`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`	`15`	`using Microsoft.Azure.Management.Compute.Models;`
	`16`	`+using System.Collections.Generic;`
`16`	`17`
`17`	`18`	`namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp`
`18`	`19`	`{`
`@@ -22,10 +23,13 @@ sealed class ImageAndOsType`
`22`	`23`
`23`	`24`	`public ImageReference Image { get; }`
`24`	`25`
`25`		`- public ImageAndOsType(OperatingSystemTypes osType, ImageReference image)`
	`26`	`+ public IList<int> DataDiskLuns { get; }`
	`27`	`+`
	`28`	`+ public ImageAndOsType(OperatingSystemTypes osType, ImageReference image, IList<int> dataDiskLuns)`
`26`	`29`	`{`
`27`	`30`	`OsType = osType;`
`28`	`31`	`Image = image;`
	`32`	`+ DataDiskLuns = dataDiskLuns;`
`29`	`33`	`}`
`30`	`34`	`}`
`31`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,11 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(`
`82`	`82`	`}`
`83`	`83`	`var imageModel = await compute.VirtualMachineImages.GetAsync(`
`84`	`84`	`location, image.Publisher, image.Offer, image.Sku, image.Version);`
`85`		`- return new ImageAndOsType(imageModel.OsDiskImage.OperatingSystem, image);`
`86`		`- }`
	`85`	`+ return new ImageAndOsType(`
	`86`	`+ imageModel.OsDiskImage.OperatingSystem,`
	`87`	`+ image,`
	`88`	`+ imageModel.DataDiskImages.GetLuns());`
	`89`	`+ }`
`87`	`90`	`else if (imageName.Contains("/"))`
`88`	`91`	`{`
`89`	`92`	`var resourceId = ResourceId.TryParse(imageName);`
`@@ -99,22 +102,13 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(`
`99`	`102`	`throw new ArgumentException(Resources.ComputeMismatchSubscription);`
`100`	`103`	`}`
`101`	`104`
`102`		`- var localImage = await compute.Images.GetAsync(`
`103`		`- resourceGroupName: resourceId.ResourceGroupName,`
`104`		`- imageName: resourceId.Name);`
`105`		`-`
`106`		`- return new ImageAndOsType(`
`107`		`- localImage.StorageProfile.OsDisk.OsType,`
`108`		`- new ImageReference { Id = localImage.Id });`
	`105`	`+ return await compute.GetImageAndOsTypeAsync(resourceId.ResourceGroupName, resourceId.Name);`
`109`	`106`	`}`
`110`	`107`	`else`
`111`	`108`	`{`
`112`	`109`	`try`
`113`	`110`	`{`
`114`		`- var localImage = await compute.Images.GetAsync(resourceGroupName, imageName);`
`115`		`- return new ImageAndOsType(`
`116`		`- localImage.StorageProfile.OsDisk.OsType,`
`117`		`- new ImageReference { Id = localImage.Id });`
	`111`	`+ return await compute.GetImageAndOsTypeAsync(resourceGroupName, imageName);`
`118`	`112`	`}`
`119`	`113`	`catch`
`120`	`114`	`{`
`@@ -130,7 +124,8 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(`
`130`	`124`	`osAndMap.Key == "Windows"`
`131`	`125`	`? OperatingSystemTypes.Windows`
`132`	`126`	`: OperatingSystemTypes.Linux,`
`133`		`- nameAndImage.Value)))`
	`127`	`+ nameAndImage.Value,`
	`128`	`+ null)))`
`134`	`129`	`.FirstOrDefault();`
`135`	`130`
`136`	`131`	`if (result == null)`
`@@ -141,5 +136,15 @@ public static async Task<ImageAndOsType> UpdateImageAndOsTypeAsync(`
`141`	`136`	`return result;`
`142`	`137`	`}`
`143`	`138`	`}`
	`139`	`+`
	`140`	`+ static async Task<ImageAndOsType> GetImageAndOsTypeAsync(`
	`141`	`+ this ComputeManagementClient compute, string resourceGroupName, string name)`
	`142`	`+ {`
	`143`	`+ var localImage = await compute.Images.GetAsync(resourceGroupName, name);`
	`144`	`+ return new ImageAndOsType(`
	`145`	`+ localImage.StorageProfile.OsDisk.OsType,`
	`146`	`+ new ImageReference { Id = localImage.Id },`
	`147`	`+ localImage.StorageProfile.DataDisks.GetLuns());`
	`148`	`+ }`
`144`	`149`	`}`
`145`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Microsoft.Azure.Commands.Common.Strategies;`
`2`		`-using System;`
`3`	`2`	`using System.Threading;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`