Merge lp:~ltrager/maas/installation_tab into lp:~maas-committers/maas/trunk

[Lee Trager]

Add installation tab to UI

The installation tab appears when a node has a current_installation_script_set. When no output is available a status message now appears. Like commissioning and testing a status icon is on the installation tab. To capture when installation starts the metadata server now looks for the status start message from curtin.

[Andres Rodriguez (andreserl)]

Having an installation tab that will be empty most of the lifecycle of a machine is not really ideal. Put the installation output on the summary page.

review: Needs Fixing

[Blake Rouse (blake-rouse)]

This looks good. The installation tab only shows up when in deploying, deployed, failed deployment. The icons on the tab are really cool and the messaging you show is very nice. This is a huge improvement!

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
--- src/maasserver/static/js/angular/controllers/node_details.js	2017-04-04 19:10:53 +0000
+++ src/maasserver/static/js/angular/controllers/node_details.js	2017-04-20 09:13:49 +0000
@@ -969,15 +969,28 @@
             // 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)) {
-                return "";
-            }
-            if(results.length === 0) {
-                return "";
+            if(!angular.isArray(results) ||
+                    results.length === 0 || results[0].output === "") {
+                switch($scope.node.installation_script_set_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 {
-                // Prepend a newline before the data, because the code
-                // tag requires that the content start on a newline.
-                return "\n" + results[0].output;
+                return results[0].output;
             }
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-04-04 19:10:53 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-04-20 09:13:49 +0000
@@ -2165,7 +2165,14 @@
             $scope.node.installation_results.push({
                 output: {}
             });
-            expect($scope.getInstallationData()).toBe("\n" + install_result);
+            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_script_set_status = makeInteger(0, 5);
+            expect($scope.getInstallationData()).not.toBe("");
         });
     });
 

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2017-04-18 14:59:13 +0000
+++ src/maasserver/static/partials/node-details.html	2017-04-20 09:13:49 +0000
@@ -205,6 +205,9 @@
                 <button role="tab" class="page-navigation__link" data-ng-if="!isController && !isDevice"
                     data-ng-class="{ 'is-active': section.area === 'storage'}"
                     data-ng-click="section.area = 'storage'">Storage</button>
+                <button role="tab" class="page-navigation__link" data-ng-if="node.installation_results.length > 0"
+                    data-ng-class="{ 'is-active': section.area === 'installation'}"
+                    data-ng-click="section.area = 'installation'"><span class="icon" data-ng-class="{ 'icon--warning': node.installation_script_set_status === -1, 'icon--pending': node.installation_script_set_status === 0, 'icon--running': node.installation_script_set_status === 1, 'icon--pass': node.installation_script_set_status === 2, 'icon--status-failed': node.installation_script_set_status === 3 || node.installation_script_set_status === 5, 'icon--timed-out': node.installation_script_set_status === 4 }"></span> Installation</button>
                 <button role="tab" class="page-navigation__link" data-ng-if="node.commissioning_results.length > 0"
                     data-ng-class="{ 'is-active': section.area === 'commissioning'}"
                     data-ng-click="section.area = 'commissioning'"><span class="icon" data-ng-class="{ 'icon--warning': node.commissioning_script_set_status === -1, 'icon--pending': node.commissioning_script_set_status === 0, 'icon--running': node.commissioning_script_set_status === 1, 'icon--pass': node.commissioning_script_set_status === 2, 'icon--status-failed': node.commissioning_script_set_status === 3 || node.commissioning_script_set_status === 5, 'icon--timed-out': node.commissioning_script_set_status === 4 }"></span> Commissioning</button>
@@ -2329,6 +2332,11 @@
             </div>
         </div>
     </section>
+    <section class="row" data-ng-if="section.area === 'installation'">
+        <div class="wrapper--inner">
+            <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="getInstallationData()"></pre>
+        </div>
+    </section>
     <section class="row" data-ng-if="section.area === 'commissioning'">
         <div class="wrapper--inner">
             <div class="twelve-col">
@@ -2355,10 +2363,6 @@
                     </tbody>
                 </table>
             </div>
-            <div class="twelve-col ng-hide" data-ng-show="machine_output.selectedView.name === 'installation'">
-                <pre class="code-block code-block--numbering code-block--terminal" data-maas-code-lines="getInstallationData()">
-                </pre>
-            </div>
         </div>
     </section>
     <section class="row" data-ng-if="section.area === 'testing'">

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2017-04-05 16:41:49 +0000
+++ src/maasserver/websockets/handlers/node.py	2017-04-20 09:13:49 +0000
@@ -449,13 +449,6 @@
             else:
                 output = script_result.stdout
 
-            # MAAS creates an empty script result when commissioning starts for
-            # tracking. Don't show the result in the UI until we actually have
-            # something to display.
-            if (script_set.result_type == RESULT_TYPE.INSTALLATION and
-                    output == b''):
-                continue
-
             if script_result.script is not None:
                 tags = ', '.join(script_result.script.tags)
                 title = script_result.script.title

=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
--- src/maasserver/websockets/handlers/tests/test_machine.py	2017-04-17 21:39:12 +0000
+++ src/maasserver/websockets/handlers/tests/test_machine.py	2017-04-20 09:13:49 +0000
@@ -946,17 +946,6 @@
                 'runtime': script_result.runtime,
             }, handler.dehydrate_script_set(script_result.script_set)[0])
 
-    def test_dehydrate_script_set_returns_nothing_for_empty_installation(self):
-        owner = factory.make_User()
-        handler = MachineHandler(owner, {})
-        script_set = factory.make_ScriptSet(
-            result_type=RESULT_TYPE.INSTALLATION)
-        script_result = factory.make_ScriptResult(
-            stdout=b'', stderr=b'', output=b'',
-            status=SCRIPT_STATUS.PASSED, script_set=script_set)
-        self.assertItemsEqual(
-            [], handler.dehydrate_script_set(script_result.script_set))
-
     def test_dehydrate_script_set_status(self):
         owner = factory.make_User()
         handler = MachineHandler(owner, {})

=== modified file 'src/metadataserver/api_twisted.py'
--- src/metadataserver/api_twisted.py	2017-04-13 20:40:33 +0000
+++ src/metadataserver/api_twisted.py	2017-04-20 09:13:49 +0000
@@ -16,6 +16,7 @@
     NODE_TYPE,
 )
 from maasserver.models.timestampedmodel import now
+from maasserver.preseed import CURTIN_INSTALL_LOG
 from maasserver.utils.orm import (
     in_transaction,
     make_serialization_failure,
@@ -28,6 +29,7 @@
     add_event_to_node_event_log,
     process_file,
 )
+from metadataserver.enum import SCRIPT_STATUS
 from metadataserver.models import (
     NodeKey,
     ScriptSet,
@@ -354,6 +356,14 @@
                 node.owner = None
                 node.error = 'failed: %s' % description
                 save_node = True
+        elif self._is_top_level(activity_name) and event_type == 'start':
+            if (node.status == NODE_STATUS.DEPLOYING and
+                    activity_name == 'cmd-install' and origin == 'curtin'):
+                script_set = node.current_installation_script_set
+                script_result = script_set.find_script_result(
+                    script_name=CURTIN_INSTALL_LOG)
+                script_result.status = SCRIPT_STATUS.RUNNING
+                script_result.save(update_fields=['status'])
 
         if save_node:
             node.save()
@@ -413,11 +423,16 @@
             message['timestamp'] = datetime.utcnow()
 
         # Determine if this messsage needs to be processed immediately.
+        is_starting_event = (
+            self._is_top_level(message['name']) and
+            message['name'] == 'cmd-install' and
+            message['event_type'] == 'start' and
+            message['origin'] == 'curtin')
         is_final_event = (
             self._is_top_level(message['name']) and
             message['event_type'] == 'finish')
         has_files = len(message.get('files', [])) > 0
-        if is_final_event or has_files:
+        if is_starting_event or is_final_event or has_files:
             d = deferToDatabase(
                 self._processMessageNow, authorization, message)
             d.addErrback(

=== modified file 'src/metadataserver/tests/test_api_twisted.py'
--- src/metadataserver/tests/test_api_twisted.py	2017-04-13 20:40:33 +0000
+++ src/metadataserver/tests/test_api_twisted.py	2017-04-20 09:13:49 +0000
@@ -23,6 +23,7 @@
     Tag,
 )
 from maasserver.models.signals.testing import SignalsDisabled
+from maasserver.preseed import CURTIN_INSTALL_LOG
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import (
     MAASServerTestCase,
@@ -845,3 +846,19 @@
             }
             script_set = script_set_statuses.get(node.status)
             self.assertIsNotNone(script_set.last_ping)
+
+    def test_captures_installation_start(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.DEPLOYING, with_empty_script_sets=True)
+        payload = {
+            'event_type': 'start',
+            'origin': 'curtin',
+            'name': 'cmd-install',
+            'description': 'Installation has started.',
+            'timestamp': datetime.utcnow(),
+        }
+        self.processMessage(node, payload)
+        script_set = node.current_installation_script_set
+        script_result = script_set.find_script_result(
+            script_name=CURTIN_INSTALL_LOG)
+        self.assertEqual(SCRIPT_STATUS.RUNNING, script_result.status)