Merge lp:~newell-jensen/maas/fix-1621635 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Add dhcp_on to the node websocket handler dehydrate method so that we can see when a node has a VLAN which is providing DHCP.

[Gavin Panella (allenap)]

I've made a suggestion for an improvement. Needs tests though.

review: Needs Fixing

[Newell Jensen (newell-jensen)]

> I've made a suggestion for an improvement. Needs tests though.

Because of the unit tests and limiting the amount of queries that are induced when dehydrating the node, I actually ended up getting the information of whether or not MAAS is providing DHCP in a slightly different way. Thanks for looking at this.

[Gavin Panella (allenap)]

review: Needs Fixing

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2016-11-08 14:05:47 +0000
+++ src/maasserver/static/partials/node-details.html	2016-11-15 17:22:52 +0000
@@ -46,6 +46,13 @@
 
             <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
             <div class="page-header__dropdown" data-ng-class="{ 'is-open': actionOption }">
+
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="!node.dhcp_on">
+	            <p class="page-header__message page-header__message--warning">
+                        MAAS is not providing DHCP.
+		    </p>
+                </div>
+
                 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(actionOption.name)">
                     <form class="form form--inline">

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2016-10-13 05:57:25 +0000
+++ src/maasserver/websockets/handlers/node.py	2016-11-15 17:22:52 +0000
@@ -145,6 +145,7 @@
             default=self.default_osystem)
         data["distro_series"] = obj.get_distro_series(
             default=self.default_distro_series)
+        data["dhcp_on"] = self.get_providing_dhcp(obj)
         if not for_list:
             data["hwe_kernel"] = make_hwe_kernel_ui_text(obj.hwe_kernel)
 
@@ -503,3 +504,11 @@
         if "pxe_mac" in data:
             macs.insert(0, data["pxe_mac"])
         return macs
+
+    def get_providing_dhcp(self, obj):
+        """Return if providing DHCP using the prefetched query."""
+        for interface in obj.interface_set.all():
+            if interface.vlan is not None:
+                if interface.vlan.dhcp_on:
+                    return True
+        return False

=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
--- src/maasserver/websockets/handlers/tests/test_machine.py	2016-10-21 01:19:51 +0000
+++ src/maasserver/websockets/handlers/tests/test_machine.py	2016-11-15 17:22:52 +0000
@@ -232,6 +232,7 @@
             "updated": dehydrate_datetime(node.updated),
             "zone": handler.dehydrate_zone(node.zone),
             "default_user": node.default_user,
+            "dhcp_on": node.interface_set.filter(vlan__dhcp_on=True).exists(),
         }
         if for_list:
             allowed_fields = MachineHandler.Meta.list_fields + [
@@ -252,6 +253,7 @@
                 "node_type_display",
                 "osystem",
                 "distro_series",
+                "dhcp_on",
             ]
             for key in list(data):
                 if key not in allowed_fields: