Merge pull request #246 from Azure/renamestaging

Renamestaging

Author: knithinc

CanaryValidator/Canary.Tests.ps1

@@ -204,83 +204,83 @@ while ($runCount -le $NumberOfIterations)
     {
         Invoke-Usecase -Name 'GetAzureStackInfraRole' -Description "List all infrastructure roles" -UsecaseBlock `
         {
-	        Get-AzSInfraRole -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsInfrastructureRole -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackInfraRoleInstance' -Description "List all infrastructure role instances" -UsecaseBlock `
         {
-	        Get-AzSInfraRoleInstance -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsInfrastructureRoleInstance -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackLogicalNetwork' -Description "List all logical networks" -UsecaseBlock `
         {
-	        Get-AzSLogicalNetwork -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsLogicalNetwork -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackStorageCapacity' -Description "List storage capacity" -UsecaseBlock `
         {
-	        Get-AzSStorageSubsystem -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzSStorageSubsystem -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackStorageShare' -Description "List all storage file shares" -UsecaseBlock `
         {
-	        Get-AzSStorageShare -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsStorageShare -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackScaleUnit' -Description "List Azure Stack scale units in specified Region" -UsecaseBlock `
         {
-	        Get-AzSScaleUnit -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsScaleUnit -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackScaleUnitNode' -Description "List nodes in scale unit" -UsecaseBlock `
         {
-	        Get-AzSScaleUnitNode -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsScaleUnitNode -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackIPPool' -Description "List all IP pools" -UsecaseBlock `
         {
-	        Get-AzSIPPool -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsIpPool -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackMacPool' -Description "List all MAC address pools " -UsecaseBlock `
         {
-	        Get-AzSMacPool -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsMacPool -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackGatewayPool' -Description "List all gateway pools" -UsecaseBlock `
         {
-	        Get-AzSGatewayPool -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsGatewayPool -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackSLBMux' -Description "List all SLB MUX instances" -UsecaseBlock `
         {
-	        Get-AzSSLBMUX -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsSlbMux -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackGateway' -Description "List all gateway" -UsecaseBlock `
         {
-	        Get-AzSGateway -AzureStackCredentials $ServiceAdminCredentials -TenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsGateway -Location $ResourceLocation
         }            
     }
 
     Invoke-Usecase -Name 'ListHealthResourceProviderAlerts' -Description "List all HealthResourceProvider(HRP) alerts " -UsecaseBlock `
     {     
         Invoke-Usecase -Name 'GetAzureStackAlert' -Description "List all alerts" -UsecaseBlock `
         {
-            Get-AzSAlert -TenantID $TenantID -AzureStackCredentials $ServiceAdminCredentials -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsAlert -Location $ResourceLocation
         }
     }
 
     Invoke-Usecase -Name 'ListUpdatesResourceProviderInfo' -Description "List URP information like summary of updates available, update to be applied, last update applied etc." -UsecaseBlock `
     {        
         Invoke-Usecase -Name 'GetAzureStackUpdateSummary' -Description "List summary of updates status" -UsecaseBlock `
         {
-            Get-AzSUpdateLocation -TenantID $TenantID -AzureStackCredentials $ServiceAdminCredentials -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzSUpdateLocation -Location $ResourceLocation
         }
 
         Invoke-Usecase -Name 'GetAzureStackUpdateToApply' -Description "List all updates that can be applied" -UsecaseBlock `
         {
-            Get-AzSUpdate -TenantID $TenantID -AzureStackCredentials $ServiceAdminCredentials -EnvironmentName $SvcAdminEnvironmentName -region $ResourceLocation
+            Get-AzsUpdate -Location $ResourceLocation
         }         
     }
 
@@ -290,7 +290,7 @@ while ($runCount -le $NumberOfIterations)
         {
             if (-not (Get-AzureRmVMImage -Location $ResourceLocation -PublisherName "MicrosoftWindowsServer" -Offer "WindowsServer" -Sku "2016-Datacenter-Core" -ErrorAction SilentlyContinue))
             {
-                New-Server2016VMImage -ISOPath $WindowsISOPath -TenantId $TenantID -EnvironmentName $SvcAdminEnvironmentName -Location $ResourceLocation -Version Core -AzureStackCredentials $ServiceAdminCredentials -CreateGalleryItem $false
+                New-AzsServer2016VMImage -ISOPath $WindowsISOPath -Location $ResourceLocation -Version Core -CreateGalleryItem $false
             }
         }
     }
@@ -447,7 +447,7 @@ while ($runCount -le $NumberOfIterations)
             {
 	            $resourceProviders = Get-AzureRmResourceProvider -ListAvailable
                 # Some of the RPs have not implemented their operations API yet. So update this exclusion list whenever any RP implements its operations API
-                $rpOperationsExclusionList = @("Microsoft.Compute", "Microsoft.Commerce", "Microsoft.Gallery", "Microsoft.Insights")
+                $rpOperationsExclusionList = @("Microsoft.Commerce", "Microsoft.Gallery", "Microsoft.Insights")
                 $totalOperationsPerRP = @()    
                 foreach($rp in $resourceProviders)
                 {
@@ -1120,10 +1120,9 @@ while ($runCount -le $NumberOfIterations)
                     {
                         if (Get-AzureRmVMImage -Location $ResourceLocation -PublisherName $linuxImagePublisher -Offer $linuxImageOffer -Sku $LinuxOSSku -ErrorAction SilentlyContinue)
                         {
-                            Remove-VMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -tenantID $TenantID -EnvironmentName $SvcAdminEnvironmentName -Location $ResourceLocation -AzureStackCredentials $ServiceAdminCredentials
+                            Remove-AzsVMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -Location $ResourceLocation
                         }
                     }
-
                     Invoke-Usecase -Name 'DeleteSubscriptionResourceGroup' -Description "Delete the resource group that contains subscription resources" -UsecaseBlock `
                     {
                         if ($removeRG = Get-AzureRmResourceGroup -Name $subscriptionRGName -ErrorAction Stop)

CanaryValidator/README.md

@@ -4,14 +4,16 @@ Canary validator provides a breadth customer experience with the Azure Stack dep
 Instructions are relative to the .\CanaryValidator directory.
 Canary can be invoked either as Service Administrator or Tenant Administrator.
 
-# Download Canary
+## Download Canary
+
 ```powershell
 Invoke-WebRequest https://github.com/Azure/AzureStack-Tools/archive/master.zip -OutFile master.zip
 Expand-Archive master.zip -DestinationPath . -Force
 Set-Location -Path ".\AzureStack-Tools-master\CanaryValidator" -PassThru
 ```
 
-# To execute Canary as Tenant Administrator (if Windows Server 2016 or Windows Server 2012-R2 images are already present in the PIR)
+## To execute Canary as Tenant Administrator (if Windows Server 2016 or Windows Server 2012-R2 images are already present in the PIR)
+
 ```powershell
 # Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
@@ -21,7 +23,8 @@ $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "<Ser
 .\Canary.Tests.ps1  -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds
 ```
 
-# To execute Canary as Tenant Administrator (if Windows Server 2016 or Windows Server 2012-R2 images are not present in PIR)
+## To execute Canary as Tenant Administrator (if Windows Server 2016 or Windows Server 2012-R2 images are not present in PIR)
+
 ```powershell
 # Download the WS2016 ISO image from: https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2016, and place it on your local machine
 # Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
@@ -32,7 +35,8 @@ $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "<Ser
 .\Canary.Tests.ps1  -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds -WindowsISOPath "<path where the WS2016 ISO is present>"
 ```
 
-# To execute Canary as Service Administrator
+## To execute Canary as Service Administrator
+
 ```powershell
 # Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
@@ -41,7 +45,8 @@ $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "<Ser
 .\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds
 ```
 
-# To list the usecases in Canary
+## To list the usecases in Canary
+
 ```powershell
 # Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
@@ -126,7 +131,8 @@ List of scenarios in Canary:
         |--DeleteSubscriptionResourceGroup
 ```
 
-# To exclude certain usecases from getting executed
+## To exclude certain usecases from getting executed
+
 ```powershell
 # Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
@@ -136,16 +142,17 @@ $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "<Ser
 .\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -ExclusionList "ListFabricResourceProviderInfo","ListUpdateResourceProviderInfo"
 ```
 
-# Reading the results & logs
+## Reading the results & logs
+
 Canary generates log files in the TMP directory ($env:TMP). The logs can be found under the directory "CanaryLogs[DATETIME]". There are two types of logs generated, a text log and a JSON log. JSON log provides a quick and easy view of all the usecases and their corresponding results. Text log provides a more detailed output of each usecase execution, its output and results.
 
 Each usecase entry in the JSON log consists of the following fields.
+
 - Name
 - Description
 - StartTime
 - EndTime
 - Result
 - Exception (in case a scenario fails)
 
-The exception field is helpful to debug failed usecases.  
-
+The exception field is helpful to debug failed use cases.