Merge ~ltrager/maas:2.3_1722607_2 into maas:2.3

[Lee Trager]

LP: #1722607 - 2/2 Stop sending logs with node object over the websocket.

Update the UI to pull summary data from NodesHandler and installation
data from the NodeResultsHandler. There are no UI changes with this
branch.

Backport of 3d16280 for LP: #1830365

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index 1b6bc0e..fa3ab7e 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -111,13 +111,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
             limit: 10
         };
 
-        // Machine output section.
-        $scope.machine_output = {
-            viewable: false,
-            selectedView: null,
-            views: []
-        };
-
         // Updates the page title.
         function updateTitle() {
             if($scope.node && $scope.node.fqdn) {
@@ -244,68 +237,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
             }
         }
 
-        // Updates the machine output section.
-        function updateMachineOutput() {
-            // Set if it should even be viewable.
-            $scope.machine_output.viewable = (
-                angular.isString($scope.node.summary_xml) ||
-                angular.isString($scope.node.summary_yaml) ||
-                (angular.isArray($scope.node.installation_results) &&
-                    $scope.node.installation_results.length > 0));
-
-            // Grab the selected view name, so it can be kept the same if
-            // possible.
-            var viewName = null;
-            if(angular.isObject($scope.machine_output.selectedView)) {
-                viewName = $scope.machine_output.selectedView.name;
-            }
-
-            // If the viewName is empty, then a default one was not selected.
-            // We want the installation output to be the default if possible.
-            if(!angular.isString(viewName)) {
-                viewName = "installation";
-            }
-
-            // Setup the views that are viewable.
-            $scope.machine_output.views = [];
-            if(angular.isString($scope.node.summary_yaml)) {
-                $scope.machine_output.views.push({
-                    name: "summary_yaml",
-                    title: "Machine output (YAML)"
-                });
-            }
-            if(angular.isString($scope.node.summary_xml)) {
-                $scope.machine_output.views.push({
-                    name: "summary_xml",
-                    title: "Machine output (XML)"
-                });
-            }
-            if(angular.isArray($scope.node.installation_results) &&
-                $scope.node.installation_results.length > 0) {
-                $scope.machine_output.views.push({
-                    name: "installation",
-                    title: "Installation output"
-                });
-            }
-
-            // Set the selected view to its previous value or to the first
-            // entry in the views list.
-            var selectedView = null;
-            angular.forEach($scope.machine_output.views, function(view) {
-                if(view.name === viewName) {
-                    selectedView = view;
-                }
-            });
-            if(angular.isObject(selectedView)) {
-                $scope.machine_output.selectedView = selectedView;
-            } else if ($scope.machine_output.views.length > 0) {
-                $scope.machine_output.selectedView =
-                    $scope.machine_output.views[0];
-            } else {
-                $scope.machine_output.selectedView = null;
-            }
-        }
-
         // Update the devices array on the scope based on the device children
         // on the node.
         function updateDevices() {
@@ -395,13 +326,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
 
             // Update the services when the services list is updated.
             $scope.$watch("node.service_ids", updateServices);
-
-            // Update the machine output view when summary, commissioning, or
-            // installation results are updated on the node.
-            $scope.$watch("node.summary_xml", updateMachineOutput);
-            $scope.$watch("node.summary_yaml", updateMachineOutput);
-            $scope.$watch("node.commissioning_results", updateMachineOutput);
-            $scope.$watch("node.installation_results", updateMachineOutput);
         }
 
         // Called when the node has been loaded.
@@ -411,7 +335,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
 
             updateTitle();
             updateSummary();
-            updateMachineOutput();
             updateServices();
             startWatching();
 
@@ -987,54 +910,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
             }
         };
 
-        // Return the commissioning summary output data.
-        $scope.getSummaryData = function(type) {
-            // Can be called by angular before the node is set in the scope,
-            // in that case return blank string. It will be called once the
-            // node is set to get the correct information.
-            if(!angular.isObject($scope.node)) {
-                return "";
-            }
-            return $scope.node["summary_" + type];
-        };
-
-        // Return the installation log data.
-        $scope.getInstallationData = function() {
-            // Can be called by angular before the node is set in the scope,
-            // in that case return blank string. It will be called once the
-            // node is set to get the correct information.
-            if(!angular.isObject($scope.node)) {
-                return "";
-            }
-            // It is possible for the node to have multiple installation
-            // results, but it is unused. Only one installation result will
-            // exists for a node. Grab the first one in the array.
-            var results = $scope.node.installation_results;
-            if(!angular.isArray(results) ||
-                    results.length === 0 || results[0].output === "") {
-                switch($scope.node.installation_status) {
-                    case 0:
-                        return "System is booting...";
-                    case 1:
-                        return "Installation has begun!";
-                    case 2:
-                        return ("Installation has succeeded but no " +
-                                "output was given.");
-                    case 3:
-                        return ("Installation has failed and no output was " +
-                                "given.");
-                    case 4:
-                        return "Installation failed after 40 minutes.";
-                    case 5:
-                        return "Installation was aborted.";
-                    default:
-                        return "";
-                }
-            } else {
-                return results[0].output;
-            }
-        };
-
         // true if power error prevents the provided action
         $scope.hasActionPowerError = function(actionName) {
             if(!$scope.hasPowerError()) {
diff --git a/src/maasserver/static/js/angular/controllers/node_results.js b/src/maasserver/static/js/angular/controllers/node_results.js
index f3399d9..101e500 100644
--- a/src/maasserver/static/js/angular/controllers/node_results.js
+++ b/src/maasserver/static/js/angular/controllers/node_results.js
@@ -11,39 +11,93 @@ angular.module('MAAS').controller('NodeResultsController', [
              NodeResultsManagerFactory, ManagerHelperService, ErrorService) {
 
         // NodeResultsManager that is loaded once the node is loaded.
-        var nodeResultsManager = null;
+        $scope.nodeResultsManager = null;
         // References to manager data used in scope.
         $scope.commissioning_results = null;
         $scope.testing_results = null;
         $scope.installation_results = null;
         $scope.results = null;
 
+        // List of logs available.
+        $scope.logs = {
+            option: null,
+            availableOptions: []
+        };
+        // Log content being displayed.
+        $scope.logOutput = 'Loading...';
+
         // Initial values.
         $scope.loaded = false;
         $scope.resultsLoaded = false;
         $scope.node = null;
 
+        function updateLogs() {
+            var i;
+            var option;
+            var had_installation = $scope.logs.availableOptions.length === 3;
+            $scope.logs.availableOptions.length = 0;
+            // XXX ltrager 2017-12-01 - Only show the current installation log
+            // if the machine is deploying, deployed, or failed deploying. The
+            // logs page needs to be redesigned to show previous installation
+            // results.
+            if($scope.installation_results &&
+                    $scope.installation_results.length > 0 && (
+                        $scope.node.status_code === 6 ||
+                        $scope.node.status_code === 9 ||
+                        $scope.node.status_code === 11)) {
+                $scope.logs.availableOptions.push({
+                    'title': 'Installation output',
+                    'id': $scope.installation_results[0].id
+                });
+            }
+            $scope.logs.availableOptions.push({
+                'title': 'Machine output (YAML)',
+                'id': 'summary_yaml'
+            });
+            $scope.logs.availableOptions.push({
+                'title': 'Machine output (XML)',
+                'id': 'summary_xml'
+            });
+            if(!had_installation &&
+               $scope.logs.availableOptions.length === 3) {
+                // A new installation log has appeared, show it.
+                $scope.logs.option = $scope.logs.availableOptions[0];
+            }else if(!$scope.selectedLog || (
+                had_installation && $scope.logs.length === 2)) {
+                // No longer in a deployed state.
+                $scope.logs.option = $scope.logs.availableOptions[0];
+            }
+        }
+
         // Called once the node has loaded.
         function nodeLoaded(node) {
             $scope.node = node;
             $scope.loaded = true;
             // Get the NodeResultsManager and load it.
-            nodeResultsManager = NodeResultsManagerFactory.getManager(
+            $scope.nodeResultsManager = NodeResultsManagerFactory.getManager(
                 node, $scope.section.area);
-            nodeResultsManager.loadItems().then(function() {
+            $scope.nodeResultsManager.loadItems().then(function() {
                 $scope.commissioning_results =
-                    nodeResultsManager.commissioning_results;
-                $scope.testing_results = nodeResultsManager.testing_results;
+                    $scope.nodeResultsManager.commissioning_results;
+                $scope.testing_results =
+                    $scope.nodeResultsManager.testing_results;
                 $scope.installation_results =
-                    nodeResultsManager.installation_results;
-                $scope.results = nodeResultsManager.results;
+                    $scope.nodeResultsManager.installation_results;
+                $scope.results = $scope.nodeResultsManager.results;
+                // Only load and monitor logs when on the logs page.
+                if($scope.section.area === "logs") {
+                    updateLogs();
+                    $scope.$watch("installation_results", updateLogs, true);
+                    $scope.$watch(
+                        "installation_results", $scope.updateLogOutput, true);
+                }
                 $scope.resultsLoaded = true;
             });
         }
 
         if($routeParams.type === 'controller') {
             $scope.nodesManager = ControllersManager;
-        }else{
+        } else {
             $scope.nodesManager = MachinesManager;
         }
         // Load nodes manager.
@@ -55,7 +109,7 @@ angular.module('MAAS').controller('NodeResultsController', [
                 if(angular.isObject(activeNode) &&
                    activeNode.system_id === $routeParams.system_id) {
                     nodeLoaded(activeNode);
-                }else{
+                } else {
                     $scope.nodesManager.setActiveItem(
                         $routeParams.system_id).then(function(node) {
                             nodeLoaded(node);
@@ -65,12 +119,88 @@ angular.module('MAAS').controller('NodeResultsController', [
                 }
             });
 
+        $scope.updateLogOutput = function() {
+            $scope.logOutput = "Loading...";
+            if(!$scope.node) {
+                return;
+            }else if($scope.logs.option.id === 'summary_xml') {
+                $scope.nodesManager.getSummaryXML($scope.node).then(
+                    function(output) {
+                        $scope.logOutput = output;
+                    });
+            }else if($scope.logs.option.id === 'summary_yaml') {
+                $scope.nodesManager.getSummaryYAML($scope.node).then(
+                    function(output) {
+                        $scope.logOutput = output;
+                    });
+            } else {
+                var result = null;
+                var i, j;
+                // Find the installation result to be displayed.
+                for(i = 0; i < $scope.installation_results.length; i++) {
+                    var hlist = $scope.installation_results[i].history_list;
+                    for(j = 0; j < hlist.length; j++) {
+                        if(hlist[j].id === $scope.logs.option.id) {
+                            result = hlist[j];
+                            break;
+                        }
+                    }
+                    if(result) {
+                        break;
+                    }
+                }
+                switch(result.status) {
+                    case 0:
+                        $scope.logOutput = "System is booting...";
+                        break;
+                    case 1:
+                        $scope.logOutput = "Installation has begun!";
+                        break;
+                    case 2:
+                        $scope.nodeResultsManager.get_result_data(
+                            result.id, 'combined').then(function(output) {
+                                if(output === '') {
+                                    $scope.logOutput =
+                                        "Installation has succeeded but " +
+                                        "no output was given.";
+                                } else {
+                                    $scope.logOutput = output;
+                                }
+                            });
+                        break;
+                    case 3:
+                        $scope.nodeResultsManager.get_result_data(
+                            result.id, 'combined').then(function(output) {
+                                if(output === '') {
+                                    $scope.logOutput =
+                                        "Installation has failed and no " +
+                                        "output was given.";
+                                } else {
+                                    $scope.logOutput = output;
+                                }
+                            });
+                        break;
+                    case 4:
+                        $scope.logOutput =
+                            "Installation failed after 40 minutes.";
+                        break;
+                    case 5:
+                        $scope.logOutput = "Installation was aborted.";
+                        break;
+                    default:
+                        $scope.logOutput = "BUG: Unknown log status " +
+                            result.status;
+                        break;
+                }
+            }
+        };
+
         // Destroy the NodeResultsManager when the scope is destroyed. This is
         // so the client will not recieve any more notifications about results
         // from this node.
         $scope.$on("$destroy", function() {
-            if(angular.isObject(nodeResultsManager)) {
-                nodeResultsManager.destroy();
+            if(angular.isObject($scope.nodeResultsManager)) {
+                $scope.nodeResultsManager.destroy();
             }
         });
     }]);
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
index 00b3c0b..1947106 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
@@ -253,15 +253,6 @@ describe("NodeDetailsController", function() {
         });
     });
 
-    it("sets initial values for machine output section", function() {
-        var controller = makeController();
-        expect($scope.machine_output).toEqual({
-            viewable: false,
-            selectedView: null,
-            views: []
-        });
-    });
-
     it("sets initial area to routeParams value", function() {
         $routeParams.area = makeName("area");
         var controller = makeController();
@@ -452,71 +443,6 @@ describe("NodeDetailsController", function() {
         expect($scope.power.editing).toBe(false);
     });
 
-    it("machine output not visible if all required data missing", function() {
-        var controller = makeControllerResolveSetActiveItem();
-        expect($scope.machine_output.viewable).toBe(false);
-    });
-
-    it("machine output visible if summary_xml and summary_yaml", function() {
-        node.summary_xml = node.summary_yaml = "summary";
-        var controller = makeControllerResolveSetActiveItem();
-        expect($scope.machine_output.viewable).toBe(true);
-    });
-
-    it("machine output visible if installation_results", function() {
-        node.installation_results.push({});
-        var controller = makeControllerResolveSetActiveItem();
-        expect($scope.machine_output.viewable).toBe(true);
-    });
-
-    it("machine output not visible if installation_results not an array",
-        function() {
-            node.installation_results = undefined;
-            var controller = makeControllerResolveSetActiveItem();
-            expect($scope.machine_output.viewable).toBe(false);
-        });
-
-    it("machine output summary view available if summary_xml",
-        function() {
-            node.summary_xml = "summary_xml";
-            var controller = makeControllerResolveSetActiveItem();
-            expect($scope.machine_output.views).toEqual([{
-                name: "summary_xml",
-                title: "Machine output (XML)"
-            }]);
-        });
-
-    it("machine output summary view available if summary_yaml",
-        function() {
-            node.summary_yaml = "summary_yaml";
-            var controller = makeControllerResolveSetActiveItem();
-            expect($scope.machine_output.views).toEqual([{
-                name: "summary_yaml",
-                title: "Machine output (YAML)"
-            }]);
-        });
-
-    it("machine output installation view available if installation_results",
-        function() {
-            node.installation_results.push({});
-            var controller = makeControllerResolveSetActiveItem();
-            expect($scope.machine_output.views).toEqual([{
-                name: "installation",
-                title: "Installation output"
-            }]);
-        });
-
-    it("machine output install view is always selected first if possible",
-        function() {
-            node.summary_xml = node.summary_yaml = "summary";
-            node.installation_results.push({});
-            var controller = makeControllerResolveSetActiveItem();
-            expect($scope.machine_output.selectedView).toEqual({
-                name: "installation",
-                title: "Installation output"
-            });
-        });
-
     it("starts watching once setActiveItem resolves", function() {
         var setActiveDefer = $q.defer();
         spyOn(MachinesManager, "setActiveItem").and.returnValue(
@@ -553,11 +479,7 @@ describe("NodeDetailsController", function() {
             "node.zone.id",
             "node.power_type",
             "node.power_parameters",
-            "node.service_ids",
-            "node.summary_xml",
-            "node.summary_yaml",
-            "node.commissioning_results",
-            "node.installation_results"
+            "node.service_ids"
         ]);
         expect(watchCollections).toEqual([
             $scope.summary.architecture.options,
@@ -2180,72 +2102,6 @@ describe("NodeDetailsController", function() {
             });
     });
 
-    describe("getSummaryData", function() {
-
-        it("returns blank string if node is null", function() {
-            var controller = makeController();
-            expect($scope.getSummaryData()).toBe("");
-        });
-
-        it("returns summary_xml", function() {
-            var controller = makeController();
-            $scope.node = makeNode();
-            var summary_xml = {};
-            $scope.node.summary_xml = summary_xml;
-            expect($scope.getSummaryData("xml")).toBe(summary_xml);
-        });
-
-        it("returns summary_yaml when summaryType equal yaml", function() {
-            var controller = makeController();
-            $scope.node = makeNode();
-            var summary_yaml = {};
-            $scope.node.summary_yaml = summary_yaml;
-            expect($scope.getSummaryData("yaml")).toBe(summary_yaml);
-        });
-    });
-
-    describe("getInstallationData", function() {
-
-        it("returns blank string if node is null", function() {
-            var controller = makeController();
-            expect($scope.getInstallationData()).toBe("");
-        });
-
-        it("returns blank string if installation results not an array",
-            function() {
-                var controller = makeController();
-                $scope.node = makeNode();
-                $scope.node.installation_results = undefined;
-                expect($scope.getInstallationData()).toBe("");
-            });
-
-        it("returns blank string if no installation results", function() {
-            var controller = makeController();
-            $scope.node = makeNode();
-            expect($scope.getInstallationData()).toBe("");
-        });
-
-        it("returns first installation result data", function() {
-            var controller = makeController();
-            $scope.node = makeNode();
-            var install_result = {};
-            $scope.node.installation_results.push({
-                output: install_result
-            });
-            $scope.node.installation_results.push({
-                output: {}
-            });
-            expect($scope.getInstallationData()).toBe(install_result);
-        });
-
-        it("returns status message when no output and status", function() {
-            var controller = makeController();
-            $scope.node = makeNode();
-            $scope.node.installation_status = makeInteger(0, 5);
-            expect($scope.getInstallationData()).not.toBe("");
-        });
-    });
-
     describe("getServiceClass", function() {
 
         it("returns 'none' if null", function() {
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_results.js b/src/maasserver/static/js/angular/controllers/tests/test_node_results.js
index b677ae5..f2f44d7 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_results.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_results.js
@@ -49,6 +49,35 @@ describe("NodeResultsController", function() {
         return node;
     }
 
+    // Make a result.
+    function makeResult(type, status) {
+        if(type === null) {
+            type = makeInteger(0, 3);
+        }
+        if(status === null) {
+            status = makeInteger(0, 8);
+        }
+        var id = makeInteger(0, 1000);
+        var result = {
+            id: id,
+            name: makeName("name"),
+            type: type,
+            status: status,
+            history_list: [{
+                id: id,
+                status: status
+            }]
+        };
+        var i;
+        for(i = 0; i < 3; i++) {
+            result.history_list.push({
+                id: makeInteger(0, 1000),
+                status: makeInteger(0, 8)
+            });
+        }
+        return result;
+    }
+
     // Makes the NodeResultsController
     function makeController(loadManagerDefer) {
         var loadManager = spyOn(ManagerHelperService, "loadManager");
@@ -88,6 +117,9 @@ describe("NodeResultsController", function() {
         expect($scope.testing_results).toBeNull();
         expect($scope.installation_results).toBeNull();
         expect($scope.results).toBeNull();
+        expect($scope.logs.option).toBeNull();
+        expect($scope.logs.availableOptions).toEqual([]);
+        expect($scope.logOutput).toEqual("Loading...");
         expect($scope.loaded).toBe(false);
         expect($scope.resultsLoaded).toBe(false);
         expect($scope.node).toBeNull();
@@ -101,6 +133,9 @@ describe("NodeResultsController", function() {
         expect($scope.testing_results).toBeNull();
         expect($scope.installation_results).toBeNull();
         expect($scope.results).toBeNull();
+        expect($scope.logs.option).toBeNull();
+        expect($scope.logs.availableOptions).toEqual([]);
+        expect($scope.logOutput).toEqual("Loading...");
         expect($scope.loaded).toBe(false);
         expect($scope.resultsLoaded).toBe(false);
         expect($scope.node).toBeNull();
@@ -203,4 +238,199 @@ describe("NodeResultsController", function() {
         $rootScope.$digest();
         expect($scope.resultsLoaded).toBe(true);
     });
+
+    describe("updateLogs", function() {
+        it("only runs on logs page", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            MachinesManager._activeItem = node;
+            var manager = NodeResultsManagerFactory.getManager(node);
+            var loadDefer = $q.defer();
+
+            defer.resolve();
+            $rootScope.$digest();
+            loadDefer.resolve();
+            $rootScope.$digest();
+            expect($scope.logs.availableOptions).toEqual([]);
+        });
+
+        it("loads summary", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            $scope.section = {area: "logs"};
+            MachinesManager._activeItem = node;
+            webSocket.returnData.push(makeFakeResponse([]));
+            var manager = NodeResultsManagerFactory.getManager(node);
+
+            defer.resolve();
+            $rootScope.$digest();
+            var expectFunc;
+            expectFunc = function() {
+                if($scope.resultsLoaded) {
+                    expect($scope.logs.availableOptions).toEqual([
+                        {
+                            title: 'Machine output (YAML)',
+                            id: 'summary_yaml'
+                        },
+                        {
+                            title: 'Machine output (XML)',
+                            id: 'summary_xml'
+                        }
+                    ]);
+                    expect($scope.logs.option).toEqual({
+                        title: 'Machine output (YAML)',
+                        id: 'summary_yaml'
+                    });
+                }else{
+                    setTimeout(expectFunc);
+                }
+            };
+            setTimeout(expectFunc);
+        });
+    });
+
+    describe("updateLogOutput", function() {
+        it("sets to loading when no node", function() {
+            var controller = makeController();
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual("Loading...");
+        });
+
+        it("sets summary xml", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            MachinesManager._activeItem = node;
+            var managerDefer = $q.defer();
+            $scope.logs = {option: {id: "summary_xml"}};
+            spyOn(MachinesManager, "getSummaryXML").and.returnValue(
+                managerDefer.promise);
+
+            defer.resolve();
+            $rootScope.$digest();
+            managerDefer.resolve();
+            $rootScope.$digest();
+
+            $scope.updateLogOutput();
+            expect(MachinesManager.getSummaryXML).toHaveBeenCalledWith(node);
+        });
+
+        it("sets summary yaml", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            MachinesManager._activeItem = node;
+            var managerDefer = $q.defer();
+            $scope.logs = {option: {id: "summary_yaml"}};
+            spyOn(MachinesManager, "getSummaryYAML").and.returnValue(
+                managerDefer.promise);
+
+            defer.resolve();
+            $rootScope.$digest();
+            managerDefer.resolve();
+            $rootScope.$digest();
+
+            $scope.updateLogOutput();
+            expect(MachinesManager.getSummaryYAML).toHaveBeenCalledWith(node);
+        });
+
+        it("sets system booting", function() {
+            var controller = makeController();
+            var installation_result = makeResult(1, 0);
+            $scope.installation_results = [installation_result];
+            $scope.node = node;
+            $scope.logs = {option: {id: installation_result.id}};
+
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual("System is booting...");
+        });
+
+        it("sets installation has begun", function() {
+            var controller = makeController();
+            var installation_result = makeResult(1, 1);
+            $scope.installation_results = [installation_result];
+            $scope.node = node;
+            $scope.logs = {option: {id: installation_result.id}};
+
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual("Installation has begun!");
+        });
+
+        it("sets installation output succeeded", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            var installation_result = makeResult(1, 2);
+            MachinesManager._activeItem = node;
+            var manager = NodeResultsManagerFactory.getManager(node);
+            var managerDefer = $q.defer();
+            spyOn(manager, "get_result_data").and.returnValue(
+                managerDefer.promise);
+
+            defer.resolve();
+            $rootScope.$digest();
+            managerDefer.resolve();
+            $rootScope.$digest();
+
+            $scope.installation_results = [installation_result];
+            $scope.logs = {option: {id: installation_result.id}};
+            $scope.updateLogOutput();
+            expect(manager.get_result_data).toHaveBeenCalledWith(
+                installation_result.id, 'combined');
+        });
+
+        it("sets installation output failed", function() {
+            var defer = $q.defer();
+            var controller = makeController(defer);
+            var installation_result = makeResult(1, 3);
+            MachinesManager._activeItem = node;
+            var manager = NodeResultsManagerFactory.getManager(node);
+            var managerDefer = $q.defer();
+            spyOn(manager, "get_result_data").and.returnValue(
+                managerDefer.promise);
+
+            defer.resolve();
+            $rootScope.$digest();
+            managerDefer.resolve();
+            $rootScope.$digest();
+
+            $scope.installation_results = [installation_result];
+            $scope.logs = {option: {id: installation_result.id}};
+            $scope.updateLogOutput();
+            expect(manager.get_result_data).toHaveBeenCalledWith(
+                installation_result.id, 'combined');
+        });
+
+        it("sets timed out", function() {
+            var controller = makeController();
+            var installation_result = makeResult(1, 4);
+            $scope.installation_results = [installation_result];
+            $scope.node = node;
+            $scope.logs = {option: {id: installation_result.id}};
+
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual(
+                "Installation failed after 40 minutes.");
+        });
+
+        it("sets installation aborted", function() {
+            var controller = makeController();
+            var installation_result = makeResult(1, 5);
+            $scope.installation_results = [installation_result];
+            $scope.node = node;
+            $scope.logs = {option: {id: installation_result.id}};
+
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual("Installation was aborted.");
+        });
+
+        it("sets unknown status", function() {
+            var controller = makeController();
+            var installation_result = makeResult(1, makeInteger(6, 100));
+            $scope.installation_results = [installation_result];
+            $scope.node = node;
+            $scope.logs = {option: {id: installation_result.id}};
+
+            $scope.updateLogOutput();
+            expect($scope.logOutput).toEqual(
+                "BUG: Unknown log status " + installation_result.status);
+        });
+    });
 });
diff --git a/src/maasserver/static/js/angular/factories/nodes.js b/src/maasserver/static/js/angular/factories/nodes.js
index e1406e8..1b4c0de 100644
--- a/src/maasserver/static/js/angular/factories/nodes.js
+++ b/src/maasserver/static/js/angular/factories/nodes.js
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+/* Copyright 2015-2017 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * MAAS Nodes Manager
@@ -337,5 +337,17 @@ angular.module('MAAS').service(
                     this._handler + ".set_boot_disk", params);
             };
 
+        NodesManager.prototype.getSummaryXML = function(node) {
+            return RegionConnection.callMethod(
+                this._handler + ".get_summary_xml",
+                {"system_id": node.system_id});
+        };
+
+        NodesManager.prototype.getSummaryYAML = function(node) {
+            return RegionConnection.callMethod(
+                this._handler + ".get_summary_yaml",
+                {"system_id": node.system_id});
+        };
+
         return NodesManager;
     }]);
diff --git a/src/maasserver/static/js/angular/factories/tests/test_nodes.js b/src/maasserver/static/js/angular/factories/tests/test_nodes.js
index 39dce06..77ce066 100644
--- a/src/maasserver/static/js/angular/factories/tests/test_nodes.js
+++ b/src/maasserver/static/js/angular/factories/tests/test_nodes.js
@@ -826,4 +826,36 @@ describe("NodesManager", function() {
             });
         });
     });
+
+    describe("getSummaryXML", function() {
+
+        it("calls machine.get_summary_xml", function(done) {
+            var fakemachine = makemachine();
+            var summary_xml = makeName("summary_xml");
+            webSocket.returnData.push(makeFakeResponse(summary_xml));
+            MachinesManager.getSummaryXML(fakemachine).then(function(output) {
+                var sentObject = angular.fromJson(webSocket.sentData[0]);
+                expect(sentObject.method).toBe("machine.get_summary_xml");
+                expect(sentObject.params.system_id).toBe(fakemachine.system_id);
+                expect(output).toBe(summary_xml);
+                done();
+            });
+        });
+    });
+
+    describe("getSummaryYAML", function() {
+
+        it("calls machine.get_summary_yaml", function(done) {
+            var fakemachine = makemachine();
+            var summary_yaml = makeName("summary_yaml");
+            webSocket.returnData.push(makeFakeResponse(summary_yaml));
+            MachinesManager.getSummaryYAML(fakemachine).then(function(output) {
+                var sentObject = angular.fromJson(webSocket.sentData[0]);
+                expect(sentObject.method).toBe("machine.get_summary_yaml");
+                expect(sentObject.params.system_id).toBe(fakemachine.system_id);
+                expect(output).toBe(summary_yaml);
+                done();
+            });
+        });
+    });
 });
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 9e4c16e..22dda29 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -219,9 +219,9 @@
                 <button role="tab" class="page-navigation__link" data-ng-if="node.testing_script_count > 0"
                     data-ng-class="{ 'is-active': section.area === 'testing'}"
                     data-ng-click="section.area = 'testing'"><span data-maas-script-status="script-status" data-script-status="node.testing_status"></span> Hardware tests</button>
-                <button role="tab" class="page-navigation__link" data-ng-if="machine_output.viewable"
+                <button role="tab" class="page-navigation__link" data-ng-if="node.has_logs"
                     data-ng-class="{ 'is-active': section.area === 'logs'}"
-                    data-ng-click="section.area = 'logs'"><span data-maas-script-status="script-status" data-script-status="node.installation_status" data-ng-if="node.installation_results.length > 0"></span> Logs</button>
+                    data-ng-click="section.area = 'logs'"><span data-maas-script-status="script-status" data-script-status="node.installation_status" data-ng-if="node.installation_status !== -1"></span> Logs</button>
                 <button role="tab" class="page-navigation__link" data-ng-if="!isDevice"
                     data-ng-class="{ 'is-active': section.area === 'events'}"
                     data-ng-click="section.area = 'events'">Events</button>
@@ -257,7 +257,7 @@
         </div>
         <div class="p-notification--warning twelve-col" data-ng-if="showFailedTestWarning()">
             <p class="p-notification__response">
-	        <span class="p-notification__status">Warning:</span>Machine has failed tests; use with caution!</p>
+                <span class="p-notification__status">Warning:</span>Machine has failed tests; use with caution!</p>
         </div>
         <div class="twelve-col u-equal-height" data-ng-if="isDevice">
           <div class="four-col action-card action-card--positionable u-border--solid">
@@ -2393,30 +2393,23 @@
         </div>
     </section>
     <section class="row" data-ng-if="section.area === 'logs'">
-      <div class="wrapper--inner">
-        <div class="twelve-col">
-          <div data-maas-cta="machine_output.views"
-              data-ng-model="machine_output.selectedView">
-          </div>
-        </div>
-      </div>
-      <div class="wrapper--inner" data-ng-if="machine_output.selectedView.name == 'summary_yaml'">
-        <div class="twelve-col">
-          <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="getSummaryData('yaml')">
-          </pre>
-        </div>
-      </div>
-      <div class="wrapper--inner" data-ng-if="machine_output.selectedView.name == 'summary_xml'">
-        <div class="twelve-col">
-          <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="getSummaryData('xml')">
-          </pre>
-        </div>
-      </div>
-      <div class="wrapper--inner" data-ng-if="machine_output.selectedView.name == 'installation'">
-        <div class="twelve-col">
-          <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="getInstallationData()"></pre>
+        <div data-ng-controller="NodeResultsController">
+            <div class="twelve-col" data-ng-if="!resultsLoaded">
+                <p class="u-text--loading"><i class="icon icon--loading u-animation--spin"></i>&nbsp;&nbsp;Loading...</p>
+            </div>
+            <div data-ng-if="resultsLoaded">
+                <div class="wrapper--inner">
+                    <div class="twelve-col">
+                        <div data-maas-cta="logs.availableOptions" data-ng-model="logs.option" data-ng-change="updateLogOutput()">
+                    </div>
+                </div>
+                <div class="wrapper--inner">
+                    <div class="twelve-col">
+                        <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="logOutput"></pre>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </section>
     <section class="row" data-ng-if="section.area === 'commissioning'">
         <div data-maas-script-results-list="script-results"></div>