Merge pull request #54 from KirtiWandhare/patch-4

#52 - Adding continue on Failure flag; #53 - Fixing RP registration loop

Author: igorse

CanaryValidator/Canary.Tests.ps1

@@ -43,7 +43,11 @@ param (
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]
-    [string]$ResourceLocation = "local"
+    [string]$ResourceLocation = "local",
+    [parameter(HelpMessage="Flag to cleanup resources after exception")]
+    [Parameter(ParameterSetName="default", Mandatory=$false)]
+    [Parameter(ParameterSetName="tenant", Mandatory=$false)]
+    [bool] $ContinueOnFailure = $false
 )
 
 #Requires -Modules AzureRM
@@ -69,7 +73,7 @@ New-Item -Path $canaryUtilPath -ItemType Directory
 # Start Canary 
 #
 $CanaryLogFile      = $CanaryLogPath + "\Canary-Basic$((Get-Date).ToString("-yyMMdd-hhmmss")).log"
-Start-Scenario -Name 'Canary' -Type 'Basic' -LogFilename $CanaryLogFile
+Start-Scenario -Name 'Canary' -Type 'Basic' -LogFilename $CanaryLogFile -ContinueOnFailure $ContinueOnFailure
 
 Invoke-Usecase -Name 'CreateAzureStackEnv' -Description "Create Azure Stack environment $EnvironmentName" -UsecaseBlock `
 {
@@ -161,7 +165,29 @@ if ($TenantAdminCredentials)
         }           
     }  
 
-    RegisterResourceProviders  
+    Invoke-Usecase -Name 'RegisterResourceProviders' -Description "Register resource providers" -UsecaseBlock `
+    {
+        Get-AzureRmResourceProvider -ListAvailable | Register-AzureRmResourceProvider -Force        
+        $sleepTime = 0        
+        while($true)
+        {
+            $sleepTime += 10
+            Start-Sleep 10
+            $requiredRPs = Get-AzureRmResourceProvider -ListAvailable | ? {$_.ProviderNamespace -in ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault")}
+            $notRegistered = $requiredRPs | ? {$_.RegistrationState -ne "Registered"}
+            $registered = $requiredRPs | ? {$_.RegistrationState -eq "Registered"}
+            if (($sleepTime -ge 120) -and $notRegistered)
+            {
+                Get-AzureRmResourceProvider | Format-Table
+                throw [System.Exception] "Resource providers did not get registered in time."
+            }
+            elseif ($registered.Count -eq $requiredRPs.Count)
+            {
+                break
+            }
+        }
+        Get-AzureRmResourceProvider | Format-Table             
+    }
 }
 
 Invoke-Usecase -Name 'CreateResourceGroupForUtilities' -Description "Create a resource group $CanaryUtilitiesRG for the placing the utility files" -UsecaseBlock `

CanaryValidator/Canary.Utilities.psm1

@@ -1,3 +1,4 @@
+$Global:ContinueOnFailure = $false
 $Global:JSONLogFile  = "Run-Canary.JSON"
 $Global:TxtLogFile  = "AzureStackCanaryLog.Log"
 $UseCase = @{}
@@ -107,7 +108,9 @@ function Start-Scenario
         [string]$Type,
         [parameter(Mandatory=$false)]
         [ValidateNotNullOrEmpty()]
-        [string]$LogFilename
+        [string]$LogFilename,
+        [parameter(Mandatory=$false)]
+        [bool] $ContinueOnFailure = $false
     )
 
     if ($LogFileName)
@@ -130,6 +133,7 @@ function Start-Scenario
     "UseCases" = @()
     }    
     $jsonReport | ConvertTo-Json -Depth 10 | Out-File -FilePath $Global:JSONLogFile
+    $Global:ContinueOnFailure = $ContinueOnFailure
 }
 
 function End-Scenario
@@ -171,7 +175,10 @@ function Invoke-Usecase
     {        
         Log-Exception ($_.Exception)
         Log-Error ("###### [END] Usecase: $Name ###### [RESULT = FAIL] ######`n")
-        throw $_.Exception
+        if (-not $Global:ContinueOnFailure)
+        {
+            throw $_.Exception
+        }
     }
 }
 
@@ -454,20 +461,6 @@ function NewAzureStackDefaultQuotas
     $serviceQuotas    
 }
 
-function RegisterResourceProviders
-{
-    Get-AzureRmResourceProvider -ListAvailable | Register-AzureRmResourceProvider -Force
-    $requiredRPs = ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault")
-    foreach ($rp in $requiredRPs)
-    {
-        while ((Get-AzureRmResourceProvider | Where-Object ProviderNamespace -eq $rp).RegistrationState -ne "Registered")
-        {
-            Start-Sleep -Seconds 10
-        }
-    }
-    Get-AzureRmResourceProvider | Format-Table    
-}
-
 function NewAzureStackDSCScriptResource
 {
     [CmdletBinding()]