Merge pull request #93 from KirtiWandhare/patch-7

Use case for Linux and new version for CRP

Author: knithinc

CanaryValidator/Canary.Tests.ps1

@@ -34,7 +34,15 @@ param (
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateScript({Test-Path -Path $_})]
-    [string]$WindowsVHDPath, 
+    [string]$WindowsVHDPath,
+    [parameter(HelpMessage="Path for Linux VHD")]
+    [Parameter(ParameterSetName="default", Mandatory=$false)]
+    [Parameter(ParameterSetName="tenant", Mandatory=$false)]
+    [string] $LinuxImagePath = "https://partner-images.canonical.com/azure/azure_stack/ubuntu-14.04-LTS-microsoft_azure_stack-20161208-9.vhd.zip",
+    [parameter(HelpMessage="Linux OS sku")]
+    [Parameter(ParameterSetName="default", Mandatory=$false)]
+    [Parameter(ParameterSetName="tenant", Mandatory=$false)]
+    [string] $LinuxOSSku = "14.04.3-LTS",
     [parameter(HelpMessage="Fully qualified domain name of the azure stack environment. Ex: contoso.com")]
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
@@ -92,21 +100,17 @@ Import-Module -Name $PSScriptRoot\..\Connect\AzureStack.Connect.psm1 -Force
 Import-Module -Name $PSScriptRoot\..\Infrastructure\AzureStack.Infra.psm1 -Force
 Import-Module -Name $PSScriptRoot\..\ComputeAdmin\AzureStack.ComputeAdmin.psm1 -Force
 
-$storageAccName     = $CanaryUtilitiesRG + "sa"
-$storageCtrName     = $CanaryUtilitiesRG + "sc"
-$keyvaultName       = $CanaryUtilitiesRG + "kv"
-$keyvaultCertName   = "ASCanaryVMCertificate"
-$kvSecretName       = $keyvaultName.ToLowerInvariant() + "secret"
-$VMAdminUserName    = "CanaryAdmin" 
-$VMAdminUserPass    = "CanaryAdmin@123"
-$canaryUtilPath     = Join-Path -Path $env:TEMP -ChildPath "CanaryUtilities$((Get-Date).ToString("-yyMMdd-hhmmss"))"
-
-if(-not $EnvironmentDomainFQDN)
-{
-    $endptres = Invoke-RestMethod "${AdminArmEndpoint}/metadata/endpoints?api-version=1.0" -ErrorAction Stop 
-    $EnvironmentDomainFQDN = $endptres.portalEndpoint
-    $EnvironmentDomainFQDN = $EnvironmentDomainFQDN.Replace($EnvironmentDomainFQDN.Split(".")[0], "").TrimEnd("/").TrimStart(".") 
-}
+$storageAccName         = $CanaryUtilitiesRG + "sa"
+$storageCtrName         = $CanaryUtilitiesRG + "sc"
+$keyvaultName           = $CanaryUtilitiesRG + "kv"
+$keyvaultCertName       = "ASCanaryVMCertificate"
+$kvSecretName           = $keyvaultName.ToLowerInvariant() + "secret"
+$VMAdminUserName        = "CanaryAdmin" 
+$VMAdminUserPass        = "CanaryAdmin@123"
+$canaryUtilPath         = Join-Path -Path $env:TEMP -ChildPath "CanaryUtilities$((Get-Date).ToString("-yyMMdd-hhmmss"))"
+$linuxImagePublisher    = "Canonical"
+$linuxImageOffer        = "UbuntuServer"
+$linuxImageVersion      = "1.0.0"
 
 $runCount = 1
 while ($runCount -le $NumberOfIterations)
@@ -127,6 +131,13 @@ while ($runCount -le $NumberOfIterations)
     $SvcAdminEnvironmentName = $EnvironmentName + "-SVCAdmin"
     $TntAdminEnvironmentName = $EnvironmentName + "-Tenant"
 
+    if(-not $EnvironmentDomainFQDN)
+    {
+        $endptres = Invoke-RestMethod "${AdminArmEndpoint}/metadata/endpoints?api-version=1.0" -ErrorAction Stop 
+        $EnvironmentDomainFQDN = $endptres.portalEndpoint
+        $EnvironmentDomainFQDN = $EnvironmentDomainFQDN.Replace($EnvironmentDomainFQDN.Split(".")[0], "").TrimEnd("/").TrimStart(".") 
+    }
+
     Invoke-Usecase -Name 'CreateAdminAzureStackEnv' -Description "Create Azure Stack environment $SvcAdminEnvironmentName" -UsecaseBlock `
     {
         $asEndpoints = GetAzureStackEndpoints -EnvironmentDomainFQDN $EnvironmentDomainFQDN -ArmEndpoint $AdminArmEndpoint 
@@ -144,7 +155,7 @@ while ($runCount -le $NumberOfIterations)
 
     Invoke-Usecase -Name 'LoginToAzureStackEnvAsSvcAdmin' -Description "Login to $SvcAdminEnvironmentName as service administrator" -UsecaseBlock `
     {     
-        Add-AzureRmAccount -EnvironmentName $SvcAdminEnvironmentName -Credential $ServiceAdminCredentials -TenantId $AADTenantID -ErrorAction Stop
+        Add-AzureRmAccount -EnvironmentName $SvcAdminEnvironmentName -Credential $ServiceAdminCredentials -TenantId $TenantID -ErrorAction Stop
     }
 
     Invoke-Usecase -Name 'SelectDefaultProviderSubscription' -Description "Select the Default Provider Subscription" -UsecaseBlock `
@@ -154,19 +165,35 @@ while ($runCount -le $NumberOfIterations)
         {
             $defaultSubscription | Select-AzureRmSubscription
         }
-    }
-
+    } 
+       
     if ($WindowsISOPath)
     {
         Invoke-Usecase -Name 'UploadWindows2016ImageToPIR' -Description "Uploads a windows server 2016 image to the PIR" -UsecaseBlock `
         {
             if (-not (Get-AzureRmVMImage -Location $ResourceLocation -PublisherName "MicrosoftWindowsServer" -Offer "WindowsServer" -Sku "2016-Datacenter-Core" -ErrorAction SilentlyContinue))
             {
-                New-Server2016VMImage -ISOPath $WindowsISOPath -TenantId $AADTenantID -ArmEndpoint $AdminArmEndpoint -Version Core -AzureStackCredentials $ServiceAdminCredentials -CreateGalleryItem $false
+                New-Server2016VMImage -ISOPath $WindowsISOPath -TenantId $TenantID -ArmEndpoint $AdminArmEndpoint -Version Core -AzureStackCredentials $ServiceAdminCredentials -CreateGalleryItem $false
+            }
+        }
+    }
+
+    Invoke-Usecase -Name 'UploadLinuxImageToPIR' -Description "Uploads Linux image to the PIR" -UsecaseBlock `
+    {
+        if (-not (Get-AzureRmVMImage -Location $ResourceLocation -PublisherName $linuxImagePublisher -Offer $linuxImageOffer -Sku $LinuxOSSku -ErrorAction SilentlyContinue))
+        {
+            $CanaryCustomImageFolder = Join-Path -Path $env:TMP -childPath "CanaryCustomImage$((Get-Date).ToString("-yyMMdd-hhmmss"))"
+            if (Test-Path -Path $CanaryCustomImageFolder)
+            {
+                Remove-Item -Path $CanaryCustomImageFolder -Force -Recurse 
             }
+            New-Item -Path $CanaryCustomImageFolder -ItemType Directory
+            $CustomVHDPath = CopyImage -ImagePath $LinuxImagePath -OutputFolder $CanaryCustomImageFolder
+            Add-VMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -osDiskLocalPath $CustomVHDPath -osType Linux -tenantID $TenantID -azureStackCredentials $ServiceAdminCredentials -CreateGalleryItem $false -ArmEndpoint $AdminArmEndpoint
+            Remove-Item $CanaryCustomImageFolder -Recurse
         }
     }
-    
+
     if ($TenantAdminCredentials)
     {
         $subscriptionRGName                 = "ascansubscrrg" + [Random]::new().Next(1,999)
@@ -205,9 +232,9 @@ while ($runCount -le $NumberOfIterations)
 
         Invoke-Usecase -Name 'CreateTenantPlan' -Description "Create a tenant plan" -UsecaseBlock `
         {      
-            $asToken = NewAzureStackToken -AADTenantId $AADTenantId -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndpoint
+            $asToken = NewAzureStackToken -AADTenantId $TenantID -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndpoint
             $defaultSubscription = Get-AzureRmSubscription -SubscriptionName "Default Provider Subscription" -ErrorAction Stop            
-            $asCanaryQuotas = NewAzureStackDefaultQuotas -ResourceLocation $ResourceLocation -SubscriptionId $defaultSubscription.SubscriptionId -AADTenantID $AADTenantID -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndPoint
+            $asCanaryQuotas = NewAzureStackDefaultQuotas -ResourceLocation $ResourceLocation -SubscriptionId $defaultSubscription.SubscriptionId -AADTenantID $TenantID -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndPoint
             New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -QuotaIds $asCanaryQuotas -ErrorAction Stop
 
         }
@@ -232,7 +259,7 @@ while ($runCount -le $NumberOfIterations)
 
         Invoke-Usecase -Name 'LoginToAzureStackEnvAsTenantAdmin' -Description "Login to $TntAdminEnvironmentName as tenant administrator" -UsecaseBlock `
         {     
-            Add-AzureRmAccount -EnvironmentName $TntAdminEnvironmentName -Credential $TenantAdminCredentials -TenantId $AADTenantID -ErrorAction Stop
+            Add-AzureRmAccount -EnvironmentName $TntAdminEnvironmentName -Credential $TenantAdminCredentials -TenantId $TenantID -ErrorAction Stop
         }
 
         Invoke-Usecase -Name 'CreateTenantSubscription' -Description "Create a subcsription for the tenant and select it as the current subscription" -UsecaseBlock `
@@ -404,14 +431,17 @@ while ($runCount -le $NumberOfIterations)
         }        
 
         $templateDeploymentName = "CanaryVMDeployment"
-        $parameters = @{"VMAdminUserName"     = $VMAdminUserName;
-                        "VMAdminUserPassword" = $VMAdminUserPass;
-                        "ASCanaryUtilRG"      = $CanaryUtilitiesRG;
-                        "ASCanaryUtilSA"      = $storageAccName;
-                        "ASCanaryUtilSC"      = $storageCtrName;
-                        "vaultName"           = $keyvaultName;
-                        "windowsOSVersion"    = $osVersion;
-                        "secretUrlWithVersion"= $kvSecretId}   
+        $parameters = @{"VMAdminUserName"       = $VMAdminUserName;
+                        "VMAdminUserPassword"   = $VMAdminUserPass;
+                        "ASCanaryUtilRG"        = $CanaryUtilitiesRG;
+                        "ASCanaryUtilSA"        = $storageAccName;
+                        "ASCanaryUtilSC"        = $storageCtrName;
+                        "vaultName"             = $keyvaultName;
+                        "windowsOSVersion"      = $osVersion;
+                        "secretUrlWithVersion"  = $kvSecretId;
+                        "LinuxImagePublisher"   = $linuxImagePublisher;
+                        "LinuxImageOffer"       = $linuxImageOffer;
+                        "LinuxImageSku"         = $LinuxOSSku}   
         $templateError = Test-AzureRmResourceGroupDeployment -ResourceGroupName $CanaryVMRG -TemplateFile .\azuredeploy.json -TemplateParameterObject $parameters
         if (-not $templateError)
         {
@@ -423,11 +453,12 @@ while ($runCount -le $NumberOfIterations)
         }
     }
 
-    $canaryVMList = @()
-    $canaryVMList = Invoke-Usecase -Name 'QueryTheVMsDeployed' -Description "Queries for the VMs that were deployed using the ARM template" -UsecaseBlock `
+    $canaryWindowsVMList = @()
+    $canaryWindowsVMList = Invoke-Usecase -Name 'QueryTheVMsDeployed' -Description "Queries for the VMs that were deployed using the ARM template" -UsecaseBlock `
     {
-        $canaryVMList = @()
+        $canaryWindowsVMList = @()        
         $vmList = Get-AzureRmVm -ResourceGroupName $CanaryVMRG -ErrorAction Stop
+        $vmList = $vmList | Where-Object {$_.OSProfile.WindowsConfiguration}
         foreach ($vm in $vmList)
         {
             $vmObject = New-Object -TypeName System.Object
@@ -455,21 +486,21 @@ while ($runCount -le $NumberOfIterations)
             }
             $vmObject | Add-Member -Type NoteProperty -Name VMPrivateIP -Value $privateIP -Force
             $vmObject | Add-Member -Type NoteProperty -Name VMPublicIP -Value $publicIP -Force
-            $canaryVMList += $vmObject 
+            $canaryWindowsVMList += $vmObject 
         }
-        $canaryVMList
+        $canaryWindowsVMList
     }
-    if ($canaryVMList)
+    if ($canaryWindowsVMList)
     {   
-        $canaryVMList | Format-Table -AutoSize    
-        foreach($vm in $canaryVMList)
+        $canaryWindowsVMList | Format-Table -AutoSize    
+        foreach($vm in $canaryWindowsVMList)
         {
-            if ($vm.VMPublicIP)
+            if ($vm.VMPublicIP -and $vm.VMName.EndsWith("VM1", 'CurrentCultureIgnoreCase'))
             {
                 $publicVMName = $vm.VMName
                 $publicVMIP = $vm.VMPublicIP[0]
             }
-            if ((-not ($vm.VMPublicIP)) -and ($vm.VMPrivateIP))
+            if ((-not ($vm.VMPublicIP)) -and ($vm.VMPrivateIP) -and ($vm.VMName.EndsWith("VM2", 'CurrentCultureIgnoreCase')))
             {
                 $privateVMName = $vm.VMName
                 $privateVMIP = $vm.VMPrivateIP[0]
@@ -698,7 +729,7 @@ while ($runCount -le $NumberOfIterations)
 
                 Invoke-Usecase -Name 'LoginToAzureStackEnvAsSvcAdminForCleanup' -Description "Login to $SvcAdminEnvironmentName as service administrator to remove the subscription resource group" -UsecaseBlock `
                 {     
-                    Add-AzureRmAccount -EnvironmentName $SvcAdminEnvironmentName -Credential $ServiceAdminCredentials -TenantId $AADTenantID -ErrorAction Stop
+                    Add-AzureRmAccount -EnvironmentName $SvcAdminEnvironmentName -Credential $ServiceAdminCredentials -TenantId $TenantID -ErrorAction Stop
                 }
 
                 Invoke-Usecase -Name 'DeleteSubscriptionResourceGroup' -Description "Delete the resource group that contains subscription resources" -UsecaseBlock `

CanaryValidator/Canary.Utilities.psm1

@@ -703,3 +703,73 @@ function GetAzureStackBlobUri
         throw $_.Exception.Message    
     }
 }
+
+function DownloadFile
+{
+    param
+    (
+        [Parameter(Mandatory=$true)]
+        [String] $FileUrl,
+        [Parameter(Mandatory=$true)]
+        [String] $OutputFolder
+    )
+    $retries = 20
+    $lastException = $null
+    $success = $false
+    
+    while($success -eq $false -and $retries -ge 0)
+    {
+        $success = $true
+        try 
+        {
+            $outputFile = Join-Path $OutputFolder (Split-Path -Path $FileUrl -Leaf)
+            $wc = New-Object System.Net.WebClient
+            $wc.DownloadFile($FileUrl, $outputFile) | Out-Null
+        }
+        catch
+        {
+            $success = $false            
+            $lastException = $_
+        }
+        $retries--
+        if($success -eq $false)
+        {
+            Start-Sleep -Seconds 10                        
+        }
+    }
+
+    if($success -eq $false)
+    {
+        Write-Output "Timed out trying to download $FileUrl"
+        throw $lastException
+    }
+
+    return $outputFile
+}
+
+function CopyImage
+{
+    param
+    (
+        [Parameter(Mandatory=$true)]
+        [String] $ImagePath,
+        [Parameter(Mandatory=$true)]
+        [String] $OutputFolder
+    )
+
+    if (Test-Path $ImagePath)
+    {
+        Copy-Item $ImagePath $OutputFolder
+        $outputfile = Join-Path $OutputFolder (Split-Path $ImagePath -Leaf)
+    }
+    elseif ($ImagePath.StartsWith("http"))
+    {
+        $outputfile = DownloadFile -FileUrl $ImagePath -OutputFolder $OutputFolder
+    }
+    if (([System.IO.FileInfo]$outputfile).Extension -eq ".zip")
+    {
+        Expand-Archive -Path $outputfile -DestinationPath $OutputFolder -Force   
+    }
+
+    return (Get-ChildItem -Path $OutputFolder -File | Where-Object {$_.Extension -eq ".vhd" -or $_.Extension -eq ".vhdx"})[0].FullName
+}