Merge pull request #146 from elvg/dev

Reimplementing the exisiting Automation cmdlets and adding new cmdlets

Author: markcowl

setup/azurecmdfiles.wxi

@@ -823,7 +823,7 @@
                             <File Id="filD8D1F471ACDC72E34B1D13DA591F7B3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.Common.NetFramework.dll" />
                         </Component>
                         <Component Id="cmp4EC3226B54BFE0FF4970968ABD1746E3" Guid="*">
-                            <File Id="filBEF499CCE9B33E61EA5BEFE2BEE86E92" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.Management.Automation.dll" />
+                            <File Id="filBEF499CCE9B33E61EA5BEFE2BEE86E92" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.WindowsAzure.Management.Automation.dll" />
                         </Component>
                         <Component Id="cmp86A3FC330AB128431B87D9FC2A1D3109" Guid="*">
                             <File Id="fil08829B0CC57BEE7E650F0AE7867D27EE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.ResourceManager.dll" />

src/Common/Commands.ScenarioTest/Resources/Automation/AutomationTests.ps1

@@ -17,7 +17,8 @@
 Checks whether the first string contains the second one
 #>
 
-$accountName='AutomationAccount'
+$accountName='safeer'
+$location = "East US"
 
 function AssertContains
 {
@@ -108,10 +109,10 @@ function Test-RunbookWithParameter
 
     $runbook = CreateRunbook  $runbookPath
     Assert-NotNull $runbook  "runBook $runbookPath does not import successfully."
-    $automationAccount | Publish-AzureAutomationRunbook -Id $runbook.Id
+    $automationAccount | Publish-AzureAutomationRunbook -Name $runbook.Name
 
     #Test
-    $job = $automationAccount | Start-AzureAutomationRunbook -Id $runbook.Id -Parameters $parameters
+    $job = $automationAccount | Start-AzureAutomationRunbook -Name $runbook.Name -Parameters $parameters
     WaitForJobStatus -Id $job.Id -Status "Completed"
     $jobOutput = $automationAccount | Get-AzureAutomationJobOutput -Id $job.Id -Stream Output
     $automationAccount | Remove-AzureAutomationRunbook -Name $runbook.Name -Force 
@@ -126,16 +127,15 @@ function Test-AutomationStartAndStopRunbook
 {
     param([string] $runbookPath)
 
-    #Setup
-    $automationAccount = Get-AzureAutomationAccount -Name $accountName
+	$automationAccount = Get-AzureAutomationAccount -Name $accountName
     Assert-NotNull $automationAccount "Automation account $accountName does not exist."
 
     $runbook = CreateRunbook $runbookPath
     Assert-NotNull $runbook  "runBook $runbookPath does not import successfully."
-    $automationAccount | Publish-AzureAutomationRunbook -Id $runbook.Id
+    $automationAccount | Publish-AzureAutomationRunbook -Name $runbook.Name
 
     #Test
-    $job = $automationAccount | Start-AzureAutomationRunbook -Id $runbook.Id
+    $job = Start-AzureAutomationRunbook -Name $runbook.Name -AutomationAccountName $accountName
     WaitForJobStatus -Id $job.Id -Status "Running"
     $automationAccount | Stop-AzureAutomationJob -Id $job.Id
     WaitForJobStatus -Id $job.Id -Status "Stopped"
@@ -153,31 +153,28 @@ function Test-AutomationPublishAndEditRunbook
 
     $runbook = CreateRunbook $runbookPath $true
 
-    #Test
-    
-    Assert-Null $runbook.PublishedRunbookVersionId
-    Assert-NotNull $runbook.DraftRunbookVersionId
     #Publish Runbook
-    $publishedRunbook = Publish-AzureAutomationRunbook $accountName -Id $runbook.Id
-    Assert-NotNull $publishedRunbook.PublishedRunbookVersionId
-    Assert-Null $publishedRunbook.DraftRunbookVersionId
-    $publishedRunbookDefn = Get-AzureAutomationRunbookDefinition $accountName -VersionId $publishedRunbook.PublishedRunbookVersionId
+    Publish-AzureAutomationRunbook $accountName -Name $runbook.Name
+	$publishedRunbook = Get-AzureAutomationRunbook  $accountName -Name $runbook.Name
+	$runbookState = "Published"
+    Assert-AreEqual $publishedRunbook.State $runbookState "Runbook should be in $runbookState state"
+    $publishedRunbookDefn = Get-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name
 
     #Edit Runbook
-    Set-AzureAutomationRunbookDefinition $accountName -Id $runbook.Id -Path $runbookPath -Overwrite
+    Set-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name -Path $runbookPath -Overwrite
     $runbook = Get-AzureAutomationRunbook  $accountName -Name $runbook.Name
-    Assert-AreEqual $publishedRunbook.PublishedRunbookVersionId $runbook.PublishedRunbookVersionId
-    Assert-NotNull $runbook.DraftRunbookVersionId "Runbook should be in draft mode"
-    $editedRunbookDefn = Get-AzureAutomationRunbookDefinition $accountName -VersionId $runbook.DraftRunbookVersionId
+	$runbookState = "Edit"
+    Assert-AreEqual $runbook.State $runbookState "Runbook should be in $runbookState state"
+    $editedRunbookDefn = Get-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name -Slot "Draft"
     Assert-AreNotEqual $editedRunbookDefn.Content $publishedRunbookDefn.Content "Old content and edited content of the runbook shouldn't be equal"
 
     Assert-Throws {Set-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name -Path $editRunbookPath -PassThru -ErrorAction Stop} 
     Set-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name -Path $editRunbookPath -Overwrite
-    $editedRunbookDefn2 = Get-AzureAutomationRunbookDefinition $accountName -VersionId $runbook.DraftRunbookVersionId
+    $editedRunbookDefn2 = Get-AzureAutomationRunbookDefinition $accountName -Name $runbook.Name -Slot "Draft"
     Assert-AreNotEqual $editedRunbookDefn2.Content $editedRunbookDefn.Content "Old content and edited content of the runbook shouldn't be equal"
 
-    Remove-AzureAutomationRunbook $accountName -Id $runbook.Id -Force
-    Assert-Throws {Get-AzureAutomationRunbook $accountName -Id $runbook.Id}
+    Remove-AzureAutomationRunbook $accountName -Name $runbook.Name -Force
+    Assert-Throws {Get-AzureAutomationRunbook $accountName -Name $runbook.Name}
 
 }
 
@@ -194,30 +191,26 @@ function Test-AutomationConfigureRunbook
     Assert-NotNull $automationAccount "Automation account $accountName does not exist."
     $runbook = CreateRunbook $runbookPath
     Assert-NotNull $runbook  "runbook ($runbookPath) isn't imported successfully."
-    Publish-AzureAutomationRunbook -Id $runbook.Id -AutomationAccountName $accountName
+    Publish-AzureAutomationRunbook -Name $runbook.Name -AutomationAccountName $accountName
 
     #Test
 
     #Change the runbook configuration
-    $automationAccount | Set-AzureAutomationRunbook -Id $runbook.Id -LogDebug $true -LogVerbose $true -LogProgress $false
+    $automationAccount | Set-AzureAutomationRunbook -Name $runbook.Name -LogVerbose $true -LogProgress $false
     $runbook = $automationAccount | Get-AzureAutomationRunbook -Name $runbook.Name
     Assert-NotNull $runbook "Runbook shouldn't be Null"
-    Assert-AreEqual $true $runbook.LogDebug "Log Debug mode should be true."
     Assert-AreEqual $true $runbook.LogVerbose "Log Verbose mode should be true."
     Assert-AreEqual $false $runbook.LogProgress "Log Progress mode should be false."
 
     #Start runbook and wait for job complete
-    $job = $automationAccount | Start-AzureAutomationRunbook -Id $runbook.Id
+    $job = $automationAccount | Start-AzureAutomationRunbook -Name $runbook.Name
     WaitForJobStatus -Id $job.Id -Status "Completed"
 
     #Check job output streams
     $jobOutputs = $automationAccount | Get-AzureAutomationJobOutput -Id $job.Id -Stream "Output"
     Assert-AreEqual 1 $jobOutputs.Count
     AssertContains $jobOutputs[0].Text "output message" "The output stream is wrong."
-    #Verify that debug and verbose streams are logged
-    $jobDebugOutputs = $automationAccount | Get-AzureAutomationJobOutput -Id $job.Id -Stream "Debug"
-    Assert-AreEqual 1 $jobDebugOutputs.Count
-    AssertContains $jobDebugOutputs[0].Text "debug message" "The debug stream is wrong."
+    #Verify that verbose streams are logged
     $jobVerboseOutputs = Get-AzureAutomationJobOutput $accountName -Id $job.Id -Stream "Verbose"
     Assert-AreEqual 1 $jobVerboseOutputs.Count
     AssertContains $jobVerboseOutputs[0].Text "verbose message" "The verbose stream is wrong."
@@ -226,26 +219,24 @@ function Test-AutomationConfigureRunbook
     Assert-AreEqual 0 $jobProgressOutputs.Count
 
     #Change the runbook configuration again and start the runbook
-    Set-AzureAutomationRunbook $accountName -Id $runbook.Id -LogDebug $false -LogVerbose $false -LogProgress $true
+    Set-AzureAutomationRunbook $accountName -Name $runbook.Name -LogVerbose $false -LogProgress $true
     $job = Start-AzureAutomationRunbook $accountName -Name $runbook.Name
     WaitForJobStatus -Id $job.Id -Status "Completed"
     #Verify that progress stream is logged
     $jobProgressOutputs = Get-AzureAutomationJobOutput $accountName -Id $job.Id -Stream "Progress"
     Assert-AreNotEqual 0 $jobProgressOutputs.Count
     Assert-AreEqual $jobProgressOutputs[0].Type "Progress"
-    #Verify that debug and verbose streams aren't logged
-    $jobDebugOutputs = Get-AzureAutomationJobOutput $accountName -Id $job.Id -Stream "Debug"
-    Assert-AreEqual 0 $jobDebugOutputs.Count
+    #Verify that verbose streams aren't logged
     $jobVerboseOutputs = Get-AzureAutomationJobOutput $accountName -Id $job.Id -Stream "Verbose"
     Assert-AreEqual 0 $jobVerboseOutputs.Count
 
     #Check whether the total number of jobs for the runbook is correct
-    $jobs = Get-AzureAutomationJob $accountName -RunbookId $runbook.Id
+    $jobs = Get-AzureAutomationJob $accountName -RunbookName $runbook.Name
     Assert-AreEqual 2 $jobs.Count "There should be 2 jobs in total for this runbook."
 
     #Remove runbook
     $automationAccount | Remove-AzureAutomationRunbook -Name $runbook.Name -Force 
-    Assert-Throws {$automationAccount | Get-AzureAutomationRunbook -Id $runbook.Id}
+    Assert-Throws {$automationAccount | Get-AzureAutomationRunbook -Name $runbook.Name}
 }
 
 <#
@@ -263,17 +254,17 @@ function Test-AutomationSuspendAndResumeJob
 
     #Test
 
-    $automationAccount | Publish-AzureAutomationRunbook -Id $runbook.Id
+    $automationAccount | Publish-AzureAutomationRunbook -Name $runbook.Name
     #Start, suspend, and then resume job
-    $job = Start-AzureAutomationRunbook $accountName -Id $runbook.Id
+    $job = Start-AzureAutomationRunbook $accountName -Name $runbook.Name
     WaitForJobStatus -Id $job.Id -Status "Running"
     Suspend-AzureAutomationJob $accountName -Id $job.Id
     WaitForJobStatus -Id $job.Id -Status "Suspended"
     $automationAccount | Resume-AzureAutomationJob -Id $job.Id
     WaitForJobStatus -Id $job.Id -Status "Completed"
 
     #Remove runbook
-    Remove-AzureAutomationRunbook -AutomationAccountName $accountName -Id $runbook.Id -Force 
+    Remove-AzureAutomationRunbook -AutomationAccountName $accountName -Name $runbook.Name -Force 
     Assert-Throws {Get-AzureAutomationRunbook $accountName -Name $runbook.Name}
 }
 
@@ -319,31 +310,34 @@ function Test-AutomationStartRunbookOnASchedule
 
     $runbook = Register-AzureAutomationScheduledRunbook $accountName -Name $runbook.Name -ScheduleName $oneTimeScheName
     Assert-AreEqual $oneTimeScheName $runbook.ScheduleNames "The runbook should be associated with $oneTimeScheName"
-    $runbook = Register-AzureAutomationScheduledRunbook $accountName -Id $runbook.Id -ScheduleName $dailyScheName
+    $runbook = Register-AzureAutomationScheduledRunbook $accountName -Name $runbook.Name -ScheduleName $dailyScheName
     Assert-True { $runbook.ScheduleNames -Contains $dailyScheName} "The runbook should be associated with $dailyScheName"
 
     #waiting for seven minutes
     Wait-Seconds 420 
-    $job = Get-AzureAutomationJob $accountName -RunbookId $runbook.Id | where {$_.ScheduleName -eq $oneTimeScheName}
+    $job = Get-AzureAutomationJob $accountName -Name $runbook.Name | where {$_.ScheduleName -eq $oneTimeScheName}
+	$jobSchedule = Get-AzureAutomationScheduledRunbook $accountName -RunbookName $runbook.Name -ScheduleName $oneTimeScheName
+	Assert-AreEqual 1 $jobSchedule.Count
     Assert-AreEqual 1 $job.Count
     WaitForJobStatus -Id $job.Id -Status "Completed"
 
     #Edit schedule
     $description = "Daily Schedule Description"
-    Set-AzureAutomationSchedule $accountName -Name $oneTimeScheName -Description $description
-    $dailySchedule = Get-AzureAutomationSchedule $accountName -Name $oneTimeScheName
+    Set-AzureAutomationSchedule $accountName -Name $dailyScheName -Description $description
+    $dailySchedule = Get-AzureAutomationSchedule $accountName -Name $dailyScheName
     Assert-AreEqual $description $dailySchedule.Description
 
-    $runbook = Unregister-AzureAutomationScheduledRunbook $accountName -Name $runbook.Name -ScheduleName $dailyScheName
-    Assert-False {$runbook.ScheduleNames -Contains $dailyScheName} "The runbook shouldn't have an association with $dailyScheName"
+    Unregister-AzureAutomationScheduledRunbook $accountName -Name $runbook.Name -ScheduleName $dailyScheName
+	$jobSchedule = Get-AzureAutomationScheduledRunbook $accountName -RunbookName $runbook.Name -ScheduleName $dailyScheName
+    Assert-Null $jobSchedule "The runbook shouldn't have an association with $dailyScheName"
 
     #Remove runbook and schedule
     Remove-AzureAutomationSchedule $accountName -Name $oneTimeScheName -Force
     Assert-Throws {$automationAccount | Get-AzureAutomationSchedule -Name $oneTimeScheName}
     $automationAccount | Remove-AzureAutomationSchedule -Name $dailyScheName -Force
     Assert-Throws {$automationAccount | Get-AzureAutomationSchedule -Name $dailyScheName}
-    Remove-AzureAutomationRunbook $accountName -Id $runbook.Id -Force
-    Assert-Throws {Get-AzureAutomationRunbook $accountName -Id $runbook.Id}
+    Remove-AzureAutomationRunbook $accountName -Name $runbook.Name -Force
+    Assert-Throws {Get-AzureAutomationRunbook $accountName -Name $runbook.Name}
 }
 
 <#
@@ -362,8 +356,8 @@ function Test-AutomationStartUnpublishedRunbook
     Assert-NotNull $runbook "runBook $runbookPath does not import successfully."
     Assert-NotNull $runbook.Tags "Tags of the runbook shouldn't be Null."
     Assert-NotNull $runbook.Description "Description of the runbook shouldn't be Null."
-    Assert-Throws {Start-AzureAutomationRunbook $accountName -Id $runbook.Id -Parameters $runbookParameters -PassThru -ErrorAction Stop} 
+    Assert-Throws {Start-AzureAutomationRunbook $accountName -Name $runbook.Name -Parameters $runbookParameters -PassThru -ErrorAction Stop} 
 
-    Remove-AzureAutomationRunbook $accountName -Id $runbook.Id -Force 
-    Assert-Throws {Get-AzureAutomationRunbook $accountName -Id $runbook.Id -Parameters $runbookParameters -PassThru -ErrorAction Stop}
+    Remove-AzureAutomationRunbook $accountName -Name $runbook.Name -Force 
+    Assert-Throws {Get-AzureAutomationRunbook $accountName -Name $runbook.Name -Parameters $runbookParameters -PassThru -ErrorAction Stop}
 }

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

@@ -111,25 +111,42 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationConnectionTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationCertificateTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationAccountTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationAccountTest.cs" />
-    <Compile Include="UnitTests\GetAzureAutomationJobOutputTest.cs" />
-    <Compile Include="UnitTests\GetAzureAutomationJobTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationRunbookDefinitionTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationRunbookTest.cs" />
-    <Compile Include="UnitTests\GetAzureAutomationScheduleTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationScheduledRunbookTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationConnectionTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationCertificateTest.cs" />
     <Compile Include="UnitTests\NewAzureAutomationRunbookTest.cs" />
-    <Compile Include="UnitTests\NewAzureAutomationScheduleTest.cs" />
     <Compile Include="UnitTests\PublishAzureAutomationRunbookTest.cs" />
-    <Compile Include="UnitTests\RegisterAzureAutomationScheduledJobTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationAccountTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationConnectionTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationCertificateTest.cs" />
+    <Compile Include="UnitTests\RegisterAzureAutomationScheduledRunbookTest.cs" />
     <Compile Include="UnitTests\RemoveAzureAutomationRunbookTest.cs" />
-    <Compile Include="UnitTests\RemoveAzureAutomationScheduleTest.cs" />
-    <Compile Include="UnitTests\ResumeAzureAutomationJobTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationRunbookDefinitionTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationRunbookTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationCredentialTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationJobTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationModuleTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationScheduleTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationCredentialTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationModuleTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationScheduleTest.cs" />
+    <Compile Include="UnitTests\NewAzureAutomationVariableTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationModuleTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationScheduleTest.cs" />
+    <Compile Include="UnitTests\RemoveAzureAutomationVariableTest.cs" />
+    <Compile Include="UnitTests\GetAzureAutomationVariableTest.cs" />
+    <Compile Include="UnitTests\ResumeAzureAutomationJobTest.cs" />
+    <Compile Include="UnitTests\SetAzureAutomationCredentialTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationScheduleTest.cs" />
-    <Compile Include="UnitTests\StartAzureAutomationRunbookTest.cs" />
     <Compile Include="UnitTests\StopAzureAutomationJobTest.cs" />
     <Compile Include="UnitTests\SuspendAzureAutomationJobTest.cs" />
+    <Compile Include="UnitTests\StartAzureAutomationRunbookTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common.Test\Commands.Common.Test.csproj">
@@ -148,6 +165,7 @@
   <ItemGroup>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />
+    <Compile Include="UnitTests\UnregisterAzureAutomationScheduledRunbookTest.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />