Merge lp:~blake-rouse/maas/fix-1446323 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Show third party driver that will be used for a node under the operating system in the summary section.

Screenshot of how it looks on the node details page. You can also view this with the sampledata on the node details page for "united-can.maas".

http://people.canonical.com/~blaker/third_party_drivers.png

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2015-05-18 17:31:49 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2015-05-27 19:06:48 +0000
@@ -3093,7 +3093,7 @@
       16:28:11.699310'}
   model: metadataserver.noderesult
   pk: 17
-- fields: {created: !!timestamp '2015-03-23 16:28:11.747953', data: '', name: 00-maas-04-list-modaliases.out,
+- fields: {created: !!timestamp '2015-03-23 16:28:11.747953', data: 'cGNpOnYwMDAwMTU5MGQwMDAwMDA0N3N2MDAwMDE1OTBzZDAwMDAwMDQ3YmMqc2MqaSoK', name: 00-maas-04-list-modaliases.out,
     node: 8, result_type: 0, script_result: 0, updated: !!timestamp '2015-03-23 16:28:11.747953'}
   model: metadataserver.noderesult
   pk: 19

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-05-27 16:05:35 +0000
+++ src/maasserver/static/partials/node-details.html	2015-05-27 19:06:48 +0000
@@ -196,6 +196,10 @@
                             </dd>
                         <dt class="two-col">Operating System</dt>
                             <dd class="four-col last-col">{$ getOSText() $}</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">
+                                {$ node.third_party_driver.module $} "{$ node.third_party_driver.comment $}"
+                            </dd>
                     </dl>
                 </div>
                 <div class="controls two-col last-col" data-ng-hide="summary.editing">

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2015-05-26 12:49:37 +0000
+++ src/maasserver/websockets/handlers/node.py	2015-05-27 19:06:48 +0000
@@ -24,12 +24,14 @@
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import NodeActionError
 from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.models.config import Config
 from maasserver.models.event import Event
 from maasserver.models.node import Node
 from maasserver.models.nodegroup import NodeGroup
 from maasserver.models.nodeprobeddetails import get_single_probed_details
 from maasserver.node_action import compile_node_actions
 from maasserver.rpc import getClientFor
+from maasserver.third_party_drivers import get_third_party_driver
 from maasserver.utils.converters import XMLToYAML
 from maasserver.utils.orm import transactional
 from maasserver.websockets.base import (
@@ -215,6 +217,15 @@
             data["installation_results"] = self.dehydrate_node_results(
                 obj, RESULT_TYPE.INSTALLATION)
 
+            # Third party drivers
+            if Config.objects.get_config('enable_third_party_drivers'):
+                driver = get_third_party_driver(obj)
+                if "module" in driver and "comment" in driver:
+                    data["third_party_driver"] = {
+                        "module": driver["module"],
+                        "comment": driver["comment"],
+                    }
+
         return data
 
     def dehydrate_physicalblockdevice(self, blockdevice):

=== modified file 'src/maasserver/websockets/handlers/tests/test_node.py'
--- src/maasserver/websockets/handlers/tests/test_node.py	2015-05-26 12:49:37 +0000
+++ src/maasserver/websockets/handlers/tests/test_node.py	2015-05-27 19:06:48 +0000
@@ -25,6 +25,7 @@
 from maasserver.enum import NODE_STATUS
 from maasserver.exceptions import NodeActionError
 from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.models.config import Config
 from maasserver.models.event import Event
 from maasserver.models.nodeprobeddetails import get_single_probed_details
 from maasserver.node_action import compile_node_actions
@@ -41,6 +42,7 @@
     MAASServerTestCase,
     MAASTransactionServerTestCase,
 )
+from maasserver.third_party_drivers import get_third_party_driver
 from maasserver.utils.converters import XMLToYAML
 from maasserver.utils.orm import transactional
 from maasserver.websockets.base import (
@@ -61,7 +63,10 @@
 from maastesting.twisted import always_succeed_with
 from metadataserver.enum import RESULT_TYPE
 from metadataserver.models import NodeResult
-from metadataserver.models.commissioningscript import LLDP_OUTPUT_NAME
+from metadataserver.models.commissioningscript import (
+    LIST_MODALIASES_OUTPUT_NAME,
+    LLDP_OUTPUT_NAME,
+)
 from mock import Mock
 from provisioningserver.power.poweraction import PowerActionFail
 from provisioningserver.rpc.cluster import PowerQuery
@@ -180,6 +185,7 @@
             .exclude(type__level=logging.DEBUG)
             .select_related("type")
             .order_by('-id')[:50])
+        driver = get_third_party_driver(node)
         data = {
             "actions": compile_node_actions(node, user).keys(),
             "architecture": node.architecture,
@@ -253,6 +259,10 @@
                 tag.name
                 for tag in node.tags.all()
             ],
+            "third_party_driver": {
+                "module": driver["module"] if "module" in driver else "",
+                "comment": driver["comment"] if "comment" in driver else "",
+            },
             "updated": dehydrate_datetime(node.updated),
             "zone": {
                 "id": node.zone.id,
@@ -307,6 +317,13 @@
             node=node, name=LLDP_OUTPUT_NAME, script_result=0, data=lldp_data)
         factory.make_PhysicalBlockDevice(node)
 
+        Config.objects.set_config(
+            name='enable_third_party_drivers', value=True)
+        data = "pci:v00001590d00000047sv00001590sd00000047bc*sc*i*"
+        factory.make_NodeResult_for_commissioning(
+            node=node, name=LIST_MODALIASES_OUTPUT_NAME, script_result=0,
+            data=data.encode("utf-8"))
+
         mac_address = node.macaddress_set.all()[0]
         factory.make_StaticIPAddress(mac=mac_address)
         factory.make_DHCPLease(