Merge branch 'vnext' into environmentname

Author: MatthewMcGlynn

CanaryValidator/Canary.Tests.ps1

@@ -72,7 +72,7 @@ param (
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]
     [string]$ResourceLocation = "local",
-    [parameter(HelpMessage="Flag to cleanup resources after exception")]
+    [parameter(HelpMessage="Flag to indicate whether to continue Canary after an exception")]
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [bool] $ContinueOnFailure = $false,
@@ -95,7 +95,7 @@ param (
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]
-    [string]$CanaryLogFileName    
+    [string]$CanaryLogFileName = "Canary-Basic-$((Get-Date).Ticks).log"   
 )
 
 #Requires -Modules AzureRM
@@ -118,6 +118,7 @@ $linuxImageOffer        = "UbuntuServer"
 $linuxImageVersion      = "1.0.0"
 
 $runCount = 1
+$tmpLogname = $CanaryLogFileName
 while ($runCount -le $NumberOfIterations)
 {
     if (Test-Path -Path $canaryUtilPath)
@@ -128,12 +129,9 @@ while ($runCount -le $NumberOfIterations)
 
     #
     # Start Canary 
-    #
-    if (-not $CanaryLogFileName)
-    {
-        $CanaryLogFileName  = "Canary-Basic-$runCount-$((Get-Date).Ticks).log"
-    }    
-    $CanaryLogFile      = $CanaryLogPath + "\$CanaryLogFileName"
+    #  
+    $CanaryLogFileName = [IO.Path]::GetFileNameWithoutExtension($tmpLogname) + "-$runCount" + [IO.Path]::GetExtension($tmpLogname)
+    $CanaryLogFile = Join-Path -Path $CanaryLogPath -ChildPath $CanaryLogFileName
 
     Start-Scenario -Name 'Canary' -Type 'Basic' -LogFilename $CanaryLogFile -ContinueOnFailure $ContinueOnFailure
 
@@ -207,7 +205,7 @@ while ($runCount -le $NumberOfIterations)
         catch
         {
             Remove-Item -Path $CanaryCustomImageFolder -Force -Recurse
-            throw [System.Exception]"Failed to upload the linux image to PIR. `n$_.Exception.Message"
+	    throw [System.Exception]"Failed to upload the linux image to PIR. `n$($_.Exception.Message)"            
         }
     }
 
@@ -217,7 +215,7 @@ while ($runCount -le $NumberOfIterations)
         $tenantPlanName                     = "ascantenantplan" + [Random]::new().Next(1,999)        
         $tenantOfferName                    = "ascantenantoffer" + [Random]::new().Next(1,999)
         $tenantSubscriptionName             = "ascanarytenantsubscription" + [Random]::new().Next(1,999)            
-        $canaryDefaultTenantSubscription    = "canarytenantdefaultsubscription"
+        $canaryDefaultTenantSubscription    = "canarytenantdefaultsubscription" + [Random]::new().Next(1,999) 
 
         if (-not $TenantArmEndpoint)
         {

ComputeAdmin/AzureStack.ComputeAdmin.psm1

@@ -3,6 +3,42 @@
 
 #requires -Modules AzureStack.Connect
 
+function Add-AzureStackVMSSGalleryItem {
+
+    $rgName = "vmss.gallery"
+
+    New-AzureRmResourceGroup -Name $rgName -Location local -Force
+
+    $saName = "vmssgallery"
+
+    $sa = New-AzureRmStorageAccount -ResourceGroupName $rgName -Location local -Name $saName -Type Standard_LRS
+
+    $cName = "gallery"
+
+    Set-AzureRmCurrentStorageAccount -StorageAccountName $saName -ResourceGroupName $rgName
+
+    $container = Get-AzureStorageContainer -Name $cName -ErrorAction SilentlyContinue
+    if (-not ($container)) {
+        New-AzureStorageContainer -Name $cName -Permission Blob
+    }
+    
+    $fileName = "microsoft.vmss.1.3.6.azpkg"
+
+    $blob = $container| Set-AzureStorageBlobContent –File ([System.IO.Path]::GetDirectoryName($PSCommandPath) + "\" + $fileName)  –Blob $fileName -Force
+
+    $uri = $blob.Context.BlobEndPoint + $container.Name + "/" + $blob.Name    
+
+     Add-AzureRMGalleryItem -GalleryItemUri $uri
+}
+
+function Remove-AzureStackVMSSGalleryItem {
+    $item = Get-AzureRMGalleryItem -Name "microsoft.vmss.1.3.6"
+    if($item) {
+        $request = $item | Remove-AzureRMGalleryItem
+        $item
+    }
+}
+
 <#
     .SYNOPSIS
     Contains 6 functions.

ComputeAdmin/README.md

@@ -119,6 +119,7 @@ $path = "<Path to vm extension zip>"
 Add-VMExtension -publisher "Publisher" -type "Type" -version $version -extensionLocalPath $path -osType Windows -tenantID $aadTenant -azureStackCredentials $azureStackCredentials -EnvironmentName "AzureStackAdmin"
 ```
 
+
 # Remove a VM extension with PowerShell
 
 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.
@@ -130,4 +131,39 @@ 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"
-```
+```
+
+## VM Scale Set gallery item
+
+VM Scale Set allows deployment of multi-VM collections. To add a gallery item with VM Scale Set:
+
+1. Add evaluation Windows Server 2016 image using New-Server2016VMImage as described above.
+
+2. For linux support, download Ubuntu Server 16.04 and add it using Add-VmImage with the following parameters -publisher "Canonical" -offer "UbuntuServer" -sku "16.04-LTS"
+
+3. Add VM Scale Set gallery item as follows
+
+```powershell
+$Tenant = "<AAD Tenant Id used to connect to AzureStack>"
+$Arm = "<AzureStack administrative Azure Resource Manager endpoint URL>"
+
+Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint $Arm -AadTenant $Tenant
+
+$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
+
+Select-AzureRmSubscription -SubscriptionName "Default Provider Subscription"
+
+Add-AzureStackVMSSGalleryItem
+```
+To remove VM Scale Set gallery item run the following command:
+
+```powershell
+Remove-AzureStackVMSSGalleryItem
+```
+
+Note that gallery item is not removed immediately. You could run the above command several times to determine when the item is actually gone.
+

ComputeAdmin/microsoft.vmss.1.3.6.azpkg

@@ -19,7 +19,7 @@ Import-Module .\AzureStack.Connect.psm1
 The [Connect to Azure Stack](https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-connect-azure-stack) document describes ways to connect to your Azure Stack Proof of Concept environment.
 
 One method is to establish a split tunnel VPN connection to an Azure Stack PoC. 
-This allows your client computer to become part of the Azure Stack PoC network system and therefore resolve [https://portal.azurestack.local](https://portal.azurestack.local), api.azurestack.local, *.blob.azurestack.local and so on. 
+This allows your client computer to become part of the Azure Stack PoC network system and therefore resolve Azure Stack endpoints. 
 
 The tool will also download root certificate of the targeted Azure Stack PoC instance locally to your client computer. 
 This will ensure that SSL sites of the target Azure Stack installation are trusted by your client when accessed from the browser or from the command-line tools.