Merge lp:~newell-jensen/maas/maas-maasserver-ui-curtin-install-log into lp:~maas-committers/maas/trunk

[Newell Jensen]

Adding UI changes to handle NodeResult result_type results.

[Blake Rouse (blake-rouse)]

I think the big issue is that you do not display multiple installation files on the view. I know that chances are you will only have one result per installation, but since the model supports it I would allow it. There could be a chance that an installation could store multiple results, maybe d-i or a custom image.

Other than that most looks good, just a few other comments.

review: Needs Fixing

[Newell Jensen (newell-jensen)]

Ready for another review.

[Blake Rouse (blake-rouse)]

I think its close. Couple of questions.

review: Needs Information

[Newell Jensen (newell-jensen)]

> I think its close. Couple of questions.

See inline for responses.

[Newell Jensen (newell-jensen)]

See inline for responses.

[Newell Jensen (newell-jensen)]

Have another look BRAH...okay that was last one.

[Newell Jensen (newell-jensen)]

Added edit permissions changes and tests. Have another look.

[Blake Rouse (blake-rouse)]

You need to fix the views for both commissioning and installing. They currently only allow an admin to view those pages, but your showing the links to those pages if its the owner of the node as well.

So you need to make sure that owners of the node can view those pages.

Also you should move the installation results above the commissioning results. I think it is more important.

review: Needs Fixing

[Newell Jensen (newell-jensen)]

> You need to fix the views for both commissioning and installing. They
> currently only allow an admin to view those pages, but your showing the links
> to those pages if its the owner of the node as well.
>
> So you need to make sure that owners of the node can view those pages.
>
> Also you should move the installation results above the commissioning results.
> I think it is more important.

Added permissions for node owners and admins.

[Blake Rouse (blake-rouse)]

Looking good now!

review: Approve

=== renamed file 'src/maasserver/api/commissioning_results.py' => 'src/maasserver/api/results.py'
--- src/maasserver/api/commissioning_results.py	2014-08-17 02:19:33 +0000
+++ src/maasserver/api/results.py	2014-08-20 20:35:23 +0000
@@ -13,7 +13,7 @@
 
 __metaclass__ = type
 __all__ = [
-    'CommissioningResultsHandler',
+    'NodeResultsHandler',
     ]
 
 from maasserver.api.support import (
@@ -29,7 +29,7 @@
 from metadataserver.models import NodeResult
 
 
-class CommissioningResultsHandler(OperationsHandler):
+class NodeResultsHandler(OperationsHandler):
     """Read the collection of NodeResult in the MAAS."""
     api_doc_section_name = "Commissioning results"
     create = read = update = delete = None
@@ -69,4 +69,4 @@
 
     @classmethod
     def resource_uri(cls, result=None):
-        return ('commissioning_results_handler', [])
+        return ('node_results_handler', [])

=== modified file 'src/maasserver/api/tests/test_commissioning.py'
--- src/maasserver/api/tests/test_commissioning.py	2014-08-16 05:43:33 +0000
+++ src/maasserver/api/tests/test_commissioning.py	2014-08-20 20:35:23 +0000
@@ -255,7 +255,7 @@
         commissioning_results = [
             factory.make_node_commission_result()
             for counter in range(3)]
-        url = reverse('commissioning_results_handler')
+        url = reverse('node_results_handler')
         response = self.client.get(url, {'op': 'list'})
         self.assertEqual(httplib.OK, response.status_code, response.content)
         parsed_results = json.loads(response.content)
@@ -284,7 +284,7 @@
         commissioning_results = [
             factory.make_node_commission_result()
             for counter in range(3)]
-        url = reverse('commissioning_results_handler')
+        url = reverse('node_results_handler')
         response = self.client.get(
             url,
             {
@@ -306,7 +306,7 @@
         commissioning_results = [
             factory.make_node_commission_result()
             for counter in range(3)]
-        url = reverse('commissioning_results_handler')
+        url = reverse('node_results_handler')
         response = self.client.get(
             url,
             {
@@ -323,7 +323,7 @@
     def test_list_displays_only_visible_nodes(self):
         node = factory.make_node(owner=factory.make_user())
         factory.make_node_commission_result(node)
-        url = reverse('commissioning_results_handler')
+        url = reverse('node_results_handler')
         response = self.client.get(url, {'op': 'list'})
         self.assertEqual(httplib.OK, response.status_code, response.content)
         parsed_results = json.loads(response.content)

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2014-08-13 21:49:35 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2014-08-20 20:35:23 +0000
@@ -211,16 +211,34 @@
         <span>{{ node.routers|join:", " }}</span>
       </li>
     {% endif %}
-    {% if user.is_superuser and nodecommissionresults > 0 %}
-      <li class="block first size5 separate" id="nodecommissionresults">
-        <h4>Commissioning output</h4>
-        <span>
-          <a href="{% url 'nodecommissionresult-list' %}?node={{node.system_id}}">
-            {{ nodecommissionresults }}
-            output file{{ nodecommissionresults|pluralize }}
-          </a>
-        </span>
-      </li>
+    {% if can_edit %}
+      {% if nodeinstallresults != None %}
+        <li class="block first size5 separate" id="nodeinstallresults">
+          <h4>Installation output</h4>
+  	<ul>
+  	{% for install_result in nodeinstallresults %}
+  	  <li>
+              <span>
+                <a href="{% url 'nodeinstallresult-view' install_result.id %}">
+  		{{ install_result.name }}
+                </a>
+              </span>
+  	  </li>
+  	{% endfor %}
+  	</ul>
+        </li>
+      {% endif %}
+      {% if nodecommissionresults > 0 %}
+        <li class="block first size5 separate" id="nodecommissionresults">
+          <h4>Commissioning output</h4>
+          <span>
+            <a href="{% url 'nodecommissionresult-list' %}?node={{node.system_id}}">
+              {{ nodecommissionresults }}
+              output file{{ nodecommissionresults|pluralize }}
+            </a>
+          </span>
+        </li>
+      {% endif %}
     {% endif %}
     <li class="block first separate">
       <h2>Latest node events</h2>

=== renamed file 'src/maasserver/templates/metadataserver/noderesult.html' => 'src/maasserver/templates/metadataserver/nodecommissionresult.html'
=== renamed file 'src/maasserver/templates/metadataserver/noderesult_list.html' => 'src/maasserver/templates/metadataserver/nodecommissionresult_list.html'
=== added file 'src/maasserver/templates/metadataserver/nodeinstallresult.html'
--- src/maasserver/templates/metadataserver/nodeinstallresult.html	1970-01-01 00:00:00 +0000
+++ src/maasserver/templates/metadataserver/nodeinstallresult.html	2014-08-20 20:35:23 +0000
@@ -0,0 +1,35 @@
+{% extends "maasserver/base.html" %}
+
+{% block nav-active-settings %}active{% endblock %}
+{% block title %}Installing result for node {{ object.node.hostname }}, script {{ object.name }}{% endblock %}
+{% block page-title %}Installing result for node: {{ object.node.hostname }}{% endblock %}
+
+{% block content %}
+  <ul class="data-list">
+    <li class="block size7 first" id="name">
+      <h4>Output file</h4>
+      <span>{{ object.name }}</span>
+    </li>
+    <li class="block size8" id="node">
+      <h4>Node</h4>
+      <span>
+        <a href="{% url 'node-view' object.node.system_id %}">
+          {{ object.node.hostname }}
+        </a>
+      </span>
+    </li>
+    <li class="block size7 first" id="time">
+      <h4>Result registered at</h4>
+      <span>{{ object.created }}</span>
+    </li>
+    <li class="block first separate" id="output">
+      {% if object.data %}
+      <h2>Output</h2>
+<pre>
+{{ object.get_data_as_html }}
+</pre>
+      {% endif %}
+    </li>
+  </ul>
+
+{% endblock %}

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-08-19 05:21:31 +0000
+++ src/maasserver/testing/factory.py	2014-08-20 20:35:23 +0000
@@ -445,6 +445,22 @@
         ncr.save()
         return ncr
 
+    def make_node_install_result(self, node=None, name=None,
+                                 script_result=None, data=None):
+        if node is None:
+            node = self.make_node()
+        if name is None:
+            name = "ncrname-" + self.make_string(92)
+        if data is None:
+            data = b"ncrdata-" + self.make_bytes()
+        if script_result is None:
+            script_result = random.randint(0, 10)
+        ncr = NodeResult(
+            node=node, name=name, script_result=script_result,
+            result_type=RESULT_TYPE.INSTALLING, data=Bin(data))
+        ncr.save()
+        return ncr
+
     def make_MAC(self):
         """Generate a random MAC address, in the form of a MAC object."""
         return MAC(self.getRandomMACAddress())

=== modified file 'src/maasserver/urls.py'
--- src/maasserver/urls.py	2014-08-15 01:38:30 +0000
+++ src/maasserver/urls.py	2014-08-20 20:35:23 +0000
@@ -48,9 +48,10 @@
     NetworkListView,
     NetworkView,
     )
-from maasserver.views.nodecommissionresult import (
+from maasserver.views.noderesult import (
     NodeCommissionResultListView,
     NodeCommissionResultView,
+    NodeInstallResultView,
     )
 from maasserver.views.nodes import (
     enlist_preseed_view,
@@ -137,6 +138,14 @@
     url(
         r'^account/prefs/sslkey/delete/(?P<keyid>\d*)/$',
         SSLKeyDeleteView.as_view(), name='prefs-delete-sslkey'),
+    url(
+        r'^commissioning-results/(?P<id>[0-9]+)/$',
+        NodeCommissionResultView.as_view(),
+        name='nodecommissionresult-view'),
+    url(
+        r'^installation-results/(?P<id>[0-9]+)/$',
+        NodeInstallResultView.as_view(),
+        name='nodeinstallresult-view'),
     )
 # Logout view.
 urlpatterns += patterns(
@@ -248,10 +257,6 @@
         r'^commissioning-results/$',
         NodeCommissionResultListView.as_view(),
         name='nodecommissionresult-list'),
-    adminurl(
-        r'^commissioning-results/(?P<id>[0-9]+)/$',
-        NodeCommissionResultView.as_view(),
-        name='nodecommissionresult-view'),
 )
 
 # Tag views.

=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2014-08-18 13:44:26 +0000
+++ src/maasserver/urls_api.py	2014-08-20 20:35:23 +0000
@@ -32,7 +32,6 @@
     BootSourceHandler,
     BootSourcesHandler,
     )
-from maasserver.api.commissioning_results import CommissioningResultsHandler
 from maasserver.api.commissioning_scripts import (
     CommissioningScriptHandler,
     CommissioningScriptsHandler,
@@ -72,6 +71,7 @@
     NodesHandler,
     )
 from maasserver.api.pxeconfig import pxeconfig
+from maasserver.api.results import NodeResultsHandler
 from maasserver.api.ssh_keys import (
     SSHKeyHandler,
     SSHKeysHandler,
@@ -126,8 +126,8 @@
 tag_handler = RestrictedResource(TagHandler, authentication=api_auth)
 tags_handler = RestrictedResource(TagsHandler, authentication=api_auth)
 version_handler = RestrictedResource(VersionHandler)
-commissioning_results_handler = RestrictedResource(
-    CommissioningResultsHandler, authentication=api_auth)
+node_results_handler = RestrictedResource(
+    NodeResultsHandler, authentication=api_auth)
 sshkey_handler = RestrictedResource(SSHKeyHandler, authentication=api_auth)
 sshkeys_handler = RestrictedResource(SSHKeysHandler, authentication=api_auth)
 sslkey_handler = RestrictedResource(SSLKeyHandler, authentication=api_auth)
@@ -216,7 +216,10 @@
     url(r'^tags/$', tags_handler, name='tags_handler'),
     url(
         r'^commissioning-results/$',
-        commissioning_results_handler, name='commissioning_results_handler'),
+        node_results_handler, name='node_results_handler'),
+    url(
+        r'^installation-results/$',
+        node_results_handler, name='node_results_handler'),
     url(r'^users/$', users_handler, name='users_handler'),
     url(r'^users/(?P<username>[^/]+)/$', user_handler, name='user_handler'),
     url(r'^zones/(?P<name>[^/]+)/$', zone_handler, name='zone_handler'),

=== renamed file 'src/maasserver/views/nodecommissionresult.py' => 'src/maasserver/views/noderesult.py'
--- src/maasserver/views/nodecommissionresult.py	2014-08-13 21:49:35 +0000
+++ src/maasserver/views/noderesult.py	2014-08-20 20:35:23 +0000
@@ -1,7 +1,7 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Views for node commissioning results."""
+"""Views for node commissioning/installing results."""
 
 from __future__ import (
     absolute_import,
@@ -16,6 +16,7 @@
     'NodeCommissionResultListView',
     ]
 
+from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 from django.views.generic import DetailView
 from maasserver.models import Node
@@ -25,7 +26,7 @@
 
 class NodeCommissionResultListView(PaginatedListView):
 
-    template_name = 'maasserver/nodecommissionresult-list.html'
+    template_name = 'metadataserver/nodecommissionresult_list.html'
     context_object_name = 'results_list'
 
     def get_filter_system_ids(self):
@@ -52,8 +53,25 @@
 
 class NodeCommissionResultView(DetailView):
 
-    template_name = 'metadataserver/noderesult.html'
-
-    def get_object(self):
-        result_id = self.kwargs.get('id')
-        return get_object_or_404(NodeResult, id=result_id)
+    template_name = 'metadataserver/nodecommissionresult.html'
+
+    def get_object(self):
+        result_id = self.kwargs.get('id')
+        result = get_object_or_404(NodeResult, id=result_id)
+        if not self.request.user.is_superuser and \
+           self.request.user != result.node.owner:
+            raise PermissionDenied
+        return result
+
+
+class NodeInstallResultView(DetailView):
+
+    template_name = 'metadataserver/nodeinstallresult.html'
+
+    def get_object(self):
+        result_id = self.kwargs.get('id')
+        result = get_object_or_404(NodeResult, id=result_id)
+        if not self.request.user.is_superuser and \
+           self.request.user != result.node.owner:
+            raise PermissionDenied
+        return result

=== modified file 'src/maasserver/views/nodes.py'
--- src/maasserver/views/nodes.py	2014-08-13 21:49:35 +0000
+++ src/maasserver/views/nodes.py	2014-08-20 20:35:23 +0000
@@ -91,6 +91,7 @@
     HelpfulDeleteView,
     PaginatedListView,
     )
+from metadataserver.enum import RESULT_TYPE
 from metadataserver.models import NodeResult
 from netaddr import (
     EUI,
@@ -554,13 +555,19 @@
         # the call to get_single_probed_details() because here the
         # details will be guaranteed well-formed.
         if len(probed_details.xpath('/*/*')) == 0:
-            context["probed_details"] = None
+            context['probed_details'] = None
         else:
-            context["probed_details"] = etree.tostring(
+            context['probed_details'] = etree.tostring(
                 probed_details, encoding=unicode, pretty_print=True)
 
-        results = NodeResult.objects.filter(node=node).count()
-        context['nodecommissionresults'] = results
+        commissioning_results = NodeResult.objects.filter(
+            node=node, result_type=RESULT_TYPE.COMMISSIONING).count()
+        context['nodecommissionresults'] = commissioning_results
+
+        installation_results = NodeResult.objects.filter(
+            node=node, result_type=RESULT_TYPE.INSTALLING)
+        if len(installation_results) > 0:
+            context['nodeinstallresults'] = installation_results
 
         context['third_party_drivers_enabled'] = Config.objects.get_config(
             'enable_third_party_drivers')

=== renamed file 'src/maasserver/views/tests/test_nodecommissionresults.py' => 'src/maasserver/views/tests/test_noderesult.py'
--- src/maasserver/views/tests/test_nodecommissionresults.py	2014-08-13 21:49:35 +0000
+++ src/maasserver/views/tests/test_noderesult.py	2014-08-20 20:35:23 +0000
@@ -25,7 +25,7 @@
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import get_one
-from maasserver.views.nodecommissionresult import NodeCommissionResultListView
+from maasserver.views.noderesult import NodeCommissionResultListView
 from mock import Mock
 from testtools.matchers import HasLength
 
@@ -35,6 +35,73 @@
     return ' '.join(text.split())
 
 
+def extract_field(doc, field_name, containing_tag='span'):
+    """Get the content text from one of the <li> fields on the page.
+
+    This works on the basis that each of the fields has an `id` attribute
+    which is unique on the page, and contains exactly one tag of the type
+    given as `containing_tag`, which holds the field value.
+    """
+    field = get_one(doc.cssselect('#' + field_name))
+    value = get_one(field.cssselect(containing_tag))
+    return value.text_content().strip()
+
+
+class TestNodeInstallResultView(MAASServerTestCase):
+
+    def request_page(self, result):
+        """Request and parse the  page for the given `NodeResult`.
+
+        :return: The page's main content as an `lxml.html.HtmlElement`.
+        """
+        link = reverse('nodeinstallresult-view', args=[result.id])
+        response = self.client.get(link)
+        self.assertEqual(httplib.OK, response.status_code, response.content)
+        doc = html.fromstring(response.content)
+        return get_one(doc.cssselect('#content'))
+
+    def test_installing_forbidden_without_edit_perm(self):
+        self.client_log_in(as_admin=False)
+        result = factory.make_node_install_result()
+        response = self.client.get(
+            reverse('nodeinstallresult-view', args=[result.id]))
+        self.assertEqual(httplib.FORBIDDEN, response.status_code)
+
+    def test_installing_allowed_with_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node(owner=user)
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_install_result(node=node)
+        response = self.client.get(
+            reverse('nodeinstallresult-view', args=[result.id]))
+        self.assertEqual(httplib.OK, response.status_code)
+
+    def test_installing_escapes_html_in_output(self):
+        self.client_log_in(as_admin=True)
+        # It's actually surprisingly hard to test for this, because lxml
+        # un-escapes on parsing, and is very tolerant of malformed input.
+        # Parsing an un-escaped A<B>C, however, would produce text "AC"
+        # (because the <B> looks like a tag).
+        result = factory.make_node_install_result(data=b'A<B>C')
+        doc = self.request_page(result)
+        self.assertEqual('A<B>C', extract_field(doc, 'output', 'pre'))
+
+    def test_installing_escapes_binary_in_output(self):
+        self.client_log_in(as_admin=True)
+        result = factory.make_node_install_result(data=b'A\xffB')
+        doc = self.request_page(result)
+        self.assertEqual('A\ufffdB', extract_field(doc, 'output', 'pre'))
+
+    def test_installing_hides_output_if_empty(self):
+        self.client_log_in(as_admin=True)
+        result = factory.make_node_install_result(data=b'')
+        doc = self.request_page(result)
+        field = get_one(doc.cssselect('#output'))
+        self.assertEqual('', field.text_content().strip())
+
+
 class TestNodeCommissionResultView(MAASServerTestCase):
 
     def request_page(self, result):
@@ -48,40 +115,40 @@
         doc = html.fromstring(response.content)
         return get_one(doc.cssselect('#content'))
 
-    def extract_field(self, doc, field_name, containing_tag='span'):
-        """Get the content text from one of the <li> fields on the page.
-
-        This works on the basis that each of the fields has an `id` attribute
-        which is unique on the page, and contains exactly one tag of the type
-        given as `containing_tag`, which holds the field value.
-        """
-        field = get_one(doc.cssselect('#' + field_name))
-        value = get_one(field.cssselect(containing_tag))
-        return value.text_content().strip()
-
-    def test_requires_admin(self):
+    def test_commissioning_forbidden_without_edit_perm(self):
         self.client_log_in(as_admin=False)
         result = factory.make_node_commission_result()
         response = self.client.get(
             reverse('nodecommissionresult-view', args=[result.id]))
-        self.assertEqual(reverse('login'), extract_redirect(response))
-
-    def test_displays_result(self):
+        self.assertEqual(httplib.FORBIDDEN, response.status_code)
+
+    def test_commissioning_allowed_with_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node(owner=user)
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_commission_result(node=node)
+        response = self.client.get(
+            reverse('nodecommissionresult-view', args=[result.id]))
+        self.assertEqual(httplib.OK, response.status_code)
+
+    def test_commissioning_displays_result(self):
         self.client_log_in(as_admin=True)
         result = factory.make_node_commission_result(
             data=factory.make_string().encode('ascii'))
         doc = self.request_page(result)
 
-        self.assertEqual(result.name, self.extract_field(doc, 'name'))
+        self.assertEqual(result.name, extract_field(doc, 'name'))
         self.assertEqual(
             result.node.hostname,
-            self.extract_field(doc, 'node'))
+            extract_field(doc, 'node'))
         self.assertEqual(
             "%d" % result.script_result,
-            self.extract_field(doc, 'script-result'))
-        self.assertEqual(result.data, self.extract_field(doc, 'output', 'pre'))
+            extract_field(doc, 'script-result'))
+        self.assertEqual(result.data, extract_field(doc, 'output', 'pre'))
 
-    def test_escapes_html_in_output(self):
+    def test_commissioning_escapes_html_in_output(self):
         self.client_log_in(as_admin=True)
         # It's actually surprisingly hard to test for this, because lxml
         # un-escapes on parsing, and is very tolerant of malformed input.
@@ -89,15 +156,15 @@
         # (because the <B> looks like a tag).
         result = factory.make_node_commission_result(data=b'A<B>C')
         doc = self.request_page(result)
-        self.assertEqual('A<B>C', self.extract_field(doc, 'output', 'pre'))
+        self.assertEqual('A<B>C', extract_field(doc, 'output', 'pre'))
 
-    def test_escapes_binary_in_output(self):
+    def test_commissioning_escapes_binary_in_output(self):
         self.client_log_in(as_admin=True)
         result = factory.make_node_commission_result(data=b'A\xffB')
         doc = self.request_page(result)
-        self.assertEqual('A\ufffdB', self.extract_field(doc, 'output', 'pre'))
+        self.assertEqual('A\ufffdB', extract_field(doc, 'output', 'pre'))
 
-    def test_hides_output_if_empty(self):
+    def test_commissioning_hides_output_if_empty(self):
         self.client_log_in(as_admin=True)
         result = factory.make_node_commission_result(data=b'')
         doc = self.request_page(result)

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-08-19 18:38:26 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-08-20 20:35:23 +0000
@@ -76,6 +76,7 @@
     NodeView,
     )
 from maastesting.djangotestcase import count_queries
+from metadataserver.enum import RESULT_TYPE
 from metadataserver.models.commissioningscript import (
     LIST_MODALIASES_OUTPUT_NAME,
     LLDP_OUTPUT_NAME,
@@ -1264,10 +1265,12 @@
             nodes_views.construct_third_party_drivers_notice(True).strip())
 
 
-class NodeCommissionResultsDisplayTest(MAASServerTestCase):
-    """Tests for the link to node commissioning results on the Node page."""
+class NodeResultsDisplayTest(MAASServerTestCase):
+    """Tests for the link to node commissioning/installing
+    results on the Node page.
+    """
 
-    def request_results_display(self, node):
+    def request_results_display(self, node, result_type):
         """Request the page for `node`, and extract the results display.
 
         Fails if generating, loading or parsing the page failed; or if
@@ -1281,7 +1284,10 @@
         response = self.client.get(node_link)
         self.assertEqual(httplib.OK, response.status_code, response.content)
         doc = fromstring(response.content)
-        results_display = doc.cssselect('#nodecommissionresults')
+        if result_type == RESULT_TYPE.COMMISSIONING:
+            results_display = doc.cssselect('#nodecommissionresults')
+        elif result_type == RESULT_TYPE.INSTALLING:
+            results_display = doc.cssselect('#nodeinstallresults')
         if len(results_display) == 0:
             return None
         elif len(results_display) == 1:
@@ -1313,7 +1319,8 @@
     def test_view_node_links_to_commissioning_results_if_appropriate(self):
         self.client_log_in(as_admin=True)
         result = factory.make_node_commission_result()
-        section = self.request_results_display(result.node)
+        section = self.request_results_display(
+            result.node, RESULT_TYPE.COMMISSIONING)
         link = self.get_results_link(section)
         results_list = reverse('nodecommissionresult-list')
         self.assertEqual(
@@ -1323,17 +1330,39 @@
     def test_view_node_shows_commissioning_results_only_if_present(self):
         self.client_log_in(as_admin=True)
         node = factory.make_node()
-        self.assertIsNone(self.request_results_display(node))
-
-    def test_view_node_shows_commissioning_results_only_to_superuser(self):
-        self.client_log_in(as_admin=False)
-        result = factory.make_node_commission_result()
-        self.assertIsNone(self.request_results_display(result.node))
+        self.assertIsNone(
+            self.request_results_display(node, RESULT_TYPE.COMMISSIONING))
+
+    def test_view_node_shows_commissioning_results_with_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node(owner=user)
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_commission_result(node=node)
+        section = self.request_results_display(
+            result.node, RESULT_TYPE.COMMISSIONING)
+        link = self.get_results_link(section)
+        self.assertEqual(
+            "1 output file",
+            self.normalise_whitespace(link.text_content()))
+
+    def test_view_node_shows_commissioning_results_requires_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node()
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_commission_result(node=node)
+        self.assertIsNone(
+            self.request_results_display(
+                result.node, RESULT_TYPE.COMMISSIONING))
 
     def test_view_node_shows_single_commissioning_result(self):
         self.client_log_in(as_admin=True)
         result = factory.make_node_commission_result()
-        section = self.request_results_display(result.node)
+        section = self.request_results_display(
+            result.node, RESULT_TYPE.COMMISSIONING)
         link = self.get_results_link(section)
         self.assertEqual(
             "1 output file",
@@ -1345,12 +1374,43 @@
         num_results = randint(2, 5)
         for _ in range(num_results):
             factory.make_node_commission_result(node=node)
-        section = self.request_results_display(node)
+        section = self.request_results_display(
+            node, RESULT_TYPE.COMMISSIONING)
         link = self.get_results_link(section)
         self.assertEqual(
             "%d output files" % num_results,
             self.normalise_whitespace(link.text_content()))
 
+    def test_view_node_shows_installing_results_only_if_present(self):
+        self.client_log_in(as_admin=True)
+        node = factory.make_node()
+        self.assertIsNone(
+            self.request_results_display(node, RESULT_TYPE.INSTALLING))
+
+    def test_view_node_shows_installing_results_with_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node(owner=user)
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_install_result(node=node)
+        section = self.request_results_display(
+            result.node, RESULT_TYPE.INSTALLING)
+        link = self.get_results_link(section)
+        self.assertIsNotNone(
+            self.normalise_whitespace(link.text_content()))
+
+    def test_view_node_shows_installing_results_requires_edit_perm(self):
+        password = 'test'
+        user = factory.make_user(password=password)
+        node = factory.make_node()
+        self.client.login(username=user.username, password=password)
+        self.logged_in_user = user
+        result = factory.make_node_install_result(node=node)
+        self.assertIsNone(
+            self.request_results_display(
+                result.node, RESULT_TYPE.INSTALLING))
+
 
 class NodeListingSelectionJSControls(SeleniumTestCase):