Merge pull request #283 from BrianLPeterson/user/bpet/guifixonly

Deployment GUI fix for rerun

Author: MatthewMcGlynn

Deployment/asdk-installer.ps1

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