renaming some parameters of jobschedule cmdlets

Author: elvg

src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

@@ -97,7 +97,7 @@
     <Compile Include="UnitTests\GetAzureAutomationScheduledRunbookTest.cs" />
     <Compile Include="UnitTests\NewAzureAutomationRunbookTest.cs" />
     <Compile Include="UnitTests\PublishAzureAutomationRunbookTest.cs" />
-    <Compile Include="UnitTests\RegisterAzureAutomationScheduledRunbook.cs" />
+    <Compile Include="UnitTests\RegisterAzureAutomationScheduledRunbookTest.cs" />
     <Compile Include="UnitTests\RemoveAzureAutomationRunbookTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationRunbookDefinitionTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationRunbookTest.cs" />
@@ -137,7 +137,7 @@
   <ItemGroup>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />
-    <Compile Include="UnitTests\UnregisterAzureAutomationScheduledRunbook.cs" />
+    <Compile Include="UnitTests\UnregisterAzureAutomationScheduledRunbookTest.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

src/ServiceManagement/Automation/Commands.Automation.Test/UnitTests/RegisterAzureAutomationScheduledRunbook.cs renamed to src/ServiceManagement/Automation/Commands.Automation.Test/UnitTests/RegisterAzureAutomationScheduledRunbookTest.cs

@@ -56,7 +56,7 @@ public void RegisterAzureAutomationScheduledRunbookSuccessfull()
 
             // Test
             this.cmdlet.AutomationAccountName = accountName;
-            this.cmdlet.Name = runbookName;
+            this.cmdlet.RunbookName = runbookName;
             this.cmdlet.ScheduleName = scheduleName;
             this.cmdlet.ExecuteCmdlet();
 

src/ServiceManagement/Automation/Commands.Automation.Test/UnitTests/UnregisterAzureAutomationScheduledRunbook.cs renamed to src/ServiceManagement/Automation/Commands.Automation.Test/UnitTests/UnregisterAzureAutomationScheduledRunbookTest.cs

@@ -76,7 +76,7 @@ public void UnregisterAzureAutomationScheduledRunbookByRunbookNameAndScheduleNam
 
             // Test
             this.cmdlet.AutomationAccountName = accountName;
-            this.cmdlet.Name = runbookName;
+            this.cmdlet.RunbookName = runbookName;
             this.cmdlet.ScheduleName = scheduleName;
             this.cmdlet.SetParameterSet(AutomationCmdletParameterSets.ByRunbookNameAndScheduleName);
             this.cmdlet.Force = true;

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

@@ -32,14 +32,14 @@ public class GetAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
         /// Gets or sets the job id.
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByJobScheduleId, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The job schedule id.")]
-        [Alias("JobScheduleId")]
         public Guid? Id { get; set; }
 
         /// <summary>
         /// Gets or sets the runbook name of the job.
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, HelpMessage = "The runbook name of the job schedule.")]
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, HelpMessage = "The runbook name of the job schedule.")]
+        [Alias("Name")]
         public string RunbookName { get; set; }
 
         /// <summary>

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

@@ -24,30 +24,30 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// Registers an azure automation scheduled runbook.
     /// </summary>
     [Cmdlet(VerbsLifecycle.Register, "AzureAutomationScheduledRunbook", DefaultParameterSetName = AutomationCmdletParameterSets.ByRunbookName)]
-    [OutputType(typeof(Runbook))]
+    [OutputType(typeof(JobSchedule))]
     public class RegisterAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
     {
         /// <summary>
         /// Gets or sets the runbook name
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, ValueFromPipelineByPropertyName = true,
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The runbook name.")]
         [ValidateNotNullOrEmpty]
-        [Alias("RunbookName")]
-        public string Name { get; set; }
+        [Alias("Name")]
+        public string RunbookName { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule that will be used to start the runbook.
         /// </summary>
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The name of the schedule on which the runbook will be started.")]
         [ValidateNotNullOrEmpty]
         public string ScheduleName { get; set; }
 
         /// <summary>
         /// Gets or sets the runbook parameters.
         /// </summary>
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The runbook parameters.")]
         public IDictionary Parameters { get; set; }
 
@@ -60,7 +60,7 @@ protected override void AutomationExecuteCmdlet()
             JobSchedule jobSchedule;
 
             jobSchedule = this.AutomationClient.RegisterScheduledRunbook(
-                    this.AutomationAccountName, this.Name, this.ScheduleName, this.Parameters);
+                    this.AutomationAccountName, this.RunbookName, this.ScheduleName, this.Parameters);
 
             this.WriteObject(jobSchedule);
         }

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

@@ -26,15 +26,13 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
     /// Unregisters an azure automation scheduled runbook.
     /// </summary>
     [Cmdlet(VerbsLifecycle.Unregister, "AzureAutomationScheduledRunbook", DefaultParameterSetName = AutomationCmdletParameterSets.ByJobScheduleId)]
-    [OutputType(typeof(Runbook))]
     public class UnregisterAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
     {
         /// <summary>
         /// Gets or sets the runbook Id
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByJobScheduleId, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The job schedule id.")]
-        [Alias("JobScheduleId")]
         public Guid? Id { get; set; }
 
         /// <summary>
@@ -43,8 +41,8 @@ public class UnregisterAzureAutomationScheduledRunbook : AzureAutomationBaseCmdl
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The runbook name.")]
         [ValidateNotNullOrEmpty]
-        [Alias("RunbookName")]
-        public string Name { get; set; }
+        [Alias("Name")]
+        public string RunbookName { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule that will be used to start the runbook.
@@ -70,7 +68,7 @@ protected override void AutomationExecuteCmdlet()
                 this.Force.IsPresent,
                 string.Format(CultureInfo.CurrentCulture, Resources.RemoveAzureAutomationJobScheduleWarning),
                 string.Format(CultureInfo.CurrentCulture, Resources.RemoveAzureAutomationJobScheduleDescription),
-                this.Id.HasValue ? this.Id.Value.ToString() : this.Name,
+                this.Id.HasValue ? this.Id.Value.ToString() : this.RunbookName,
                 () =>
                     {
                         if (this.ParameterSetName == AutomationCmdletParameterSets.ByJobScheduleId)
@@ -81,7 +79,7 @@ protected override void AutomationExecuteCmdlet()
                         else if (this.ParameterSetName == AutomationCmdletParameterSets.ByRunbookNameAndScheduleName)
                         {
                             this.AutomationClient.UnregisterScheduledRunbook(
-                                this.AutomationAccountName, this.Name, this.ScheduleName);
+                                this.AutomationAccountName, this.RunbookName, this.ScheduleName);
                         }
                     });
         }