Merge lp:~blake-rouse/maas/hide-os-when-not-valid into lp:~maas-committers/maas/trunk

[Blake Rouse]

Don't show the OS information in the machine summary unless it is in a state where it should be shown.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/hide-os-when-not-valid into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp python-tz python-unittest2 python-virtualenv python-yaml python-zope.interface socat syslinux-common ...

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-10-09 07:58:28 +0000
+++ src/maasserver/static/partials/node-details.html	2015-10-09 21:10:27 +0000
@@ -236,12 +236,12 @@
                             <dd class="four-col last-col">
                                 {$ node.storage $}GB over {$ node.physical_disk_count $} disks
                             </dd>
-                        <dt class="two-col">Operating System</dt>
-                            <dd class="four-col last-col">{$ getOSText() $}</dd>
-                        <dt class="two-col">Kernel</dt>
-                            <dd class="four-col last-col">{$ node.hwe_kernel $}</dd>
-                        <dt class="two-col ng-hide" data-ng-show="node.third_party_driver">Third Party Driver</dt>
-                            <dd class="four-col last-col ng-hide" data-ng-show="node.third_party_driver">
+                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info">Operating System</dt>
+                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info">{$ getOSText() $}</dd>
+                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info">Kernel</dt>
+                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info">{$ node.hwe_kernel $}</dd>
+                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info && node.third_party_driver">Third Party Driver</dt>
+                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info && node.third_party_driver">
                                 {$ node.third_party_driver.module $} "{$ node.third_party_driver.comment $}"
                             </dd>
                     </dl>

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2015-10-06 05:58:47 +0000
+++ src/maasserver/websockets/handlers/node.py	2015-10-09 21:10:27 +0000
@@ -27,6 +27,7 @@
     INTERFACE_LINK_TYPE,
     IPADDRESS_TYPE,
     NODE_PERMISSION,
+    NODE_STATUS,
 )
 from maasserver.exceptions import NodeActionError
 from maasserver.forms import (
@@ -242,6 +243,7 @@
             for tag in obj.tags.all()
         ]
         if not for_list:
+            data["show_os_info"] = self.dehydrate_show_os_info(obj)
             data["osystem"] = obj.get_osystem()
             data["distro_series"] = obj.get_distro_series()
             data["hwe_kernel"] = obj.hwe_kernel
@@ -291,6 +293,17 @@
 
         return data
 
+    def dehydrate_show_os_info(self, obj):
+        """Return True if OS information should show in the UI."""
+        return (
+            obj.status == NODE_STATUS.DEPLOYING or
+            obj.status == NODE_STATUS.FAILED_DEPLOYMENT or
+            obj.status == NODE_STATUS.DEPLOYED or
+            obj.status == NODE_STATUS.RELEASING or
+            obj.status == NODE_STATUS.FAILED_RELEASING or
+            obj.status == NODE_STATUS.DISK_ERASING or
+            obj.status == NODE_STATUS.FAILED_DISK_ERASING)
+
     def dehydrate_device(self, device):
         """Return the `Device` formatted for JSON encoding."""
         return {

=== modified file 'src/maasserver/websockets/handlers/tests/test_node.py'
--- src/maasserver/websockets/handlers/tests/test_node.py	2015-10-06 05:58:47 +0000
+++ src/maasserver/websockets/handlers/tests/test_node.py	2015-10-09 21:10:27 +0000
@@ -176,6 +176,7 @@
                 "%s" % boot_interface.mac_address),
             "pxe_mac_vendor": "" if pxe_mac_vendor is None else pxe_mac_vendor,
             "routers": handler.dehydrate_routers(node.routers),
+            "show_os_info": handler.dehydrate_show_os_info(node),
             "status": node.display_status(),
             "storage": "%3.1f" % (sum([
                 blockdevice.size
@@ -294,6 +295,18 @@
         }
         self.assertEquals(params, handler.dehydrate_power_parameters(params))
 
+    def test_dehydrate_show_os_info_returns_true(self):
+        owner = factory.make_User()
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.DEPLOYED)
+        handler = NodeHandler(owner, {})
+        self.assertTrue(handler.dehydrate_show_os_info(node))
+
+    def test_dehydrate_show_os_info_returns_false(self):
+        owner = factory.make_User()
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.READY)
+        handler = NodeHandler(owner, {})
+        self.assertFalse(handler.dehydrate_show_os_info(node))
+
     def test_dehydrate_device(self):
         owner = factory.make_User()
         node = factory.make_Node(owner=owner)