updated job and joboutput to use id instead of name

Author: kiranisaac

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationJobOutput.cs

@@ -25,19 +25,20 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// Gets azure automation variables for a given account.
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureAutomationJobOutput")]
-    [OutputType(typeof(Variable))]
+    [OutputType(typeof(JobStream))]
     public class GetAzureAutomationJobOutput : AzureAutomationBaseCmdlet
     {
         /// <summary>
         /// Gets or sets the job id
         /// </summary>
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The job id")]
+        [Alias("JobId")]
+        [Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, HelpMessage = "The job name or Id")]
         public Guid Id { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The stream type")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The stream type. Defaults to Any.")]
         public string Stream { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The start time filter for job output")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Retrieves output created after this time")]
         public DateTime? StartTime { get; set; }
 
         /// <summary>

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/NewAzureAutomationVariable.cs

@@ -12,11 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
 using System.Management.Automation;
 using System.Security.Permissions;
-using Microsoft.Azure.Commands.Automation.Common;
 using Microsoft.Azure.Commands.Automation.Model;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet

src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -146,7 +146,7 @@ public IEnumerable<JobStream> GetJobStream(string automationAccountName, Guid jo
 
             if (time.HasValue)
             {
-                listParams.Time = time.Value.ToUniversalTime().ToString();
+                listParams.Time = this.FormatDateTime(time.Value);
             }
 
             if (streamType != null)
@@ -155,8 +155,7 @@ public IEnumerable<JobStream> GetJobStream(string automationAccountName, Guid jo
             }
 
             var jobStreams = this.automationManagementClient.JobStreams.List(automationAccountName, jobId, listParams).JobStreams;
-
-            return jobStreams.Select(this.CreateJobStreamFromJobStreamModel);
+            return jobStreams.Select( stream => this.CreateJobStreamFromJobStreamModel(stream, automationAccountName, jobId)).ToList();
         }
 
         public Variable CreateVariable(string automationAccountName, Variable variable)
@@ -314,7 +313,7 @@ public IEnumerable<Variable> ListVariables(string automationAccountName)
                        response, response.Variables);
                });
 
-            var result = variables.Select((variable, autoamtionAccountName) => this.CreateVariableFromVariableModel(variable, automationAccountName)).ToList();
+            var result = variables.Select(variable => this.CreateVariableFromVariableModel(variable, automationAccountName)).ToList();
 
             IList<AutomationManagement.Models.EncryptedVariable> encryptedVariables = AutomationManagementClient.ContinuationTokenHandler(
                skipToken =>
@@ -325,7 +324,7 @@ public IEnumerable<Variable> ListVariables(string automationAccountName)
                        response, response.EncryptedVariables);
                });
 
-            result.AddRange(encryptedVariables.Select((variable, autoamtionAccountName) => this.CreateVariableFromVariableModel(variable, automationAccountName)).ToList());
+            result.AddRange(encryptedVariables.Select(variable => this.CreateVariableFromVariableModel(variable, automationAccountName)).ToList());
 
             return result;
         }
@@ -344,10 +343,12 @@ public IEnumerable<Runbook> ListRunbooks(string automationAccountName)
         }
 
         #region Private Methods
-        private JobStream CreateJobStreamFromJobStreamModel(AutomationManagement.Models.JobStream jobStream)
+        private JobStream CreateJobStreamFromJobStreamModel(AutomationManagement.Models.JobStream jobStream, string automationAccountName, Guid jobId)
         {
             Requires.Argument("jobStream", jobStream).NotNull();
-            return new JobStream(jobStream);
+            Requires.Argument("automationAccountName", automationAccountName).NotNull();
+            Requires.Argument("jobId", jobId).NotNull();
+            return new JobStream(jobStream, automationAccountName, jobId);
         }
 
         private Variable CreateVariableFromVariableModel(AutomationManagement.Models.Variable variable, string automationAccountName)
@@ -607,9 +608,6 @@ public void DeleteModule(string automationAccountName, string name)
             }
         }
 
-
-
-
         public Job GetJob(string automationAccountName, Guid Id)
         {
             var job = this.automationManagementClient.Jobs.Get(automationAccountName, Id).Job;

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

@@ -24,7 +24,7 @@ public interface IAutomationClient
     {
         AzureSubscription Subscription { get; }
 
-        IEnumerable<JobStream> GetJobStream(string automationAccountname, Guid jobId, DateTime? time, string streamType);
+        IEnumerable<JobStream> GetJobStream(string automationAccountname, Guid jonId, DateTime? time, string streamType);
 
         Variable GetVariable(string automationAccountName, string variableName);
 

src/ServiceManagement/Automation/Commands.Automation/Model/Job.cs

@@ -39,11 +39,10 @@ public Job(string accountName, Azure.Management.Automation.Models.Job job)
             Requires.Argument("accountName", accountName).NotNull();
 
             this.AutomationAccountName = accountName;
-            this.Name = job.Name;
             this.Location = job.Location;
             this.Type = job.Type;
             this.Tags = job.Tags ?? new Dictionary<string, string>();
-            this.Id = job.Id;
+            this.Id = Guid.Parse(job.Name);
 
             if (job.Properties == null) return;
 
@@ -72,14 +71,9 @@ public Job()
         public string AutomationAccountName { get; set; }
 
         /// <summary>
-        /// Gets or sets the tags.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name.
+        /// Gets or sets the job id.
         /// </summary>
-        public string Name { get; set; }
+        public Guid Id { get; set; }
 
         /// <summary>
         /// Gets or sets the location.

src/ServiceManagement/Automation/Commands.Automation/Model/JobStream.cs

@@ -32,14 +32,16 @@ public class JobStream
         /// </param>
         /// <exception cref="System.ArgumentException">
         /// </exception>
-        public JobStream(AutomationManagement.Models.JobStream jobStream)
+        public JobStream(AutomationManagement.Models.JobStream jobStream, string automationAccountName, Guid jobId )
         {
             Requires.Argument("jobStream", jobStream).NotNull();
 
             this.StreamId = jobStream.Properties.StreamId;
-            this.StreamType = jobStream.Properties.StreamType;
-            this.Summary = jobStream.Properties.Summary;
-            this.Time = jobStream.Properties.Time.ToLocalTime();
+            this.Type = jobStream.Properties.StreamType;
+            this.Text = jobStream.Properties.Summary;
+            this.Time = jobStream.Properties.Time;
+            this.AutomationAccountName = automationAccountName;
+            this.Id = jobId;
         }
 
         /// <summary>
@@ -49,6 +51,16 @@ public JobStream()
         {
         }
 
+        /// <summary>
+        /// Gets or sets the automation account name.
+        /// </summary>
+        public string AutomationAccountName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Job Id.
+        /// </summary>
+        public Guid Id { get; set; }
+
         /// <summary>
         /// Gets or sets the stream id
         /// </summary>
@@ -60,13 +72,13 @@ public JobStream()
         public DateTimeOffset Time { get; set; }
 
         /// <summary>
-        /// Gets or sets the stream summary.
+        /// Gets or sets the stream text.
         /// </summary>
-        public string Summary { get; set; }
+        public string Text { get; set; }
 
         /// <summary>
         /// Gets or sets the stream Type.
         /// </summary>
-        public string StreamType { get; set; }
+        public string Type { get; set; }
     }
 }

src/ServiceManagement/Automation/Commands.Automation/Model/Variable.cs

@@ -104,7 +104,7 @@ public Variable()
         public bool Encrypted { get; set; }
 
         /// <summary>
-        /// Gets or sets the automaiton account name.
+        /// Gets or sets the automation account name.
         /// </summary>
         public string AutomationAccountName { get; set; }
     }