Merge branch 'master' into master

Author: troettinger

Infrastructure/AzureStack.Infra.psm1

@@ -799,6 +799,39 @@ $IPPoolBodyJson =$IPPoolBody |ConvertTo-Json
 }
 export-modulemember -function Add-AzSIPPool
 
+Function Set-AzSLocationInformation {
+    Param(    
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullorEmpty()]
+        [String] $TenantId,
+
+        [Parameter(Mandatory = $true)]
+        [System.Management.Automation.PSCredential] $AzureStackCredentials,
+
+        [Parameter(Mandatory = $true)]
+        [string] $EnvironmentName,
+
+        [Parameter(Mandatory = $true)]
+        [string] $Region = 'local',
+
+        [Parameter(Mandatory = $true)]
+        [string] $Latitude = '47.608013',
+
+        [Parameter(Mandatory = $true)]
+        [string] $Longitude = '-122.335167'
+    )
+    $ArmEndpoint = GetARMEndpoint -EnvironmentName $EnvironmentName -ErrorAction Stop
+    $subscription, $headers = (Get-AzureStackAdminSubTokenHeader -TenantId $TenantId -AzureStackCredentials $AzureStackCredentials -EnvironmentName $EnvironmentName)
+    $uri = "{0}/subscriptions/{1}/providers/Microsoft.Subscriptions.Admin/locations/{2}?api-version=2015-11-01" -f $ArmEndpoint, $subscription, $Region
+
+    $obtainedRegion = Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $headers
+    $obtainedRegion.latitude = $Latitude
+    $obtainedRegion.longitude = $Longitude
+
+    Invoke-WebRequest -Uri $uri -Method PUT -Body $(Convertto-Json $obtainedRegion) -ContentType 'application/json' -Headers $headers
+}
+Export-ModuleMember -function Set-AzSLocationInformation
+
 Function GetARMEndpoint{
     param(
         # Azure Stack environment name
@@ -816,4 +849,4 @@ Function GetARMEndpoint{
     }
 
     $ARMEndpoint
-}
+}

Infrastructure/README.md

@@ -421,6 +421,7 @@ Start-AzSInfraRoleInstance -AzureStackCredentials $credential -TenantID $TenantI
 Get-AzSAlert -AzureStackCredentials $credential -TenantID $TenantID -EnvironmentName "AzureStackAdmin"|where {$_.state -eq "active"}
 ```
 
+
 ### Increase Public IP Pool Capacity
 ```powershell
 #Retrieve all Alerts and apply a filter to only show active Alerts
@@ -453,4 +454,21 @@ Get-AzSUpdateRun -AzureStackCredentials $credential -TenantID $TenantID -Environ
 
 #Review Region Update Summary after successful run
 Get-AzSUpdateSummary -AzureStackCredentials $credential -TenantID $TenantID -EnvironmentName "AzureStackAdmin"
+
+
+### Set Azure Stack's Latitude and Longitude
+
+This command modifies an Azure Stack instance's latitude and longitude location
+
+```powershell
+$EnvironmentName = "AzureStackAdmin"
+$directoryName = "<<yourDirectoryName>>.onmicrosoft.com"
+$credential = Get-Credential
+$latitude = '12.972442'
+$longitude = '77.580643'
+$regionName = 'local'
+
+$TenantID = Get-DirectoryTenantID -AADTenantName $directoryName -EnvironmentName AzureStackAdmin
+Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $credential -Region $regionName -Latitude $latitude -Longitude $longitude
+
 ```

Infrastructure/Tests/Infra.Tests.ps1

@@ -37,7 +37,6 @@ InModuleScope $script:ModuleName {
     $EnvironmentName = $global:EnvironmentName
 
 
-
     Describe 'Infra - Functional Tests' {
         It 'Get-AzSAlert should not throw' {
             { Get-AzSAlert -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds } |
@@ -80,9 +79,13 @@ InModuleScope $script:ModuleName {
             { Get-AzSUpdate -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds } |
                 Should Not Throw
         }
+        It 'Set-AzSLocationInformation should not throw' {
+            { Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds -Region 'local' -Latitude '12.972442' -Longitude '77.580643'} |
+                Should Not Throw
+        }
 
 
     }
 
 
-}
+}