Add ExplicitIdentityParameterSet for IdentityType and Identity

hyonholee · hyonholee · commit 108de2b4f8fb · 2018-01-31T20:43:33.000-08:00
diff --git a/src/ResourceManager/Compute/ChangeLog.md b/src/ResourceManager/Compute/ChangeLog.md
@@ -19,6 +19,10 @@
 -->
 ## Current Release
 * Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
+* User assigned identity support for VM and VM scale set
+- IdentityType and IdentityId parameters are added to New-AzureRmVMConfig, New-AzureRmVmssConfig, Update-AzureRmVM and Update-AzureRmVmss
+* Added EnableIPForwarding parameter to Add-AzureRmVmssNetworkInterfaceConfig
+* Added Priority parameter to New-AzureRmVmssConfig
 
 ## Version 4.2.0
 * Added simplified parameter set to New-AzureRmVmss, which creates a Virtual Machine Scale Set and all required resources using smart defaults
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs
@@ -162,14 +162,14 @@ public partial class NewAzureRmVmssConfigCommand : Microsoft.Azure.Commands.Reso
         public string Priority { get; set; }
 
         [Parameter(
-            Mandatory = false,
-            ParameterSetName = "DefaultParameterSet",
+            Mandatory = true,
+            ParameterSetName = "ExplicitIdentityParameterSet",
             ValueFromPipelineByPropertyName = true)]
         public ResourceIdentityType? IdentityType { get; set; }
 
         [Parameter(
             Mandatory = false,
-            ParameterSetName = "DefaultParameterSet",
+            ParameterSetName = "ExplicitIdentityParameterSet",
             ValueFromPipelineByPropertyName = true)]
         public string[] IdentityId { get; set; }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs
@@ -149,7 +149,6 @@ public override void ExecuteCmdlet()
         }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Position = 1,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
@@ -159,7 +158,6 @@ public override void ExecuteCmdlet()
         public string ResourceGroupName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Position = 2,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
@@ -171,7 +169,6 @@ public override void ExecuteCmdlet()
         public VirtualMachineScaleSetUpdate VirtualMachineScaleSetUpdate { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Position = 3,
             Mandatory = false,
             ValueFromPipelineByPropertyName = false,
@@ -180,211 +177,178 @@ public override void ExecuteCmdlet()
         public PSVirtualMachineScaleSet VirtualMachineScaleSet { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageReferenceSku { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? EnableAutomaticUpdate { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string[] IdentityId { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public StorageAccountTypes? ManagedDiskStorageAccountType { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string PlanPublisher { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? ProvisionVMAgent { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? BootDiagnosticsEnabled { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? Overprovision { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public int? MaxBatchInstancePercent { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string TimeZone { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string BootDiagnosticsStorageUri { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? AutomaticOSUpgrade { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? SinglePlacementGroup { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string CustomData { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public UpgradeMode? UpgradePolicyMode { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageReferenceId { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public bool? DisablePasswordAuthentication { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public Hashtable Tag { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string PlanName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public int? MaxUnhealthyUpgradedInstancePercent { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageReferencePublisher { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string PlanProduct { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageUri { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string SkuTier { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string[] VhdContainer { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string LicenseType { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
-            Mandatory = false)]
+            ParameterSetName = "ExplicitIdentityParameterSet",
+            Mandatory = true)]
         [ValidateNotNullOrEmpty]
         public ResourceIdentityType? IdentityType { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
+            ParameterSetName = "ExplicitIdentityParameterSet",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string SkuName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string PlanPromotionCode { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public int? MaxUnhealthyInstancePercent { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public int? SkuCapacity { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageReferenceOffer { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string PauseTimeBetweenBatches { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public CachingTypes? OsDiskCaching { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ImageReferenceVersion { get; set; }
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs
@@ -61,14 +61,15 @@ public class NewAzureVMConfigCommand : Microsoft.Azure.Commands.ResourceManager.
 
         [Parameter(
             Position = 4,
-            ParameterSetName = "DefaultParameterSet",
+            Mandatory = true,
+            ParameterSetName = "ExplicitIdentityParameterSet",
             ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
         public ResourceIdentityType? IdentityType { get; set; }
 
         [Parameter(
             Mandatory = false,
-            ParameterSetName = "DefaultParameterSet",
+            ParameterSetName = "ExplicitIdentityParameterSet",
             ValueFromPipelineByPropertyName = true)]
         public string[] IdentityId { get; set; }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs
@@ -32,6 +32,7 @@ public class UpdateAzureVMCommand : VirtualMachineBaseCmdlet
         private const string ResourceGroupNameParameterSet = "ResourceGroupNameParameterSetName";
         private const string IdParameterSet = "IdParameterSetName";
         private const string AssignIdentityParameterSet = "AssignIdentityParameterSet";
+        private const string ExplicitIdentityParameterSet = "ExplicitIdentityParameterSet";
 
         [Parameter(
            Mandatory = true,
@@ -45,6 +46,12 @@ public class UpdateAzureVMCommand : VirtualMachineBaseCmdlet
            ParameterSetName = AssignIdentityParameterSet,
            ValueFromPipelineByPropertyName = true,
            HelpMessage = "The resource group name.")]
+        [Parameter(
+           Mandatory = true,
+           Position = 0,
+           ParameterSetName = ExplicitIdentityParameterSet,
+           ValueFromPipelineByPropertyName = true,
+           HelpMessage = "The resource group name.")]
         [ResourceGroupCompleter()]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
@@ -68,23 +75,15 @@ public class UpdateAzureVMCommand : VirtualMachineBaseCmdlet
         public Hashtable Tag { get; set; }
 
         [Parameter(
-            Mandatory = false,
-            ParameterSetName = ResourceGroupNameParameterSet,
-            ValueFromPipelineByPropertyName = false)]
-        [Parameter(
-            Mandatory = false,
-            ParameterSetName = IdParameterSet,
+            Mandatory = true,
+            ParameterSetName = ExplicitIdentityParameterSet,
             ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
         public ResourceIdentityType? IdentityType { get; set; }
 
         [Parameter(
             Mandatory = false,
-            ParameterSetName = ResourceGroupNameParameterSet,
-            ValueFromPipelineByPropertyName = false)]
-        [Parameter(
-            Mandatory = false,
-            ParameterSetName = IdParameterSet,
+            ParameterSetName = ExplicitIdentityParameterSet,
             ValueFromPipelineByPropertyName = false)]
         public string[] IdentityId { get; set; }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmVMConfig.md b/src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmVMConfig.md
@@ -16,7 +16,14 @@ Creates a configurable virtual machine object.
 ### DefaultParameterSet (Default)
 ```
 New-AzureRmVMConfig [-VMName] <String> [-VMSize] <String> [[-AvailabilitySetId] <String>]
- [[-LicenseType] <String>] [[-IdentityType] <ResourceIdentityType>] [-IdentityId <String[]>] [-Zone <String[]>]
+ [[-LicenseType] <String>] [-Zone <String[]>] [-Tags <Hashtable>] [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
+```
+
+### ExplicitIdentityParameterSet
+```
+New-AzureRmVMConfig [-VMName] <String> [-VMSize] <String> [[-AvailabilitySetId] <String>]
+ [[-LicenseType] <String>] [-IdentityType] <ResourceIdentityType> [-IdentityId <String[]>] [-Zone <String[]>]
  [-Tags <Hashtable>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
@@ -100,7 +107,7 @@ The user identity references will be ARM resource ids in the form: '/subscriptio
 
 ```yaml
 Type: String[]
-Parameter Sets: DefaultParameterSet
+Parameter Sets: ExplicitIdentityParameterSet
 Aliases: 
 
 Required: False
@@ -115,11 +122,11 @@ The identity of the virtual machine, if configured.
 
 ```yaml
 Type: ResourceIdentityType
-Parameter Sets: DefaultParameterSet
+Parameter Sets: ExplicitIdentityParameterSet
 Aliases: 
 Accepted values: SystemAssigned
 
-Required: False
+Required: True
 Position: 4
 Default value: None
 Accept pipeline input: False
diff --git a/src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmVmssConfig.md b/src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmVmssConfig.md
diff --git a/src/ResourceManager/Compute/Commands.Compute/help/Update-AzureRmVM.md b/src/ResourceManager/Compute/Commands.Compute/help/Update-AzureRmVM.md
diff --git a/src/ResourceManager/Compute/Commands.Compute/help/Update-AzureRmVmss.md b/src/ResourceManager/Compute/Commands.Compute/help/Update-AzureRmVmss.md
