Merge remote-tracking branch 'upstream/vnext' into vnext

Merging from original fork

Author: Shriram Natarajan

CanaryValidator/Canary.Tests.ps1

@@ -12,7 +12,7 @@ if (Test-Path -Path "$PSScriptRoot\..\WTTLog.ps1")
 
 $CurrentUseCase = @{}
 [System.Collections.Stack] $UseCaseStack = New-Object System.Collections.Stack
-filter timestamp {"$(Get-Date -Format HH:mm:ss.ffff): $_"}
+filter timestamp {"$(Get-Date -Format "yyyy-MM-dd HH:mm:ss.ffff") $_"}
 
 
 function Log-Info
@@ -51,14 +51,11 @@ function Log-JSONReport
         [string] $Message
     )
     if ($Message)
-    {
-        if ($Message.Contains(": ["))
-        {
-            $time = $Message.Substring(0, $Message.IndexOf(": ["))
-        }    
+    {    
         if ($Message.Contains("[START]"))
         {
-            $name = $Message.Substring($Message.LastIndexOf(":") + 1).Trim().Replace("######", "").Trim()
+            $time = $Message.Substring(0, $Message.IndexOf("[")).Trim()
+            $name = $Message.Substring($Message.LastIndexOf(":") + 1).Trim()
             if ($UseCaseStack.Count)
             {
                 $nestedUseCase = @{
@@ -81,14 +78,19 @@ function Log-JSONReport
         }
         elseif ($Message.Contains("[END]"))
         {
+            $time = $Message.Substring(0, $Message.IndexOf("[")).Trim()
             $result = ""            
             if ($UseCaseStack.Peek().UseCase -and ($UseCaseStack.Peek().UseCase | Where-Object {$_.Result -eq "FAIL"}))
             {
                 $result = "FAIL" 
             }
-            else
+            elseif ($Message.Contains("[RESULT = PASS]"))
+            {
+                $result = "PASS"
+            }
+            elseif ($Message.Contains("[RESULT = FAIL]"))
             {
-                $result = $Message.Substring($Message.LastIndexOf("=") + 1).Trim().Replace("] ######", "").Trim()
+                $result = "FAIL"
             }
             $UseCaseStack.Peek().Add("Result", $result)
             $UseCaseStack.Peek().Add("EndTime", $time)            
@@ -149,6 +151,16 @@ function Get-CanaryLonghaulResult
                                             @{Expression={$pCount = ($_.Group | Where-Object Result -eq "PASS").Count; $times = ($_.Group | Where-Object Result -eq "PASS" | ForEach-Object {((Get-Date $_.EndTime) - (Get-Date $_.StartTime)).TotalMilliseconds}); $avgTime = ($times | Measure-Object -Average).Average; $sd = 0; foreach ($time in $times){$sd += [math]::Pow(($time - $avgTime), 2)}; [math]::Round(([math]::Round([math]::Sqrt($sd/$pCount), 0)/$avgTime), 0) * 100};Label="RelativeStdDev`n[Goal: <50%]"; Align = "Left"}
 }
 
+function Get-CanaryFailureStatus
+{
+    $logContent = Get-Content -Raw -Path $Global:JSONLogFile | ConvertFrom-Json
+    if ($logContent.Usecases.Result -contains "FAIL")
+    {
+        return $true
+    }
+    return $false
+}
+
 function Start-Scenario
 {
     [CmdletBinding()]
@@ -256,7 +268,7 @@ function Invoke-Usecase
         Log-Info ("Skipping Usecase: $Name")
         return
     }
-    Log-Info ("###### [START] Usecase: $Name ######`n") 
+    Log-Info ("[START] Usecase: $Name`n") 
     if ($Global:wttLogFileName)
     {
         StartTest "CanaryGate:$Name"
@@ -278,7 +290,7 @@ function Invoke-Usecase
         {
             EndTest "CanaryGate:$Name" $true
         }
-        Log-Info ("###### [END] Usecase: $Name ###### [RESULT = PASS] ######`n")
+        Log-Info ("[END] [RESULT = PASS] Usecase: $Name`n")
         return $result | Out-Null
     }
     catch [System.Exception]
@@ -287,7 +299,7 @@ function Invoke-Usecase
         Log-Info ("###### <FAULTING SCRIPTBLOCK> ######")
         Log-Info ("$UsecaseBlock")
         Log-Info ("###### </FAULTING SCRIPTBLOCK> ######")
-        Log-Error ("###### [END] Usecase: $Name ###### [RESULT = FAIL] ######`n")
+        Log-Error ("[END] [RESULT = FAIL] Usecase: $Name`n")
         if ($Global:wttLogFileName)
         {
             EndTest "CanaryGate:$Name" $false

CanaryValidator/Canary.Utilities.psm1

@@ -3,15 +3,36 @@
 
 #requires -Modules AzureStack.Connect
 
+<#
+    .SYNOPSIS
+    Add-AzureStackVMSSGalleryItem: Adds the VMSS Gallery Item to your Azure Stack Marketplace.
+    Remove-AzureStackVMSSGalleryItem: Adds the VMSS Gallery Item from your Azure Stack Marketplace.
+    Add-VMImage: Uploads a VM Image to your Azure Stack and creates a Marketplace item for it.
+    Remove-VMImage: Removes an existing VM Image from your Azure Stack.  Does not delete any 
+    maketplace items created by Add-VMImage.
+    New-Server2016VMImage: Creates and Uploads a new Server 2016 Core and / or Full Image and
+    creates a Marketplace item for it.
+    Get-VMImage: Gets a VM Image from your Azure Stack as an Administrator to view the provisioning state of the image.
+    Add-VMExtension: Uploads a VM extension to your Azure Stack.
+    Remove-VMExtension: Removes an existing VM extension from your Azure Stack.
+#>
+
 function Add-AzureStackVMSSGalleryItem {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory=$false)]
+        [ValidatePattern("^[0-9a-zA-Z]+$")]
+        [ValidateLength(1,128)]
+        [String] $Location = 'local'
+    )
 
     $rgName = "vmss.gallery"
 
-    New-AzureRmResourceGroup -Name $rgName -Location local -Force
+    New-AzureRmResourceGroup -Name $rgName -Location $Location -Force
 
     $saName = "vmssgallery"
 
-    $sa = New-AzureRmStorageAccount -ResourceGroupName $rgName -Location local -Name $saName -Type Standard_LRS
+    $sa = New-AzureRmStorageAccount -ResourceGroupName $rgName -Location $Location -Name $saName -Type Standard_LRS
 
     $cName = "gallery"
 
@@ -24,7 +45,8 @@ function Add-AzureStackVMSSGalleryItem {
 
     $fileName = "microsoft.vmss.1.3.6.azpkg"
 
-    $blob = $container| Set-AzureStorageBlobContent –File ([System.IO.Path]::GetDirectoryName($PSCommandPath) + "\" + $fileName)  –Blob $fileName -Force
+    $blob = Set-AzureStorageBlobContent –File ($PSScriptRoot + "\" + $fileName) –Blob $fileName -Container $cName -Force
+    $container = Get-AzureStorageContainer -Name $cName -ErrorAction SilentlyContinue
 
     $uri = $blob.Context.BlobEndPoint + $container.Name + "/" + $blob.Name    
 
@@ -39,19 +61,6 @@ function Remove-AzureStackVMSSGalleryItem {
     }
 }
 
-<#
-    .SYNOPSIS
-    Contains 6 functions.
-    Add-VMImage: Uploads a VM Image to your Azure Stack and creates a Marketplace item for it.
-    Remove-VMImage: Removes an existing VM Image from your Azure Stack.  Does not delete any 
-    maketplace items created by Add-VMImage.
-    New-Server2016VMImage: Creates and Uploads a new Server 2016 Core and / or Full Image and
-    creates a Marketplace item for it.
-    Get-VMImage: Gets a VM Image from your Azure Stack as an Administrator to view the provisioning state of the image.
-    Add-VMExtension: Uploads a VM extension to your Azure Stack.
-    Remove-VMExtension: Removes an existing VM extension from your Azure Stack.
-#>
-
 Function Add-VMImage{
 
     [CmdletBinding(DefaultParameterSetName='VMImageFromLocal')]
@@ -160,9 +169,9 @@ Function Add-VMImage{
     #same for storage
     $storageAccount = Get-AzureRmStorageAccount -Name $storageAccountName -ResourceGroupName $resourceGroupName -ErrorAction SilentlyContinue
     if (-not ($storageAccount)) {
-        $storageAccount = New-AzureRmStorageAccount -Name $storageAccountName -Location $location -ResourceGroupName $resourceGroupName -Type Standard_LRS
+        $storageAccount = New-AzureRmStorageAccount -Name $storageAccountName -Location $location -ResourceGroupName $resourceGroupName -Type Standard_LRS 
     }
-    Set-AzureRmCurrentStorageAccount -StorageAccountName $storageAccountName -ResourceGroupName $resourceGroupName
+    Set-AzureRmCurrentStorageAccount -StorageAccountName $storageAccountName -ResourceGroupName $resourceGroupName 
     #same for container
     $container = Get-AzureStorageContainer -Name $containerName -ErrorAction SilentlyContinue
     if (-not ($container)) {
@@ -297,11 +306,7 @@ Function Add-VMImage{
         $galleryItemURI = '{0}{1}/{2}' -f $storageAccount.PrimaryEndpoints.Blob.AbsoluteUri, $containerName,$galleryItem.Name
 
 
-        if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9"){
-            Add-AzureRMGalleryItem -GalleryItemUri $galleryItemURI
-        }else{
-            Add-AzureRMGalleryItem -SubscriptionId $subscription -GalleryItemUri $galleryItemURI -ApiVersion 2015-04-01
-        }
+        Add-AzureRMGalleryItem -GalleryItemUri $galleryItemURI
 
         #cleanup
         Remove-Item $GalleryItem
@@ -383,12 +388,7 @@ Function Remove-VMImage{
         $name = "$offer$sku"
         #Remove periods so that the offer and sku can be retrieved from the Marketplace Item name
         $name =$name -replace "\.","-"
-        if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9"){
-            Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$publisher.$name.$version"} | Remove-AzureRMGalleryItem 
-        }else{
-            Get-AzureRMGalleryItem -ApiVersion 2015-04-01 | Where-Object {$_.Name -contains "$publisher.$name.$version"} | Remove-AzureRMGalleryItem -ApiVersion 2015-04-01
-        }
-        
+        Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$publisher.$name.$version"} | Remove-AzureRMGalleryItem 
     }
 
 }
@@ -431,7 +431,8 @@ function New-Server2016VMImage {
         [Parameter()]
         [bool] $CreateGalleryItem = $true,
 
-        [switch] $Net35
+        [Parameter()]
+        [bool] $Net35 = $true
     )
     begin {
         function CreateWindowsVHD {
@@ -460,7 +461,7 @@ function New-Server2016VMImage {
                 Write-Verbose -Message "Preparing VHD"
 
                 $VHDMount = Mount-DiskImage -ImagePath $VHDPath -PassThru -ErrorAction Stop
-                $disk = $VHDMount | Get-DiskImage | Get-Disk -ErrorAction Stop
+                $disk = $VHDMount | Get-DiskImage -ErrorAction Stop | Get-Disk -ErrorAction SilentlyContinue
                 $disk | Initialize-Disk -PartitionStyle MBR -ErrorAction Stop
                 $partition = New-Partition -UseMaximumSize -Disknumber $disk.DiskNumber -IsActive:$True -AssignDriveLetter -ErrorAction Stop
                 $volume = Format-Volume -Partition $partition -FileSystem NTFS -confirm:$false -ErrorAction Stop
@@ -677,7 +678,7 @@ Function CreateGalleyItem{
         [string] $title,
         [string] $description
     )
-    $workdir = '{0}\{1}' -f $env:TEMP, [System.Guid]::NewGuid().ToString()
+    $workdir = '{0}{1}' -f [System.IO.Path]::GetTempPath(), [System.Guid]::NewGuid().ToString() 
     New-Item $workdir -ItemType Directory | Out-Null
     $basePath = (Get-Module AzureStack.ComputeAdmin).ModuleBase
     $compressedGalleryItemPath = Join-Path $basePath 'CustomizedVMGalleryItem.azpkg'
@@ -818,7 +819,6 @@ Function Add-VMExtension{
 
         [Parameter(Mandatory=$true, ParameterSetName='VMExtensionFromLocal')]
         [Parameter(Mandatory=$true, ParameterSetName='VMExtesionFromAzure')]
-        [ValidatePattern(“\d+\.\d+\.\d+”)]
         [String] $version,
 
         [Parameter(ParameterSetName='VMExtensionFromLocal')]
@@ -904,7 +904,7 @@ Function Add-VMExtension{
     $uri = $armEndpoint + '/subscriptions/' + $subscription + '/providers/Microsoft.Compute.Admin/locations/' + $location + '/artifactTypes/VMExtension/publishers/' + $publisher
     $uri = $uri + '/types/' + $type + '/versions/' + $version + '?api-version=2015-12-01-preview'
 
-    Log-Info $uri
+    Write-Verbose $uri
 
     #building request body JSON
     if($pscmdlet.ParameterSetName -eq "VMExtensionFromLocal") {
@@ -958,10 +958,9 @@ Function Remove-VMExtension{
         [String] $publisher,
 
         [Parameter(Mandatory=$true)]
-        [ValidatePattern(“\d+\.\d+\.\d+”)]
         [String] $version,
 
-        [String] $type = "CustomScriptExtension",
+        [String] $type,
 
         [Parameter(Mandatory=$true)]
         [ValidateSet('Windows' ,'Linux')]
@@ -989,7 +988,7 @@ Function Remove-VMExtension{
     $uri = $armEndpoint + '/subscriptions/' + $subscription + '/providers/Microsoft.Compute.Admin/locations/' + $location + '/artifactTypes/VMExtension/publishers/' + $publisher
     $uri = $uri + '/types/' + $type + '/versions/' + $version + '?api-version=2015-12-01-preview'
 
-    Log-Info $uri
+    Write-Verbose $uri
 
     try{
         Invoke-RestMethod -Method DELETE -Uri $uri -ContentType 'application/json' -Headers $headers

ComputeAdmin/AzureStack.ComputeAdmin.psm1

@@ -15,20 +15,22 @@ Import-Module ..\Connect\AzureStack.Connect.psm1
 Import-Module .\AzureStack.ComputeAdmin.psm1
 ```
 
-Adding a VM Image requires that you obtain the GUID value of your Directory Tenant. If you know the non-GUID form of the Azure Active Directory Tenant used to deploy your Azure Stack instance, you can retrieve the GUID value with the following:
+You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-$aadTenant = Get-AADTenantGUID -AADTenantName "<myaadtenant>.onmicrosoft.com" 
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
-Otherwise, it can be retrieved directly from your Azure Stack deployment. This method can also be used for AD FS. First, add your host to the list of TrustedHosts:
+Adding a VM Image requires that you obtain the value of your Directory Tenant ID. For **Azure Active Directory** environments provide your directory tenant name:
+
 ```powershell
-Set-Item wsman:\localhost\Client\TrustedHosts -Value "<Azure Stack host address>" -Concatenate
+$TenantID = Get-DirectoryTenantID -AADTenantName "<mydirectorytenant>.onmicrosoft.com" -EnvironmentName AzureStackAdmin 
 ```
-Then execute the following:
+
+For **ADFS** environments use the following:
+
 ```powershell
-$Password = ConvertTo-SecureString "<Admin password provided when deploying Azure Stack>" -AsPlainText -Force
-$AadTenant = Get-AzureStackAadTenant  -HostComputer <Host IP Address> -Password $Password
+$TenantID = Get-DirectoryTenantID -ADFS -EnvironmentName AzureStackAdmin 
 ```
 
 ## Add the WS2016 Evaluation VM Image 
@@ -37,16 +39,10 @@ The New-Server2016VMImage allows you to add a Windows Server 2016 Evaluation VM
 
 As a prerequisite, you need to obtain the Windows Server 2016 Evaluation ISO which can be found [here](https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2016).
 
-You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
-
-```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
-```
-
 An example usage is the following:
 ```powershell
 $ISOPath = "<Path to ISO>"
-New-Server2016VMImage -ISOPath $ISOPath -TenantId $aadTenant -EnvironmentName "AzureStackAdmin"
+New-Server2016VMImage -ISOPath $ISOPath -TenantId $TenantID -EnvironmentName "AzureStackAdmin"
 ```
 Please make sure to specify the correct administrator ARM endpoint for your environment.
 
@@ -116,7 +112,7 @@ An example usage is the following:
 
 ```powershell
 $path = "<Path to vm extension zip>"
-Add-VMExtension -publisher "Publisher" -type "Type" -version $version -extensionLocalPath $path -osType Windows -tenantID $aadTenant -azureStackCredentials $azureStackCredentials -EnvironmentName "AzureStackAdmin"
+Add-VMExtension -publisher "Publisher" -type "Type" -version "1.0.0.0" -extensionLocalPath $path -osType Windows -tenantID $TenantID -azureStackCredentials $azureStackCredentials -EnvironmentName "AzureStackAdmin"
 ```
 
 
@@ -130,7 +126,7 @@ Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://a
 Run the below command to remove an uploaded VM extension.
 
 ```powershell
-Remove-VMExtension -publisher "Publisher" -type "Type" -version "1.0.0.0" -osType Windows -tenantID $tenantId -azureStackCredentials $azureStackCredentials -EnvironmentName "AzureStackAdmin"
+Remove-VMExtension -publisher "Publisher" -type "Type" -version "1.0.0.0" -osType Windows -tenantID $TenantID -azureStackCredentials $azureStackCredentials -EnvironmentName "AzureStackAdmin"
 ```
 
 ## VM Scale Set gallery item
@@ -144,20 +140,21 @@ VM Scale Set allows deployment of multi-VM collections. To add a gallery item wi
 3. Add VM Scale Set gallery item as follows
 
 ```powershell
-$Tenant = "<AAD Tenant Id used to connect to AzureStack>"
+$TenantId = "<AAD Tenant Id used to connect to AzureStack>"
 $Arm = "<AzureStack administrative Azure Resource Manager endpoint URL>"
+$Location = "<The location name of your AzureStack Environment>"
 
 Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint $Arm 
 
 $Password = ConvertTo-SecureString -AsPlainText -Force "<your AzureStack admin user password>"
 $User = "<your AzureStack admin user name>"
 $Creds =  New-Object System.Management.Automation.PSCredential $User, $Password
 
-Login-AzureRmAccount -EnvironmentName AzureStackAdmin -Credential $Creds -TenantId $Tenant
+Login-AzureRmAccount -EnvironmentName AzureStackAdmin -Credential $Creds -TenantId $TenantId
 
 Select-AzureRmSubscription -SubscriptionName "Default Provider Subscription"
 
-Add-AzureStackVMSSGalleryItem
+Add-AzureStackVMSSGalleryItem -Location $Location
 ```
 To remove VM Scale Set gallery item run the following command:
 

ComputeAdmin/README.md

@@ -85,13 +85,7 @@ InModuleScope $script:ModuleName {
         It 'Remove-VMImage and Removing Marketplace Item should successfully complete' {
             { 
                 Remove-VMImage -publisher $publisher -offer $offer -sku $gallerySku -version $version -tenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredential $stackLoginCreds
-                if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9"){
-                    Get-AzureRMGalleryItem
-                    Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$publisher.$offer$gallerySku.$version"} | Remove-AzureRMGalleryItem 
-                }else{
-                    Get-AzureRMGalleryItem -ApiVersion 2015-04-01
-                    Get-AzureRMGalleryItem -ApiVersion 2015-04-01 | Where-Object {$_.Name -contains "$publisher.$offer$gallerySku.$version"} | Remove-AzureRMGalleryItem -ApiVersion 2015-04-01
-                }
+                Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$publisher.$offer$gallerySku.$version"} | Remove-AzureRMGalleryItem 
             } | Should Not Throw
         }
 
@@ -109,11 +103,7 @@ InModuleScope $script:ModuleName {
                 Remove-VMImage -publisher $newPub -offer $newOffer -sku $newSKU -version $newVersion -tenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredential $stackLoginCreds
                 $GalleryItemName = "$newOffer$newSKU"
                 $GalleryItemName = $GalleryItemName -replace "\.","-"
-                if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9"){
-                    Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$newPub.$GalleryItemName.$newVersion"} | Remove-AzureRMGalleryItem
-                }else{
-                    Get-AzureRMGalleryItem -ApiVersion 2015-04-01 | Where-Object {$_.Name -contains "$newPub.$GalleryItemName.$newVersion"} | Remove-AzureRMGalleryItem -ApiVersion 2015-04-01
-                }
+                Get-AzureRMGalleryItem | Where-Object {$_.Name -contains "$newPub.$GalleryItemName.$newVersion"} | Remove-AzureRMGalleryItem
             } | Should Not Throw
         }