Merge branch 'dev' of https://github.com/AzureAutomationTeam/azure-powershell into dev

Author: psap

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

@@ -62,6 +62,13 @@ public IAutomationClient AutomationClient
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The automation account name.")]
+        [ValidateNotNullOrEmpty]
+        public string AutomationAccountName { get; set; }
+
         protected virtual void AutomationExecuteCmdlet()
         {
             // Do nothing.
@@ -72,6 +79,7 @@ public override void ExecuteCmdlet()
             try
             {
                 Requires.Argument("ResourceGroupName", this.ResourceGroupName).NotNull();
+                Requires.Argument("AutomationAccountName", this.AutomationAccountName).NotNull();
                 this.AutomationExecuteCmdlet();
             }
             catch (CloudException cloudException)

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

@@ -26,8 +26,36 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureAutomationAccount", DefaultParameterSetName = AutomationCmdletParameterSets.ByAll)]
     [OutputType(typeof(AutomationAccount))]
-    public class GetAzureAutomationAccount : AzureAutomationBaseCmdlet
+    public class GetAzureAutomationAccount : AzurePSCmdlet
     {
+        /// <summary>
+        /// The automation client.
+        /// </summary>
+        private IAutomationClient automationClient;
+
+        /// <summary>
+        /// Gets or sets the automation client base.
+        /// </summary>
+        public IAutomationClient AutomationClient
+        {
+            get
+            {
+                return this.automationClient = this.automationClient ?? new AutomationClient(Profile, Profile.Context.Subscription);
+            }
+
+            set
+            {
+                this.automationClient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
         /// <summary>
         /// Gets or sets the automation account name.
         /// </summary>
@@ -55,7 +83,7 @@ public override void ExecuteCmdlet()
                 ret = this.AutomationClient.ListAutomationAccounts(this.ResourceGroupName);
             }
 
-            this.GenerateCmdletOutput(ret);
+            this.WriteObject(ret, true);
         }
     }
 }

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

@@ -25,10 +25,38 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// <summary>
     /// Creates azure automation accounts based on automation account name and location.
     /// </summary>
-    [Cmdlet(VerbsCommon.New, "AzureAutomationAccount", DefaultParameterSetName = AutomationCmdletParameterSets.ByName)]
+    [Cmdlet(VerbsCommon.New, "AzureAutomationAccount")]
     [OutputType(typeof(AutomationAccount))]
-    public class NewAzureAutomationAccount : AzureAutomationBaseCmdlet
+    public class NewAzureAutomationAccount : AzurePSCmdlet
     {
+        /// <summary>
+        /// The automation client.
+        /// </summary>
+        private IAutomationClient automationClient;
+
+        /// <summary>
+        /// Gets or sets the automation client base.
+        /// </summary>
+        public IAutomationClient AutomationClient
+        {
+            get
+            {
+                return this.automationClient = this.automationClient ?? new AutomationClient(Profile, Profile.Context.Subscription);
+            }
+
+            set
+            {
+                this.automationClient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
         /// <summary>
         /// Gets or sets the automation account name.
         /// </summary>

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

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Commands.Automation.Properties;
 using Microsoft.Azure.Commands.Automation.Common;
 using Microsoft.Azure.Commands.Automation.Model;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet
 {
@@ -26,8 +27,36 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// </summary>
     [Cmdlet(VerbsCommon.Remove, "AzureAutomationAccount")]
     [OutputType(typeof(AutomationAccount))]
-    public class RemoveAzureAutomationAccount : AzureAutomationBaseCmdlet
+    public class RemoveAzureAutomationAccount : AzurePSCmdlet
     {
+        /// <summary>
+        /// The automation client.
+        /// </summary>
+        private IAutomationClient automationClient;
+
+        /// <summary>
+        /// Gets or sets the automation client base.
+        /// </summary>
+        public IAutomationClient AutomationClient
+        {
+            get
+            {
+                return this.automationClient = this.automationClient ?? new AutomationClient(Profile, Profile.Context.Subscription);
+            }
+
+            set
+            {
+                this.automationClient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
         /// <summary>
         /// Gets or sets the automation account name.
         /// </summary>

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

@@ -25,10 +25,38 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// <summary>
     /// Creates azure automation accounts based on automation account name and location.
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, "AzureAutomationAccount", DefaultParameterSetName = AutomationCmdletParameterSets.ByName)]
+    [Cmdlet(VerbsCommon.Set, "AzureAutomationAccount")]
     [OutputType(typeof(AutomationAccount))]
-    public class SetAzureAutomationAccount : AzureAutomationBaseCmdlet
+    public class SetAzureAutomationAccount : AzurePSCmdlet
     {
+        /// <summary>
+        /// The automation client.
+        /// </summary>
+        private IAutomationClient automationClient;
+
+        /// <summary>
+        /// Gets or sets the automation client base.
+        /// </summary>
+        public IAutomationClient AutomationClient
+        {
+            get
+            {
+                return this.automationClient = this.automationClient ?? new AutomationClient(Profile, Profile.Context.Subscription);
+            }
+
+            set
+            {
+                this.automationClient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
         /// <summary>
         /// Gets or sets the automation account name.
         /// </summary>