Merge pull request #188 from Azure/mergebranch

Adding changes in master to vnext branch

Author: MatthewMcGlynn

CanaryValidator/Canary.Tests.ps1

@@ -106,7 +106,7 @@ param (
     [switch]$ListAvailable     
 )
 
-#Requires -Modules AzureRM
+#requires -Modules AzureRM.Profile, AzureRM.AzureStackAdmin
 #Requires -RunAsAdministrator
 Import-Module -Name $PSScriptRoot\Canary.Utilities.psm1 -Force -DisableNameChecking
 Import-Module -Name $PSScriptRoot\..\Connect\AzureStack.Connect.psm1 -Force

ComputeAdmin/AzureStack.ComputeAdmin.psm1

@@ -23,8 +23,10 @@ function Add-AzureStackVMSSGalleryItem {
     }
 
     $fileName = "microsoft.vmss.1.3.6.azpkg"
+    $basePath = (Get-Module AzureStack.ComputeAdmin).ModuleBase
 
-    $blob = $container| Set-AzureStorageBlobContent –File ([System.IO.Path]::GetDirectoryName($PSCommandPath) + "\" + $fileName)  –Blob $fileName -Force
+    $blob = Set-AzureStorageBlobContent –File ($basePath + "\" + $fileName) –Blob $fileName -Container $cName -Force
+    $container = Get-AzureStorageContainer -Name $cName -ErrorAction SilentlyContinue
 
     $uri = $blob.Context.BlobEndPoint + $container.Name + "/" + $blob.Name    
 
@@ -160,9 +162,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 +299,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 +381,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 +424,8 @@ function New-Server2016VMImage {
         [Parameter()]
         [bool] $CreateGalleryItem = $true,
 
-        [switch] $Net35
+        [Parameter()]
+        [bool] $Net35 = $true
     )
     begin {
         function CreateWindowsVHD {
@@ -460,7 +454,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
@@ -818,7 +812,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 +897,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 +951,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 +981,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/README.md

@@ -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

ComputeAdmin/Tests/ComputeAdmin.Tests.ps1

@@ -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
         }
 

Connect/AzureStack.Connect.psm1

@@ -2,7 +2,7 @@
 # See LICENSE.txt in the project root for license information.
 
 #requires -Version 4.0
-#requires -Modules AzureRM.Profile, VpnClient, AzureStack
+#requires -Modules AzureRM.Profile, VpnClient, AzureRM.AzureStackAdmin
 
 <#
     .SYNOPSIS
@@ -128,7 +128,7 @@ function Add-AzureStackAzureRmEnvironment {
     $armEnv = Get-AzureRmEnvironment -Name $Name
     if($armEnv -ne $null) {
         Write-Verbose "Updating AzureRm environment $Name" -Verbose
-        Remove-AzureRmEnvironment -Name $Name | Out-Null
+        Remove-AzureRmEnvironment -Name $Name -Force | Out-Null
     }
     else {
         Write-Verbose "Adding AzureRm environment $Name" -Verbose

Connect/README.md

@@ -70,44 +70,40 @@ See the [Azure Stack Install PowerShell](https://docs.microsoft.com/en-us/azure/
 
 AzureRM cmdlets can be targeted at multiple Azure clouds such as Azure China, Government, and Azure Stack.
 
-Connecting 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:
+To target your Azure Stack instance as a tenant, an AzureRM environment needs to be registered as follows. The ARM endpoint below is the tenant default for a one-node environment.
 
 ```powershell
-$aadTenant = Get-AADTenantGUID -AADTenantName "<myaadtenant>.onmicrosoft.com" 
+Add-AzureStackAzureRmEnvironment -Name AzureStack -ArmEndpoint "https://management.local.azurestack.external" 
 ```
 
-Otherwise, your home directory 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:
-```powershell
-Set-Item wsman:\localhost\Client\TrustedHosts -Value "<Azure Stack host address>" -Concatenate
-```
-Then execute the following:
+To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
+
 ```powershell
-$Password = ConvertTo-SecureString "<Admin password provided when deploying Azure Stack>" -AsPlainText -Force
-$AadTenant = Get-AzureStackAadTenant  -HostComputer <Host IP Address> -Password $Password
+Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
-To target your Azure Stack instance as a tenant, an AzureRM environment needs to be registered as follows. The ARM endpoint below is the tenant default for a one-node environment.
+Connecting to your environment requires that you obtain the value of your Directory Tenant ID. For **Azure Active Directory** environments provide your directory tenant name:
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name AzureStack -ArmEndpoint "https://management.local.azurestack.external" 
+$TenantID = Get-DirectoryTenantID -AADTenantName "<mydirectorytenant>.onmicrosoft.com" -EnvironmentName AzureStackAdmin 
 ```
 
-To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
+For **ADFS** environments use the following:
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
+$TenantID = Get-DirectoryTenantID -ADFS -EnvironmentName AzureStackAdmin 
 ```
 
 After registering the AzureRM environment, cmdlets can be easily targeted at your Azure Stack instance. For example:
 
 ```powershell
-Login-AzureRmAccount -EnvironmentName "AzureStack" -TenantId $AadTenant
+Login-AzureRmAccount -EnvironmentName "AzureStack" -TenantId $TenantID
 ```
 
 Similarly, for targeting the administrator endpoints:
 
 ```powershell
-Login-AzureRmAccount -EnvironmentName "AzureStackAdmin" -TenantId $AadTenant
+Login-AzureRmAccount -EnvironmentName "AzureStackAdmin" -TenantId $TenantID
 ```
 
 ## Register Azure RM Providers on new subscriptions

Connect/Tests/Connect.Tests.ps1

@@ -93,7 +93,6 @@ InModuleScope $script:ModuleName {
         }
 
         It 'Add-AzureStackAzureRmEnvironment should successfully add a an administrator environment' {
-            Remove-AzureRmEnvironment -Name $EnvironmentName -ErrorAction SilentlyContinue 
             Add-AzureStackAzureRmEnvironment -ArmEndpoint $armEndpoint -Name $EnvironmentName
             Get-AzureRmEnvironment -Name $EnvironmentName | Should Not Be $null
         }

Deployment/PrepareBootFromVHD.ps1

@@ -35,12 +35,12 @@ The AdminPassword parameter is only used when the ApplyUnnatend parameter is set
 .EXAMPLE 
  
 Prepare the host to boot from cloudbuilder.vhdx. This requires KVM access to the host for configuring the Operating System.
-.\PrepareBootFromVHD.ps1 -CloudBuilderPath c:\CloudBuilder.vhdx -DriverPath c:\VhdDrivers
+.\PrepareBootFromVHD.ps1 -CloudBuilderDiskPath c:\CloudBuilder.vhdx -DriverPath c:\VhdDrivers
  
 .EXAMPLE  
  
 Prepare the host to boot from cloudbuilder.vhdx. The Operating System is automatically configured with an unattend.xml.
-.\PrepareBootFromVHD.ps1 -CloudBuilderPath c:\CloudBuilder.vhdx -ApplyUnattend
+.\PrepareBootFromVHD.ps1 -CloudBuilderDiskPath c:\CloudBuilder.vhdx -ApplyUnattend
   
 .NOTES