Update param. sets for OS/Disk config cmdlets

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/SetAzureVMImageDataDiskConfig.cs

@@ -21,12 +21,15 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
 {
     [Cmdlet(
         VerbsCommon.Set,
-        AzureDataDiskConfigurationNoun),
+        AzureDataDiskConfigurationNoun,
+        DefaultParameterSetName = UpdateAzureVMImageParamSet),
     OutputType(
         typeof(VirtualMachineImageDiskConfigSet))]
     public class SetAzureVMImageDataDiskConfig : PSCmdlet
     {
         protected const string AzureDataDiskConfigurationNoun = "AzureVMImageDataDiskConfig";
+        protected const string UpdateAzureVMImageParamSet = "UpdateAzureVMImageParamSet";
+        protected const string AddAzureVMImageParamSet = "AddAzureVMImageParamSet";
 
         [Parameter(
             Position = 0,
@@ -38,6 +41,7 @@ public class SetAzureVMImageDataDiskConfig : PSCmdlet
         public VirtualMachineImageDiskConfigSet DiskConfig { get; set; }
 
         [Parameter(
+            ParameterSetName = UpdateAzureVMImageParamSet,
             Position = 1,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
@@ -46,38 +50,45 @@ public class SetAzureVMImageDataDiskConfig : PSCmdlet
         public string DataDiskName { get; set; }
 
         [Parameter(
+            ParameterSetName = UpdateAzureVMImageParamSet,
             Position = 2,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Lun")]
+        [Parameter(
+            ParameterSetName = AddAzureVMImageParamSet,
+            Position = 1,
+            Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Lun")]
         [ValidateNotNullOrEmpty]
         public int Lun { get; set; }
 
         [Parameter(
+            ParameterSetName = UpdateAzureVMImageParamSet,
             Position = 3,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Controls the platform caching behavior of the data disk blob for read efficiency.")]
+        [Parameter(
+            ParameterSetName = AddAzureVMImageParamSet,
+            Position = 2,
+            Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Controls the platform caching behavior of the data disk blob for read efficiency.")]
         [ValidateNotNullOrEmpty]
         [ValidateSet("ReadOnly", "ReadWrite", "None", IgnoreCase = true)]
         public string HostCaching { get; set; }
 
         [Parameter(
-            Position = 4,
-            Mandatory = false,
+            ParameterSetName = AddAzureVMImageParamSet,
+            Position = 3,
+            Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The media link.")]
         [ValidateNotNullOrEmpty]
         public Uri MediaLink { get; set; }
 
-        [Parameter(
-            Position = 5,
-            Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The logical disk size in GB.")]
-        [ValidateNotNullOrEmpty]
-        public int LogicalDiskSizeInGB { get; set; }
-
         protected override void ProcessRecord()
         {
             ServiceManagementProfile.Initialize();
@@ -100,7 +111,6 @@ protected override void ProcessRecord()
             diskConfig.HostCaching = this.HostCaching;
             diskConfig.Lun = this.Lun;
             diskConfig.MediaLink  = this.MediaLink;
-            diskConfig.LogicalDiskSizeInGB = this.LogicalDiskSizeInGB;
 
             WriteObject(DiskConfig);
         }

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/SetAzureVMImageOSDiskConfig.cs

@@ -12,20 +12,25 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Management.Automation;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
-using System;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
 {
     [Cmdlet(
         VerbsCommon.Set,
-        AzureOSDiskConfigurationNoun),
+        AzureOSDiskConfigurationNoun,
+        DefaultParameterSetName = UpdateAzureVMImageParamSet),
     OutputType(
         typeof(VirtualMachineImageDiskConfigSet))]
     public class SetAzureVMImageOSDiskConfig : PSCmdlet
     {
         protected const string AzureOSDiskConfigurationNoun = "AzureVMImageOSDiskConfig";
+        protected const string UpdateAzureVMImageParamSet = "UpdateAzureVMImageParamSet";
+        protected const string AddAzureVMImageParamSet = "AddAzureVMImageParamSet";
+        protected const string GeneralizedStr = "Generalized";
+        protected const string SpecializedStr = "Specialized";
 
         [Parameter(
             Position = 0,
@@ -45,37 +50,34 @@ public class SetAzureVMImageOSDiskConfig : PSCmdlet
         public string HostCaching { get; set; }
 
         [Parameter(
+            ParameterSetName = AddAzureVMImageParamSet,
+            Mandatory = true,
             Position = 2,
-            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The media link.")]
         [ValidateNotNullOrEmpty]
         public Uri MediaLink { get; set; }
 
         [Parameter(
+            ParameterSetName = AddAzureVMImageParamSet,
+            Mandatory = true,
             Position = 3,
-            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The logical disk size in GB.")]
+            HelpMessage = "The OS state.")]
         [ValidateNotNullOrEmpty]
+        [ValidateSet(GeneralizedStr, SpecializedStr, IgnoreCase = true)]
         public string OSState { get; set; }
 
         [Parameter(
+            ParameterSetName = AddAzureVMImageParamSet,
+            Mandatory = true,
             Position = 4,
-            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The OS.")]
+            HelpMessage = "The OS type.")]
         [ValidateNotNullOrEmpty]
+        [ValidateSet("Windows", "Linux", IgnoreCase = true)]
         public string OS { get; set; }
 
-        [Parameter(
-            Position = 5,
-            Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The logical disk size in GB.")]
-        [ValidateNotNullOrEmpty]
-        public int LogicalDiskSizeInGB { get; set; }
-
         protected override void ProcessRecord()
         {
             ServiceManagementProfile.Initialize();
@@ -87,7 +89,6 @@ protected override void ProcessRecord()
 
             DiskConfig.OSDiskConfiguration.HostCaching = this.HostCaching;
             DiskConfig.OSDiskConfiguration.MediaLink = this.MediaLink;
-            DiskConfig.OSDiskConfiguration.LogicalDiskSizeInGB = this.LogicalDiskSizeInGB;
             DiskConfig.OSDiskConfiguration.OS = this.OS;
             DiskConfig.OSDiskConfiguration.OSState = this.OSState;