add skip table check

MSSedusch · MSSedusch · commit 420576b7e189 · 2016-02-20T14:48:46.000+01:00
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.ps1
@@ -56,7 +56,7 @@ function Test-AEMExtensionBasicWindows
 
 
 		# Test command.
-		$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -WaitTimeInMinutes 50
+		$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -WaitTimeInMinutes 50 -SkipTableContentCheck
 		Assert-True { $testResult.Result }
 		Assert-True { ($testResult.PartialResults.Count -gt 0) }
 
@@ -117,7 +117,7 @@ function Test-AEMExtensionAdvancedWindows
 
 		# Test command.
 		Write-Verbose "Test-AEMExtensionAdvancedWindows: Test with extension"
-		$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
+		$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipTableContentCheck
 		Assert-True { $res.Result }
 		Assert-True { ($res.PartialResults.Count -gt 0) }
 		Write-Verbose "Test-AEMExtensionAdvancedWindows: Test done"
@@ -177,7 +177,7 @@ function Test-AEMExtensionBasicLinux
 		Restart-AzureRmVM -ResourceGroupName $rgname -Name $vmname
 
 		# Test command.
-		$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -WaitTimeInMinutes 50
+		$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -WaitTimeInMinutes 50 -SkipTableContentCheck
 		Assert-True { $testResult.Result }
 		Assert-True { ($testResult.PartialResults.Count -gt 0) }
 
@@ -239,7 +239,7 @@ function Test-AEMExtensionAdvancedLinux
 
 		# Test command.
 		Write-Verbose "Test-AEMExtensionAdvancedLinux: Test with extension"
-		$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
+		$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipTableContentCheck
 		Assert-True { $res.Result }
 		Assert-True { ($res.PartialResults.Count -gt 0) }
 		Write-Verbose "Test-AEMExtensionAdvancedLinux: Test done"
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMHelper.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMHelper.cs
@@ -132,7 +132,7 @@ internal bool IsPremiumStorageAccount(string accountName)
                 }
                 catch (Exception)
                 {
-                    throw;
+                    this.WriteWarning("Could not determine OS Disk size.");
                 }
             }
 
@@ -289,6 +289,11 @@ internal AzureSLA GetDiskSLA(int? diskSize, string vhdUri)
             {
                 diskSize = this.GetDiskSizeGbFromBlobUri(vhdUri);
             }
+            if (!diskSize.HasValue)
+            {
+                this.WriteWarning("OS Disk size is empty and could not be determined. Assuming P10.");
+                diskSize = 127;
+            }
 
             AzureSLA sla = new AzureSLA();
             if (diskSize > 0 && diskSize < 129)
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AEM/TestAzureRmVMAEMExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AEM/TestAzureRmVMAEMExtension.cs
@@ -58,6 +58,13 @@ public class TestAzureRmVMAEMExtension : VirtualMachineExtensionBaseCmdlet
                 HelpMessage = "Time that should be waited for the Strorage Metrics or Diagnostics data to be available in minutes. Default is 15 minutes")]
         public int WaitTimeInMinutes { get; set; }
 
+        [Parameter(
+                Mandatory = false,
+                Position = 4,
+                ValueFromPipelineByPropertyName = false,
+                HelpMessage = "Disables the test for table content")]
+        public SwitchParameter SkipTableContentCheck { get; set; }
+
         public TestAzureRmVMAEMExtension()
         {
             this.WaitTimeInMinutes = 15;
@@ -214,17 +221,21 @@ public override void ExecuteCmdlet()
                         var filterMinute = Microsoft.WindowsAzure.Storage.Table.TableQuery.
                             GenerateFilterConditionForDate("Timestamp", "gt", DateTime.Now.AddMinutes(AEMExtensionConstants.ContentAgeInMinutes * -1));
 
-                        if (storageConfigOk && this._Helper.CheckTableAndContent(account, "$MetricsMinutePrimaryTransactionsBlob", filterMinute, ".", false, this.WaitTimeInMinutes))
+                        if (!this.SkipTableContentCheck.IsPresent && storageConfigOk && this._Helper.CheckTableAndContent(account, "$MetricsMinutePrimaryTransactionsBlob", filterMinute, ".", false, this.WaitTimeInMinutes))
 
                         {
                             this._Helper.WriteHost("OK ", ConsoleColor.Green);
                             accountResult.PartialResults.Add(new AEMTestResult("Storage Metrics data check for {0}", true, account));
                         }
-                        else
+                        else if (!this.SkipTableContentCheck.IsPresent)
                         {
                             accountResult.PartialResults.Add(new AEMTestResult("Storage Metrics data check for {0}", false, account));
                             this._Helper.WriteHost("NOT OK ", ConsoleColor.Red);
                         }
+                        else
+                        {
+                            this._Helper.WriteHost("Skipped ", ConsoleColor.Yellow);
+                        }
                     }
                     else
                     {
@@ -437,7 +448,7 @@ public override void ExecuteCmdlet()
 
 
                         var ok = false;
-                        if ((!String.IsNullOrEmpty(deploymentId)) && (!String.IsNullOrEmpty(roleName)) && (!String.IsNullOrEmpty(wadstorage)))
+                        if (!this.SkipTableContentCheck.IsPresent && (!String.IsNullOrEmpty(deploymentId)) && (!String.IsNullOrEmpty(roleName)) && (!String.IsNullOrEmpty(wadstorage)))
                         {
 
                             if (this.OSType.Equals(AEMExtensionConstants.OSTypeLinux, StringComparison.InvariantCultureIgnoreCase))
@@ -456,16 +467,20 @@ public override void ExecuteCmdlet()
 
 
                         }
-                        if (ok)
+                        if (ok && !this.SkipTableContentCheck.IsPresent)
                         {
                             wadConfigResult.PartialResults.Add(new AEMTestResult("IaaSDiagnostics data check", true));
                             this._Helper.WriteHost("OK ", ConsoleColor.Green);
                         }
-                        else
+                        else if (!this.SkipTableContentCheck.IsPresent)
                         {
                             wadConfigResult.PartialResults.Add(new AEMTestResult("IaaSDiagnostics data check", false));
                             this._Helper.WriteHost("NOT OK ", ConsoleColor.Red);
                         }
+                        else
+                        {
+                            this._Helper.WriteHost("Skipped ", ConsoleColor.Yellow);
+                        }
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ internal bool IsPremiumStorageAccount(string accountName)`
`132`	`132`	`}`
`133`	`133`	`catch (Exception)`
`134`	`134`	`{`
`135`		`- throw;`
	`135`	`+ this.WriteWarning("Could not determine OS Disk size.");`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -289,6 +289,11 @@ internal AzureSLA GetDiskSLA(int? diskSize, string vhdUri)`
`289`	`289`	`{`
`290`	`290`	`diskSize = this.GetDiskSizeGbFromBlobUri(vhdUri);`
`291`	`291`	`}`
	`292`	`+ if (!diskSize.HasValue)`
	`293`	`+ {`
	`294`	`+ this.WriteWarning("OS Disk size is empty and could not be determined. Assuming P10.");`
	`295`	`+ diskSize = 127;`
	`296`	`+ }`
`292`	`297`
`293`	`298`	`AzureSLA sla = new AzureSLA();`
`294`	`299`	`if (diskSize > 0 && diskSize < 129)`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,13 @@ public class TestAzureRmVMAEMExtension : VirtualMachineExtensionBaseCmdlet`
`58`	`58`	`HelpMessage = "Time that should be waited for the Strorage Metrics or Diagnostics data to be available in minutes. Default is 15 minutes")]`
`59`	`59`	`public int WaitTimeInMinutes { get; set; }`
`60`	`60`
	`61`	`+ [Parameter(`
	`62`	`+ Mandatory = false,`
	`63`	`+ Position = 4,`
	`64`	`+ ValueFromPipelineByPropertyName = false,`
	`65`	`+ HelpMessage = "Disables the test for table content")]`
	`66`	`+ public SwitchParameter SkipTableContentCheck { get; set; }`
	`67`	`+`
`61`	`68`	`public TestAzureRmVMAEMExtension()`
`62`	`69`	`{`
`63`	`70`	`this.WaitTimeInMinutes = 15;`
`@@ -214,17 +221,21 @@ public override void ExecuteCmdlet()`
`214`	`221`	`var filterMinute = Microsoft.WindowsAzure.Storage.Table.TableQuery.`
`215`	`222`	`GenerateFilterConditionForDate("Timestamp", "gt", DateTime.Now.AddMinutes(AEMExtensionConstants.ContentAgeInMinutes * -1));`
`216`	`223`
`217`		`- if (storageConfigOk && this._Helper.CheckTableAndContent(account, "$MetricsMinutePrimaryTransactionsBlob", filterMinute, ".", false, this.WaitTimeInMinutes))`
	`224`	`+ if (!this.SkipTableContentCheck.IsPresent && storageConfigOk && this._Helper.CheckTableAndContent(account, "$MetricsMinutePrimaryTransactionsBlob", filterMinute, ".", false, this.WaitTimeInMinutes))`
`218`	`225`
`219`	`226`	`{`
`220`	`227`	`this._Helper.WriteHost("OK ", ConsoleColor.Green);`
`221`	`228`	`accountResult.PartialResults.Add(new AEMTestResult("Storage Metrics data check for {0}", true, account));`
`222`	`229`	`}`
`223`		`- else`
	`230`	`+ else if (!this.SkipTableContentCheck.IsPresent)`
`224`	`231`	`{`
`225`	`232`	`accountResult.PartialResults.Add(new AEMTestResult("Storage Metrics data check for {0}", false, account));`
`226`	`233`	`this._Helper.WriteHost("NOT OK ", ConsoleColor.Red);`
`227`	`234`	`}`
	`235`	`+ else`
	`236`	`+ {`
	`237`	`+ this._Helper.WriteHost("Skipped ", ConsoleColor.Yellow);`
	`238`	`+ }`
`228`	`239`	`}`
`229`	`240`	`else`
`230`	`241`	`{`
`@@ -437,7 +448,7 @@ public override void ExecuteCmdlet()`
`437`	`448`
`438`	`449`
`439`	`450`	`var ok = false;`
`440`		`- if ((!String.IsNullOrEmpty(deploymentId)) && (!String.IsNullOrEmpty(roleName)) && (!String.IsNullOrEmpty(wadstorage)))`
	`451`	`+ if (!this.SkipTableContentCheck.IsPresent && (!String.IsNullOrEmpty(deploymentId)) && (!String.IsNullOrEmpty(roleName)) && (!String.IsNullOrEmpty(wadstorage)))`
`441`	`452`	`{`
`442`	`453`
`443`	`454`	`if (this.OSType.Equals(AEMExtensionConstants.OSTypeLinux, StringComparison.InvariantCultureIgnoreCase))`
`@@ -456,16 +467,20 @@ public override void ExecuteCmdlet()`
`456`	`467`
`457`	`468`
`458`	`469`	`}`
`459`		`- if (ok)`
	`470`	`+ if (ok && !this.SkipTableContentCheck.IsPresent)`
`460`	`471`	`{`
`461`	`472`	`wadConfigResult.PartialResults.Add(new AEMTestResult("IaaSDiagnostics data check", true));`
`462`	`473`	`this._Helper.WriteHost("OK ", ConsoleColor.Green);`
`463`	`474`	`}`
`464`		`- else`
	`475`	`+ else if (!this.SkipTableContentCheck.IsPresent)`
`465`	`476`	`{`
`466`	`477`	`wadConfigResult.PartialResults.Add(new AEMTestResult("IaaSDiagnostics data check", false));`
`467`	`478`	`this._Helper.WriteHost("NOT OK ", ConsoleColor.Red);`
`468`	`479`	`}`
	`480`	`+ else`
	`481`	`+ {`
	`482`	`+ this._Helper.WriteHost("Skipped ", ConsoleColor.Yellow);`
	`483`	`+ }`
`469`	`484`	`}`
`470`	`485`	`else`
`471`	`486`	`{`