Merge pull request #96 from rupisure/patch-5

Add support for multiple TP3 builds

Author: MatthewMcGlynn

Registration/RegisterWithAzure.ps1

@@ -6,15 +6,15 @@
 .SYNOPSIS 
  
 This script can be used to register Azure Stack POC with Azure. To run this script, you must have a public Azure subscription of any type. 
-The owner of the subscription cannot be an MSA or 2FA account. 
+There must also be an account that is an owner or contributor of the subscription. This account cannot be an MSA (i.e. cannot be live.com or hotmail.com) or 2FA account. 
 
 .DESCRIPTION 
  
 RegisterToAzure runs local scripts to connect your Azure Stack to Azure. After connecting with Azure, you can test marketplace syndication. 
 
 The script will follow four steps:
-Configure local identity: configures local Azure Stack so that it can call to Azure via your Azure subscription
-Get registration request: get local environment information to create a registration for this azure stack in azure
+Configure bridge identity: configures Azure Stack so that it can call to Azure via your Azure subscription
+Get registration request: get Azure Stack environment information to create a registration for this azure stack in azure
 Register with Azure: uses Azure powershell to create an "Azure Stack Registration" resource on your Azure subscription
 Activate Azure Stack: final step in connecting Azure Stack to be able to call out to Azure
 
@@ -28,7 +28,7 @@ Name of your AAD Tenant which your Azure subscription is a part of. This paramet
 
 .PARAMETER azureSubscriptionOwner
  
-Username for the owner of the azure subscription. This user must not be an MSA or 2FA account. This parameter is mandatory.
+Username for an owner/contributor of the azure subscription. This user must not be an MSA or 2FA account. This parameter is mandatory.
 
 .PARAMETER azureSubscriptionPassword
 
@@ -53,7 +53,6 @@ This script must be run from the Host machine of the POC.
  Ensure that you have an Azure subscription 
 #>
 
-
 [CmdletBinding()]
 Param     (
     [Parameter(Mandatory = $true)]
@@ -86,6 +85,24 @@ cd  C:\CloudDeployment\Setup\Activation\Bridge
 
 Read-Host "This script will turn marketplace syndication $marketplaceSyndication and usage reporting $reportUsage. You can change this by running the script using different flags. Press Enter to continue."
 
+# Determine version of TP3 and set values accordingly
+ $versionInfo = [xml] (Get-Content -Path C:\CloudDeployment\Configuration\Version\version.xml) 
+if($versionInfo.Version -ge "1.0.170308.2") 
+{ 
+    Write-Verbose -Message "Using TP3.N release" -Verbose
+    $bridgeAppConfigFile = "\\SU1FileServer\SU1_Infrastructure_1\ASResourceProvider\Config\AzureBridge.IdentityApplication.Configuration.json" 
+} 
+elseif($versionInfo.Version -eq "1.0.170225.2") 
+{ 
+    Write-Verbose -Message "Using TP3.O release" -Verbose
+    $bridgeAppConfigFile = "\\SU1FileServer\SU1_Infrastructure_1\ASResourceProvider\Config\ConnectionAzureArm.IdentityApplication.Configuration.json"
+} 
+else 
+{ 
+    Write-Error -Message "Unsupported TP3 release" -Verbose 
+} 
+
+
 #
 # Step 1: Configure Bridge identity
 #
@@ -98,10 +115,9 @@ Write-Host "STEP 1: Configure local identity completed"
 # Step 2: Create new registration request
 #
 
-$bridgeAppConfigFile = "\\SU1FileServer\SU1_Infrastructure_1\ASResourceProvider\Config\ConnectionAzureArm.IdentityApplication.Configuration.json"
 $registrationOutputFile = "c:\temp\registration.json"
 .\New-RegistrationRequest.ps1 -BridgeAppConfigFile $bridgeAppConfigFile -RegistrationRequestOutputFile $registrationOutputFile -Verbose
-Read-Host "STEP 2: Registration request completed. Re-enter your Azure subscription credentials in the next step. Press Enter to continue."
+Read-Host "STEP 2: Registration request completed. Re-enter your Azure subscription credentials in the next step. Note: Step 3 can be run from a different machine that is connected to Azure. Press Enter to continue and run step 3 from this machine."
 
 #
 # Step 3: Register Azure Stack with Azure
@@ -158,9 +174,20 @@ $reg.properties = $newProps
 $reg | ConvertTo-Json -Depth 4 | Out-File -FilePath $registrationOutputFile
 
 $regResponse = Get-Content -path  $registrationOutputFile
-$bytes = [System.Text.Encoding]::Unicode.GetBytes($regResponse)
-$activationCode = [Convert]::ToBase64String($bytes)
+$AzureResourceManagerEndpoint = "https://management.azure.com"
+
+if($versionInfo.Version -ge "1.0.170308.2") 
+{ 
+    $bytes = [System.Text.Encoding]::UTF8.GetBytes($regResponse)
+    $activationCode = [Convert]::ToBase64String($bytes)
+    .\Activate-Bridge.ps1 -activationCode $activationCode -AzureResourceManagerEndpoint $AzureResourceManagerEndpoint -Verbose
+}
+elseif($versionInfo.Version -eq "1.0.170225.2") 
+{ 
+    $bytes = [System.Text.Encoding]::Unicode.GetBytes($regResponse)
+    $activationCode = [Convert]::ToBase64String($bytes)
+    .\Activate-Bridge.ps1 -activationCode $activationCode -Verbose
+} 
 
-.\Activate-Bridge.ps1 -activationCode $activationCode -Verbose
 Write-Host "STEP 4: Activate Azure Stack completed"
-Write-Host "Registration complete. You may now access Marketplace Management in the Admin UI"
+Write-Host "Registration complete. Close and re-open the Marketplace Management blade in the admin portal."