Merge pull request #121 from mismit/patch-2

knithinc · web-flow · commit b0a4781c6765 · 2017-03-23T22:57:33.000-07:00
Expose Canary Log File Name as a parameter
diff --git a/CanaryValidator/Canary.Tests.ps1 b/CanaryValidator/Canary.Tests.ps1
@@ -91,7 +91,12 @@ param (
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]
-    [string]$CanaryLogPath = $env:TMP + "\CanaryLogs$((Get-Date).ToString("-yyMMdd-hhmmss"))"
+    [string]$CanaryLogPath = $env:TMP + "\CanaryLogs$((Get-Date).ToString("-yyMMdd-hhmmss"))",
+	[parameter(HelpMessage="Specifies the file name for canary log file")]
+    [Parameter(ParameterSetName="default", Mandatory=$false)]
+    [Parameter(ParameterSetName="tenant", Mandatory=$false)]
+    [ValidateNotNullOrEmpty()]
+    [string]$CanaryLogFileName = "Canary-Basic$((Get-Date).ToString("-yyMMdd-hhmmss")).log"    
 )
 
 #Requires -Modules AzureRM
@@ -125,7 +130,7 @@ while ($runCount -le $NumberOfIterations)
     #
     # Start Canary 
     #
-    $CanaryLogFile      = $CanaryLogPath + "\Canary-Basic$((Get-Date).ToString("-yyMMdd-hhmmss")).log"
+    $CanaryLogFile      = $CanaryLogPath + "\$CanaryLogFileName"
 
     Start-Scenario -Name 'Canary' -Type 'Basic' -LogFilename $CanaryLogFile -ContinueOnFailure $ContinueOnFailure
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,12 @@ param (`
`91`	`91`	`[Parameter(ParameterSetName="default", Mandatory=$false)]`
`92`	`92`	`[Parameter(ParameterSetName="tenant", Mandatory=$false)]`
`93`	`93`	`[ValidateNotNullOrEmpty()]`
`94`		`- [string]$CanaryLogPath = $env:TMP + "\CanaryLogs$((Get-Date).ToString("-yyMMdd-hhmmss"))"`
	`94`	`+ [string]$CanaryLogPath = $env:TMP + "\CanaryLogs$((Get-Date).ToString("-yyMMdd-hhmmss"))",`
	`95`	`+ [parameter(HelpMessage="Specifies the file name for canary log file")]`
	`96`	`+ [Parameter(ParameterSetName="default", Mandatory=$false)]`
	`97`	`+ [Parameter(ParameterSetName="tenant", Mandatory=$false)]`
	`98`	`+ [ValidateNotNullOrEmpty()]`
	`99`	`+ [string]$CanaryLogFileName = "Canary-Basic$((Get-Date).ToString("-yyMMdd-hhmmss")).log"`
`95`	`100`	`)`
`96`	`101`
`97`	`102`	`#Requires -Modules AzureRM`
`@@ -125,7 +130,7 @@ while ($runCount -le $NumberOfIterations)`
`125`	`130`	`#`
`126`	`131`	`# Start Canary`
`127`	`132`	`#`
`128`		`- $CanaryLogFile = $CanaryLogPath + "\Canary-Basic$((Get-Date).ToString("-yyMMdd-hhmmss")).log"`
	`133`	`+ $CanaryLogFile = $CanaryLogPath + "\$CanaryLogFileName"`
`129`	`134`
`130`	`135`	`Start-Scenario -Name 'Canary' -Type 'Basic' -LogFilename $CanaryLogFile -ContinueOnFailure $ContinueOnFailure`
`131`	`136`