Merge pull request Azure#9963 from ikanni/ikanni/StAzAuRB

Fixed Start-AzAutomationRunbook cmdlet Null reference exception

Author: markcowl

src/Automation/Automation.Test/ScenarioTests/AutomationTests.ps1

@@ -17,8 +17,9 @@
 Checks whether the first string contains the second one
 #>
 
-$accountName='account'
+$accountName='fbs-aa-01'
 $location = "East US"
+$resourceGroupName = "to-delete-01"
 
 function AssertContains
 {
@@ -46,19 +47,19 @@ function CreateRunbook
     param([string] $runbookPath, [boolean] $byName=$false, [string[]] $tag, [string] $description, [string] $type = "PowerShell")
 
     $runbookName = gci $runbookPath | %{$_.BaseName}
-    $runbook = Get-AzAutomationRunbook $accountName | where {$_.Name -eq $runbookName -and $_.RunbookType -eq $type} 
+    $runbook = Get-AzAutomationRunbook -AutomationAccountName $accountName -ResourceGroupName $resourceGroupName | where {$_.Name -eq $runbookName -and $_.RunbookType -eq $type} 
     if ($runbook.Count -eq 1)
     {
         $runbook | Remove-AzAutomationRunbook -Force
     }
 
     if(!$byName)
     {
-        return New-AzAutomationRunbook $accountName -Path $runbookPath -Tag $tag -Description $description -Type $type
+        return Import-AzAutomationRunbook -AutomationAccountName $accountName -ResourceGroupName $resourceGroupName -Path $runbookPath -Tag $tag -Description $description -Type $type
     }
     else 
     {
-        return New-AzAutomationRunbook $accountName -Name $runbookName -Tag $tag -Description $description -Type $type
+        return New-AzAutomationRunbook -AutomationAccountName $accountName -ResourceGroupName $resourceGroupName -Name $runbookName -Tag $tag -Description $description -Type $type
     }
 }
 
@@ -81,7 +82,7 @@ function WaitForJobStatus
     {
         Wait-Seconds $interval
         $timeElapse = $timeElapse + $interval
-        $job = Get-AzAutomationJob -AutomationAccount $accountName -Id $Id
+        $job = Get-AzAutomationJob -AutomationAccountName $accountName -ResourceGroupName $resourceGroupName -Id $Id
         if($job.Status -eq $Status)
         {
             break
@@ -104,7 +105,7 @@ function Test-RunbookWithParameter
     param([string] $runbookPath, [string] $type, [HashTable] $parameters, [int]$expectedResult)
 
     #Setup
-    $automationAccount = Get-AzAutomationAccount -Name $accountName
+    $automationAccount = Get-AzAutomationAccount -Name $accountName -ResourceGroupName $resourceGroupName
     Assert-NotNull $automationAccount "Automation account $accountName does not exist."
 
     $runbook = CreateRunbook  $runbookPath -type $type
@@ -372,3 +373,30 @@ function Test-AutomationStartUnpublishedRunbook
     Remove-AzAutomationRunbook $accountName -Name $runbook.Name -Force 
     Assert-Throws {Get-AzAutomationRunbook $accountName -Name $runbook.Name -Parameters $runbookParameters -PassThru -ErrorAction Stop}
 }
+
+
+<#
+.SYNOPSIS
+Tests Runbook with Parameters and Wait
+#>
+function Test-RunbookWithParameterAndWait
+{
+    param([string] $runbookPath, [string] $type, [HashTable] $parameters, [int]$expectedResult)
+
+    #Setup
+    $automationAccount = Get-AzAutomationAccount -Name $accountName -ResourceGroupName $resourceGroupName
+    Assert-NotNull $automationAccount "Automation account $accountName does not exist."
+
+    $runbook = CreateRunbook  $runbookPath -type $type
+    Assert-NotNull $runbook  "runBook $runbookPath does not import successfully."
+    $automationAccount | Publish-AzAutomationRunbook -Name $runbook.Name
+
+    #Test
+    $job = $automationAccount | Start-AzAutomationRunbook -Name $runbook.Name -Parameters $parameters  -Wait
+	Assert-NotNull  $job
+    [int]$Result = $job[$job.Length-1]
+    Assert-AreEqual $expectedResult $Result
+    
+    $automationAccount | Remove-AzAutomationRunbook -Name $runbook.Name -Force
+    Assert-Throws { $automationAccount | Get-AzAutomationRunbook -Name $runbook.Name}
+}