fixed merge conflicts

Author: balukambala

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscCompilationJobOutput.cs

@@ -38,7 +38,7 @@ public class GetAzureAutomationDscCompilationJobOutput : AzureAutomationBaseCmdl
         public Guid Id { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The stream type.")]
-        [ValidateSet("Warning", "Error", "Verbose", "Any")]
+        [ValidateSet("Warning", "Error", "Verbose", "Any", IgnoreCase = true)]
         public CompilationJobStreamType Stream { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Retrieves output created after this time")]

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscNode.cs

@@ -42,7 +42,7 @@ public class GetAzureAutomationDscNode : AzureAutomationBaseCmdlet
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByName, Mandatory = false, HelpMessage = "Filter dsc nodes based on their status.")]
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByNodeConfiguration, Mandatory = false, HelpMessage = "Filter dsc nodes based on their status.")]
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByAll, Mandatory = false, HelpMessage = "Filter dsc nodes based on their status.")]
-        [ValidateSet("Compliant", "NotCompliant", "Failed", "Pending", "Received", "Unresponsive")]
+        [ValidateSet("Compliant", "NotCompliant", "Failed", "Pending", "Received", "Unresponsive", IgnoreCase = true)]
         public DscNodeStatus Status { get; set; } 
 
         /// <summary>

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscNodeConfiguration.cs

@@ -48,7 +48,7 @@ public class GetAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdlet
         /// </summary> 
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByConfigurationName, Mandatory = false, HelpMessage = "Filter node configurations by RollupStatus.")]
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByAll, Mandatory = false, HelpMessage = "Filter node configurations by RollupStatus.")]
-        [ValidateSet("Good", "Bad")]
+        [ValidateSet("Good", "Bad", IgnoreCase = true)]
         public string RollupStatus { get; set; }
 
         /// <summary>

src/ResourceManager/Automation/Commands.Automation/Cmdlet/RegisterAzureAutomationDscNode.cs

@@ -67,6 +67,16 @@ public class RegisterAzureAutomationDscNode : AzureAutomationBaseCmdlet
         /// </summary>
         private string configurationMode = "ApplyAndMonitor";
 
+        /// <summary>
+        /// Default value for AzureVMResourceGroup
+        /// </summary>
+        private string azureVmResourceGroup = String.Empty;
+
+        /// <summary>
+        /// Default value for AzureVmLocation
+        /// </summary>
+        private string azureVmLocation = String.Empty;
+
         /// <summary> 
         /// Gets or sets the VM name.
         /// </summary> 
@@ -88,7 +98,7 @@ public string NodeConfigurationName
         /// Gets or sets the configuration mode
         /// </summary> 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "DSC configuration mode.")]
-        [ValidateSet("ApplyAndMonitor", "ApplyAndAutocorrect", "ApplyOnly")]
+        [ValidateSet("ApplyAndMonitor", "ApplyAndAutocorrect", "ApplyOnly", IgnoreCase = true)]
         public string ConfigurationMode
         {
             get { return this.configurationMode; }
@@ -111,10 +121,10 @@ public int ConfigurationModeFrequencyMins
         /// </summary> 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Represents the frequency (in minutes) at which the Local Configuration Manager contacts the Azure Automation DSC pull server to download the latest node configuration.")]
         [ValidateRange(30, 44640)]
-        public int RefreshFrequencyMins
+        public int RefreshFrequencyMins 
         {
             get { return this.refreshFrequencyMins; }
-            set { this.refreshFrequencyMins = value; }
+            set { this.refreshFrequencyMins = value; } 
         }
 
         /// <summary> 
@@ -131,7 +141,7 @@ public bool RebootNodeIfNeeded
         /// Gets or sets the action to perform post reboot.
         /// </summary> 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Action to perform after a reboot.")]
-        [ValidateSet("ContinueConfiguration", "StopConfiguration")]
+        [ValidateSet("ContinueConfiguration", "StopConfiguration", IgnoreCase = true)]
         public string ActionAfterReboot
         {
             get { return this.actionAfterReboot; }
@@ -149,13 +159,33 @@ public bool AllowModuleOverwrite
             set { this.overwriteModulesFlag = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the azure VM resource group name.
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The Azure VM resource group name.")]
+        public string AzureVMResourceGroup 
+        {
+            get { return this.azureVmResourceGroup; }
+            set { this.azureVmResourceGroup = value; } 
+        }
+
+        /// <summary>
+        /// Gets or sets the azure VM location.
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The Azure VM location.")]
+        public string AzureVMLocation
+        {
+            get { return this.azureVmLocation; }
+            set { this.azureVmLocation = value; }
+        }
+
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            this.AutomationClient.RegisterDscNode(this.ResourceGroupName, this.AutomationAccountName,this.AzureVMName, this.NodeConfigurationName, this.ConfigurationMode, this.ConfigurationModeFrequencyMins, this.RefreshFrequencyMins, this.RebootNodeIfNeeded, this.ActionAfterReboot, this.AllowModuleOverwrite);
+            this.AutomationClient.RegisterDscNode(this.ResourceGroupName, this.AutomationAccountName, this.AzureVMName, this.NodeConfigurationName, this.ConfigurationMode, this.ConfigurationModeFrequencyMins, this.RefreshFrequencyMins, this.RebootNodeIfNeeded, this.ActionAfterReboot, this.AllowModuleOverwrite, this.AzureVMResourceGroup, this.AzureVMLocation);
         }
     }
 }

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClientDSC.cs

@@ -739,11 +739,25 @@ public void RegisterDscNode(string resourceGroupName,
                                             int refreshFrequencyMins,
                                             bool rebootFlag,
                                             string actionAfterReboot,
-                                            bool moduleOverwriteFlag)
+                                            bool moduleOverwriteFlag,
+                                            string azureVmResourceGroup,
+                                            string azureVmLocation)
         {
             // get the location from AutomationAccountName. This will validate the account too
             string location = this.GetAutomationAccount(resourceGroupName, automationAccountName).Location;
 
+            // if vm location is specified, use that
+            if (!String.IsNullOrEmpty(azureVmLocation))
+            {
+                location = azureVmLocation;
+            }
+
+            // if azureVmResourceGroup not specified, use the resource group
+            if (String.IsNullOrEmpty(azureVmResourceGroup))
+            {
+                azureVmResourceGroup = resourceGroupName;
+            }
+
             string deploymentName = System.DateTimeOffset.Now.LocalDateTime.ToString("yyyyMMddhhmmss");
 
             // get the endpoint and keys
@@ -772,7 +786,7 @@ public void RegisterDscNode(string resourceGroupName,
             {
                 Command invokeCommand = new Command("New-AzureResourceGroupDeployment");
                 invokeCommand.Parameters.Add("Name", deploymentName);
-                invokeCommand.Parameters.Add("ResourceGroupName", resourceGroupName);
+                invokeCommand.Parameters.Add("ResourceGroupName", azureVmResourceGroup);
                 invokeCommand.Parameters.Add("TemplateParameterObject", templateParameters);
                 invokeCommand.Parameters.Add("TemplateFile", Constants.TemplateFile);
 

src/ResourceManager/Automation/Commands.Automation/Common/IAutomationClient.cs

@@ -101,7 +101,7 @@ IEnumerable<DscNode> ListDscNodesByConfiguration(
 
         void DeleteDscNode(string resourceGroupName, string automationAccountName, Guid nodeId);
 
-        void RegisterDscNode(string resourceGroupName, string automationAccountName, string azureVMName, string nodeconfigurationName, string configurationMode, int configurationModeFrequencyMins, int refreshFrequencyMins, bool rebootFlag, string actionAfterReboot, bool moduleOverwriteFlag);
+        void RegisterDscNode(string resourceGroupName, string automationAccountName, string azureVMName, string nodeconfigurationName, string configurationMode, int configurationModeFrequencyMins, int refreshFrequencyMins, bool rebootFlag, string actionAfterReboot, bool moduleOverwriteFlag, string azureVmResourceGroup, string azureVmLocation);
 
         #endregion
 

src/ResourceManager/Automation/Commands.Automation/Properties/Resources.Designer.cs

@@ -322,7 +322,7 @@
     <comment>Automation</comment>
   </data>
   <data name="RemoveDscNodeWarning" xml:space="preserve">
-    <value>Are you sure you want to unregister Dsc node from Azure Automation?</value>
+    <value>Are you sure you want to unregister this node from Azure Automation DSC?</value>
     <comment>Automation</comment>
   </data>
   <data name="RemoveDscNodeDescription" xml:space="preserve">