Merge pull request #284 from Azure/mattmcg/mergebranch

Merge master in vnext

Author: MatthewMcGlynn

CloudCapabilities/README.md

@@ -14,5 +14,5 @@ Import-Module ".\AzureRM.CloudCapabilities.psm1"
  Connected Azure or AzureStack powershell environment (Refer [AzureStack-Tools repo/Connect](../Connect) for connecting to an Azure Stack instance. )
 
 ```powershell
-Get-AzureRMCloudCapabilities -Location '<provide location>' -Verbose #-IncludeComputeCapabilities -IncludeStorageCapabilities
+Get-AzureRMCloudCapability -Location '<provide location>' -Verbose #-IncludeComputeCapabilities -IncludeStorageCapabilities
 ```

Deployment/README.md

@@ -7,6 +7,8 @@ The Azure Stack Development Kit installer provides a UI with the following featu
 - Rerun and Gather Logs
 - Reboot to SafeOS
 
+![](https://github.com/1RedOne/AzureStack-Tools/blob/master/Deployment/ScreenShot.png?raw=true)
+
 To install the Azure Stack Development Kit you require
 
 - A physical server that meets the requirements

Deployment/ScreenShot.png

@@ -1301,66 +1301,64 @@ Write-Host "." -NoNewline -ForegroundColor Cyan
 
 # Get environment details
 # CloudBuilder
-if (test-path "C:\CloudDeployment\Setup\InstallAzureStackPOC.ps1") {
-
-    if(!(test-path "C:\CloudDeployment\ECEngine\EnterpriseCloudEngine.psd1")){
-        # Deployment not initialized
-        $Script:Initialized="CloudBuilder_Install"
-        $syncHash.Control_Header_Tbl_Title.Text = $Text_Install.Mode_Title
-        $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Install.Mode_LeftTitle
-        $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Install.Mode_LeftContent
-        }
-    else{
-        # Import module to check current deployment status
-        Import-Module "C:\CloudDeployment\ECEngine\EnterpriseCloudEngine.psd1" -Force -Verbose:$false
-        $actionProgress = Get-ActionProgress -ActionType Deployment
-        # Deployment not started
-        if (!($actionProgress)){
+    if (test-path "C:\CloudDeployment\Setup\InstallAzureStackPOC.ps1") {
+        if(!(test-path "C:\CloudDeployment\ECEngine\EnterpriseCloudEngine.psd1")){
+            # Deployment not initialized
             $Script:Initialized="CloudBuilder_Install"
             $syncHash.Control_Header_Tbl_Title.Text = $Text_Install.Mode_Title
             $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Install.Mode_LeftTitle
             $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Install.Mode_LeftContent
             }
-        # Deployment in progress
-        elseif($actionProgress.LastAttribute.Value -eq 'InProgress'){
-            # Not deployed with deployment UI
-            if(!(test-path "C:\CloudDeployment\Rerun\config.xml")){
-                New-Item C:\CloudDeployment\Rerun -type directory -Force
-                '<config status="rerun" run="0"/>' | Out-File C:\CloudDeployment\Rerun\config.xml
-                $Script:Initialized="CloudBuilder_Rerun"
-                $syncHash.Control_Header_Tbl_Title.Text = $Text_Rerun.Mode_Title
-                $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Rerun.Mode_LeftTitle
-                $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Rerun.Mode_LeftContent
-                }
-            # Deployed with deployment UI
-            else {
-                $Status = [XML](Get-Content "C:\CloudDeployment\Rerun\config.xml")
-                # Contains only 1 or 2 deployment logs
-                if ($status.config.status -eq "Rerun" -and [int]$status.config.run -le 2){
+        else{
+            # Import module to check current deployment status
+            Import-Module "C:\CloudDeployment\ECEngine\EnterpriseCloudEngine.psd1" -Force -Verbose:$false
+            $actionProgress = Get-ActionProgress -ActionType Deployment
+            # Deployment not started
+            if (!($actionProgress)){
+                $Script:Initialized="CloudBuilder_Install"
+                $syncHash.Control_Header_Tbl_Title.Text = $Text_Install.Mode_Title
+                $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Install.Mode_LeftTitle
+                $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Install.Mode_LeftContent
+            }
+            # Deployment completed successfully
+            elseif($actionProgress.Attribute("Status").Value -eq 'Success'){
+                $Script:Initialized="CloudBuilder_Completed_GatherLogs"
+                $syncHash.Control_Header_Tbl_Title.Text = $Text_Completed.Mode_Title
+                $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Completed.Mode_LeftTitle
+                $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Completed.Mode_LeftContent
+            }
+            # Deployment in progress or stopped
+            else{
+                # Not deployed with deployment UI
+                if(!(test-path "C:\CloudDeployment\Rerun\config.xml")){
+                    New-Item C:\CloudDeployment\Rerun -type directory -Force
+                    '<config status="rerun" run="0"/>' | Out-File C:\CloudDeployment\Rerun\config.xml
                     $Script:Initialized="CloudBuilder_Rerun"
                     $syncHash.Control_Header_Tbl_Title.Text = $Text_Rerun.Mode_Title
                     $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Rerun.Mode_LeftTitle
                     $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Rerun.Mode_LeftContent
-                    }
-                # Contains 2 or more deplployment logs
+                }
+                # Deployed with deployment UI
                 else {
-                    $Script:Initialized="CloudBuilder_Rerun_GatherLogs"
-                    $syncHash.Control_Header_Tbl_Title.Text = $Text_Rerun.Mode_Title_Logs
-                    $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Rerun.Mode_LeftTitle_Logs 
-                    $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Rerun.Mode_LeftContent_Logs
+                    $Status = [XML](Get-Content "C:\CloudDeployment\Rerun\config.xml")
+                    # Contains only 1 or 2 deployment logs
+                    if ($status.config.status -eq "Rerun" -and [int]$status.config.run -le 2){
+                        $Script:Initialized="CloudBuilder_Rerun"
+                        $syncHash.Control_Header_Tbl_Title.Text = $Text_Rerun.Mode_Title
+                        $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Rerun.Mode_LeftTitle
+                        $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Rerun.Mode_LeftContent
+                    }
+                    # Contains 2 or more deployment logs
+                    else {
+                        $Script:Initialized="CloudBuilder_Rerun_GatherLogs"
+                        $syncHash.Control_Header_Tbl_Title.Text = $Text_Rerun.Mode_Title_Logs
+                        $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Rerun.Mode_LeftTitle_Logs
+                        $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Rerun.Mode_LeftContent_Logs
                     }
                 }
             }
-        else{
-            # Deployment completed
-            $Script:Initialized="CloudBuilder_Completed_GatherLogs"
-            $syncHash.Control_Header_Tbl_Title.Text = $Text_Completed.Mode_Title
-            $syncHash.Control_Mode_Tbl_LeftTitle.Text = $Text_Completed.Mode_LeftTitle
-            $syncHash.Control_Mode_Tbl_LeftContent.Text = $Text_Completed.Mode_LeftContent
         }
 
-    }
-
     # Reboot options
     F_Reboot_Options
     $syncHash.Control_Mode_Tbl_RightTitle.Text = $Text_Install.Mode_RightTitle
@@ -1666,12 +1664,12 @@ If ($synchash.Control_NetConfig_Rbt_Static.IsChecked){
     }
 
 If ($synchash.Control_NetConfig_Tbx_VlanID.Text.Length -gt 0){
-        $InstallScript += " -PublicVLan "
+        $InstallScript += " -PublicVlanId "
         $InstallScript += $synchash.Control_NetConfig_Tbx_VlanID.Text
     }
 
 If ($synchash.Control_NetConfig_Tbx_DnsForwarder.Text.Length -gt 0){
-        $InstallScript += " -EnvironmentDNS "
+        $InstallScript += " -DNSForwarder "
         $InstallScript += $synchash.Control_NetConfig_Tbx_DnsForwarder.Text
     }
 
@@ -1743,11 +1741,11 @@ Function F_Install {
     }
 
     If ($synchash.Control_NetConfig_Tbx_VlanID.Text.Length -gt 0){
-        ' -PublicVLan "' + $synchash.Control_NetConfig_Tbx_VlanID.Text + '"' |  Add-Content $filepath -NoNewline
+        ' -PublicVlanId "' + $synchash.Control_NetConfig_Tbx_VlanID.Text + '"' |  Add-Content $filepath -NoNewline
     }
 
     If ($synchash.Control_NetConfig_Tbx_DnsForwarder.Text.Length -gt 0){
-        ' -EnvironmentDNS "' + $synchash.Control_NetConfig_Tbx_DnsForwarder.Text + '"' |  Add-Content $filepath -NoNewline
+        ' -DNSForwarder "' + $synchash.Control_NetConfig_Tbx_DnsForwarder.Text + '"' |  Add-Content $filepath -NoNewline
     }
 
     If ($synchash.Control_NetConfig_Tbx_TimeServer.Text.Length -gt 0){
@@ -1764,7 +1762,7 @@ Function F_Install {
     #endregion Rerun Count
 
     #region Install
-    Start-Process powershell $filepath
+    Start-Process powershell -ArgumentList "-noexit", "-file $filepath"
     #endregion
 
 }

Deployment/asdk-installer.ps1

@@ -26,7 +26,6 @@ function Get-AzsDirectoryTenantidentifier {
     return $(Invoke-RestMethod $("{0}/.well-known/openid-configuration" -f $authority.TrimEnd('/'))).issuer.TrimEnd('/').Split('/')[-1]
 }
 
-
 <#
    .Synopsis
       This function is used to create a Service Principal on teh AD Graph
@@ -315,8 +314,6 @@ function Register-AzsGuestDirectoryTenant {
     }
 }
 
-
-
 <#
 .Synopsis
 Consents to the given Azure Stack instance within the callers's Azure Directory Tenant.
@@ -369,7 +366,7 @@ function Register-AzsWithMyDirectoryTenant {
     $refreshToken = Get-AzureRmUserRefreshToken -azureEnvironment $azureEnvironment -directoryTenantId $azureStackEnvironment.AdTenant -AutomationCredential $AutomationCredential
 
     # Initialize the Graph PowerShell module to communicate with the correct graph service
-    $graphEnvironment = ResolveGraphEnvironment $azureEnvironment
+    $graphEnvironment = Resolve-GraphEnvironment $azureEnvironment
     Initialize-GraphEnvironment -Environment $graphEnvironment -DirectoryTenantId $DirectoryTenantName -RefreshToken $refreshToken
 
     # Initialize the service principal for the Azure Stack Resource Manager application (allows us to acquire a token to ARM). If not specified, the sign-up flow must be completed via the Azure Stack portal first.
@@ -450,8 +447,9 @@ function Register-AzsWithMyDirectoryTenant {
 }
 
 Export-ModuleMember -Function @(
-    "Register-AzsWithMyDirectoryTenant",
     "Register-AzsGuestDirectoryTenant",
+    "Register-AzsWithMyDirectoryTenant",
     "Get-AzsDirectoryTenantidentifier",
     "New-AzsADGraphServicePrincipal"
-)
+
+)

Identity/AzureStack.Identity.psm1

@@ -694,6 +694,46 @@ function Get-AzsBackup {
 
 Export-ModuleMember -Function Get-AzsBackup
 
+<#
+    .SYNOPSIS
+    Set Azure Stack geographic location information
+#>
+
+function Set-AzSLocationInformation {
+    param(
+        [Parameter(Mandatory = $false)]
+        [string] $Location,
+		
+        [Parameter(Mandatory = $true)] 
+        [string] $Latitude = '47.608013', 
+
+        [Parameter(Mandatory = $true)] 
+        [string] $Longitude = '-122.335167' 
+	)
+	
+    $Location = Get-AzsHomeLocation -Location $Location
+	
+	$resourceType = "Microsoft.Subscriptions.Admin/locations"
+	$apiVersion = "2015-11-01"
+		
+	$locationResource = Get-AzureRmResource -ResourceType $resourceType -ResourceName $Location -ApiVersion $apiVersion
+	
+    $params = @{
+        ResourceName      = $Location
+        ResourceType      = $resourceType
+        ApiVersion        = $apiVersion
+        Properties        = @{
+            Id            = $locationResource.ResourceId
+            Name          = $locationResource.Name
+            DisplayName   = $locationResource.Name
+            Latitude      = $Latitude
+            Longitude     = $Longitude
+        }
+    }
+	
+	New-AzureRmResource @params -IsFullObject -Force
+}
+
 <#
     .SYNOPSIS
     Start Infrastructure Backup

Infrastructure/AzureStack.Infra.psm1

@@ -167,7 +167,7 @@ The command does the following:
  Does return the total capacity of the storage subsystem
 
 ```powershell
-Get-AzsStorageCapacity
+Get-AzSStorageSubsystem
 ```
 
 The command does the following:
@@ -223,7 +223,7 @@ The command does the following:
  Does list all SLB MUX Instances
 
 ```powershell
-Get-AzSLBMux
+Get-AzsSLBMux
 ```
 
 The command does the following:
@@ -476,6 +476,6 @@ $latitude = '12.972442'
 $longitude = '77.580643'
 $regionName = 'local'
 
-Set-AzsLocationInformation -Region $regionName -Latitude $latitude -Longitude $longitude
+Set-AzsLocationInformation -Location $regionName -Latitude $latitude -Longitude $longitude
 
 ```

Infrastructure/README.md

@@ -44,8 +44,8 @@ InModuleScope $script:ModuleName {
             { Get-AzsScaleUnitNode } |
                 Should Not Throw
         }
-        It 'Get-AzsStorageCapacity should not throw' {
-            { Get-AzsStorageCapacity } |
+        It 'Get-AzsStorageSubsystem should not throw' {
+            { Get-AzsStorageSubsystem } |
                 Should Not Throw
         }
         It 'Get-AzsInfraRole should not throw' {
@@ -64,9 +64,8 @@ InModuleScope $script:ModuleName {
             { Get-Azslogicalnetwork } |
                 Should Not Throw
         }
-
-        It 'Get-AzsUpdateSummary should not throw' {
-            { Get-AzsUpdateSummary } |
+        It 'Get-AzsUpdateLocation should not throw' {
+            { Get-AzsUpdateLocation } |
                 Should Not Throw
         }
         It 'Get-AzsUpdate should not throw' {

Infrastructure/Tests/Infra.Tests.ps1

@@ -8,35 +8,13 @@
     Creates "default" tenant offer with unlimited quotas across Compute, Network, Storage and KeyVault services.
 #>
 
-function Add-AzsStorageQuota {
+function New-AzsComputeQuota {
     param(
         [string] $Name = "default",
-        [int] $CapacityInGb = 1000,
-        [int] $NumberOfStorageAccounts = 2000,
-        [string] $Location = $null
-    )
-    
-    $Location = Get-AzsHomeLocation -Location $Location    
-
-    $params = @{
-        ResourceName = "{0}/{1}" -f $Location, $Name
-        ResourceType = "Microsoft.Storage.Admin/locations/quotas"
-        ApiVersion   = "2015-12-01-preview"
-        Properties   = @{  
-            capacityInGb            = $CapacityInGb
-            numberOfStorageAccounts = $NumberOfStorageAccounts
-        }
-    }
-
-    New-AzsServiceQuota @params
-}
-
-function Add-AzsComputeQuota {
-    param(
-        [string] $Name = "default",
-        [int] $VmCount = 1000,
-        [int] $MemoryLimitMB = 1048576,
-        [int] $CoresLimit = 1000,
+        [int] $CoresLimit = 200,
+        [int] $VirtualMachineCount = 50,
+        [int] $AvailabilitySetCount = 10,
+        [int] $VmScaleSetCount = 10,
         [string] $Location = $null
     )
 
@@ -47,16 +25,17 @@ function Add-AzsComputeQuota {
         ResourceType = "Microsoft.Compute.Admin/locations/quotas"
         ApiVersion   = "2015-12-01-preview"
         Properties   = @{
-            virtualMachineCount = $VmCount
-            memoryLimitMB       = $MemoryLimitMB
-            coresLimit          = $CoresLimit
+            virtualMachineCount  = $VirtualMachineCount
+            availabilitySetCount = $AvailabilitySetCount
+            coresLimit           = $CoresLimit
+            vmScaleSetCount      = $VmScaleSetCount
         }
     }
 
     New-AzsServiceQuota @params
 }
 
-function Add-AzsNetworkQuota {
+function New-AzsNetworkQuota {
     param(
         [string] $Name = "default",
         [int] $PublicIpsPerSubscription = 500,
@@ -145,7 +124,15 @@ function New-AzsServiceQuota {
     )
 
     $serviceQuota = New-AzureRmResource -ResourceName $ResourceName -ResourceType $ResourceType -ApiVersion $ApiVersion -Properties $Properties -Force
-    $serviceQuota.ResourceId
+    $quotaObject = New-Object PSObject      
+    foreach ($property in ($serviceQuota.Properties | Get-Member -MemberType NoteProperty)){
+        $quotaObject | Add-Member NoteProperty -Name $property.Name -Value $serviceQuota.Properties.($property.Name)
+    }
+    $quotaObject | Add-Member NoteProperty Name($serviceQuota.ResourceName)
+    $quotaObject | Add-Member NoteProperty Type($serviceQuota.ResourceType)
+    $quotaObject | Add-Member NoteProperty Location($serviceQuota.Location)
+    $quotaObject | Add-Member NoteProperty Id($serviceQuota.ResourceId)
+    $quotaObject
 }
 
 function Get-AzsServiceQuota {