Merge ~newell-jensen/maas:fix-1686678 into maas:master

[Newell Jensen]

Allows the domain of controllers to be changed in the UI.

[Blake Rouse (blake-rouse)]

Looks good.

You have a few minor alignment problems with the HTML that affect read ability, but otherwise it looks good.

review: Approve

194c62c... by Newell Jensen on 2017-07-05

Fix html alignment issues.

diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index 2dd682c..5e752c1 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -875,19 +875,24 @@ class ControllerForm(MAASModelForm, WithPowerTypeMixin):
     class Meta:
         model = Controller
 
-        fields = ['zone']
+        fields = ['zone', 'domain']
 
     zone = forms.ModelChoiceField(
         label="Physical zone", required=False,
         initial=Zone.objects.get_default_zone,
         queryset=Zone.objects.all(), to_field_name='name')
 
+    domain = forms.ModelChoiceField(
+        required=False, initial=Domain.objects.get_default_domain,
+        queryset=Domain.objects.all(), to_field_name='name')
+
     def __init__(self, data=None, instance=None, request=None, **kwargs):
         super(ControllerForm, self).__init__(
             data=data, instance=instance, **kwargs)
         WithPowerTypeMixin.set_up_power_fields(self, data, instance)
         if instance is not None:
             self.initial['zone'] = instance.zone.name
+            self.initial['domain'] = instance.domain.name
 
     def clean(self):
         cleaned_data = super(ControllerForm, self).clean()
diff --git a/src/maasserver/forms/tests/test_controller.py b/src/maasserver/forms/tests/test_controller.py
index b7ca4b0..6481447 100644
--- a/src/maasserver/forms/tests/test_controller.py
+++ b/src/maasserver/forms/tests/test_controller.py
@@ -18,6 +18,7 @@ class TestControllerForm(MAASServerTestCase):
         self.assertItemsEqual(
             [
                 'zone',
+                'domain',
                 'power_type',
                 'power_parameters',
             ],
@@ -70,3 +71,15 @@ class TestControllerForm(MAASServerTestCase):
             instance=rack)
         rack = form.save()
         self.assertEqual(zone.name, rack.zone.name)
+
+    def test__sets_domain(self):
+        rack = factory.make_RackController()
+        domain = factory.make_Domain()
+        form = ControllerForm(
+            data={
+                'domain': domain.name,
+                'power_parameters_skip_check': 'true',
+            },
+            instance=rack)
+        rack = form.save()
+        self.assertEqual(domain.name, rack.domain.name)
diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index e712a14..85869f4 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -60,6 +60,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
         // Node header section.
         $scope.header = {
             editing: false,
+            editing_domain: false,
             hostname: {
                 value: ""
             },
@@ -127,7 +128,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
         function updateHeader() {
             // Don't update the value if in editing mode. As this would
             // overwrite the users changes.
-            if($scope.header.editing) {
+            if($scope.header.editing || $scope.header.editing_domain) {
                 return;
             }
             $scope.header.hostname.value = $scope.node.fqdn;
@@ -757,6 +758,25 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 !$scope.isController);
         };
 
+        // Called to edit the domain name.
+        $scope.editHeaderDomain = function() {
+            if($scope.canEdit()) {
+                return;
+            }
+
+            // Do nothing if already editing because we don't want to reset
+            // the current value.
+            if($scope.header.editing_domain) {
+                return;
+            }
+            $scope.header.editing = false;
+            $scope.header.editing_domain = true;
+
+            // Set the value to the hostname, as hostname and domain are edited
+            // using different fields.
+            $scope.header.hostname.value = $scope.node.hostname;
+        };
+
         // Called to edit the node name.
         $scope.editHeader = function() {
             if(!$scope.canEdit()) {
@@ -769,6 +789,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 return;
             }
             $scope.header.editing = true;
+            $scope.header.editing_domain = false;
 
             // Set the value to the hostname, as hostname and domain are edited
             // using different fields.
@@ -778,7 +799,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
         // Return true when the hostname or domain in the header is invalid.
         $scope.editHeaderInvalid = function() {
             // Not invalid unless editing.
-            if(!$scope.header.editing) {
+            if(!$scope.header.editing && !$scope.header.editing_domain) {
                 return false;
             }
 
@@ -793,6 +814,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
         // Called to cancel editing of the node hostname and domain.
         $scope.cancelEditHeader = function() {
             $scope.header.editing = false;
+            $scope.header.editing_domain = false;
             updateHeader();
         };
 
@@ -803,6 +825,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 return;
             }
             $scope.header.editing = false;
+            $scope.header.editing_domain = false;
 
             // Copy the node and make the changes.
             var node = angular.copy($scope.node);
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
index 96207dd..d782d63 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
@@ -1486,23 +1486,74 @@ describe("NodeDetailsController", function() {
             });
     });
 
+    describe("editHeaderDomain", function() {
+
+        it("doesnt set editing false and editing_domain true if cannot edit",
+           function() {
+            var controller = makeController();
+            spyOn($scope, "canEdit").and.returnValue(true);
+            $scope.header.editing = true;
+            $scope.header.editing_domain = false;
+            $scope.editHeaderDomain();
+            expect($scope.header.editing).toBe(true);
+            expect($scope.header.editing_domain).toBe(false);
+        });
+
+        it("sets editing to false and editing_domain to true if able",
+           function() {
+            var controller = makeController();
+            $scope.node = node;
+            spyOn($scope, "canEdit").and.returnValue(false);
+            $scope.header.editing = true;
+            $scope.header.editing_domain = false;
+            $scope.editHeaderDomain();
+            expect($scope.header.editing).toBe(false);
+            expect($scope.header.editing_domain).toBe(true);
+        });
+
+        it("sets header.hostname.value to node hostname", function() {
+            var controller = makeController();
+            $scope.node = node;
+            spyOn($scope, "canEdit").and.returnValue(false);
+            $scope.editHeaderDomain();
+            expect($scope.header.hostname.value).toBe(node.hostname);
+        });
+
+        it("doesnt reset header.hostname.value on multiple calls", function() {
+            var controller = makeController();
+            $scope.node = node;
+            spyOn($scope, "canEdit").and.returnValue(false);
+            $scope.editHeaderDomain();
+            var updatedName = makeName("name");
+            $scope.header.hostname.value = updatedName;
+            $scope.editHeaderDomain();
+            expect($scope.header.hostname.value).toBe(updatedName);
+        });
+    });
+
     describe("editHeader", function() {
 
-        it("doesnt set editing to true if cannot edit", function() {
+        it("doesnt set editing true and editing_domain false if cannot edit",
+           function() {
             var controller = makeController();
             spyOn($scope, "canEdit").and.returnValue(false);
             $scope.header.editing = false;
+            $scope.header.editing_domain = true;
             $scope.editHeader();
             expect($scope.header.editing).toBe(false);
+            expect($scope.header.editing_domain).toBe(true);
         });
 
-        it("sets editing to true if able", function() {
+        it("sets editing to true and editing_domain to false if able",
+           function() {
             var controller = makeController();
             $scope.node = node;
             spyOn($scope, "canEdit").and.returnValue(true);
             $scope.header.editing = false;
+            $scope.header.editing_domain = true;
             $scope.editHeader();
             expect($scope.header.editing).toBe(true);
+            expect($scope.header.editing_domain).toBe(false);
         });
 
         it("sets header.hostname.value to node hostname", function() {
@@ -1527,9 +1578,10 @@ describe("NodeDetailsController", function() {
 
     describe("editHeaderInvalid", function() {
 
-        it("returns false if not editing", function() {
+        it("returns false if not editing and not editing_domain", function() {
             var controller = makeController();
             $scope.header.editing = false;
+            $scope.header.editing_domain = false;
             $scope.header.hostname.value = "abc_invalid.local";
             expect($scope.editHeaderInvalid()).toBe(false);
         });
@@ -1537,6 +1589,7 @@ describe("NodeDetailsController", function() {
         it("returns true for bad values", function() {
             var controller = makeController();
             $scope.header.editing = true;
+            $scope.header.editing_domain = false;
             var values = [
                 {
                     input: "aB0-z",
@@ -1564,12 +1617,15 @@ describe("NodeDetailsController", function() {
 
     describe("cancelEditHeader", function() {
 
-        it("sets editing to false for nameHeader section", function() {
+        it("sets editing and editing_domain to false for nameHeader section",
+           function() {
             var controller = makeController();
             $scope.node = node;
             $scope.header.editing = true;
+            $scope.header.editing_domain = true;
             $scope.cancelEditHeader();
             expect($scope.header.editing).toBe(false);
+            expect($scope.header.editing_domain).toBe(false);
         });
 
         it("sets header.hostname.value back to fqdn", function() {
@@ -1590,8 +1646,10 @@ describe("NodeDetailsController", function() {
             spyOn($scope, "editHeaderInvalid").and.returnValue(true);
             var sentinel = {};
             $scope.header.editing = sentinel;
+            $scope.header.editing_domain = sentinel;
             $scope.saveEditHeader();
             expect($scope.header.editing).toBe(sentinel);
+            expect($scope.header.editing_domain).toBe(sentinel);
         });
 
         it("sets editing to false", function() {
@@ -1602,10 +1660,12 @@ describe("NodeDetailsController", function() {
 
             $scope.node = node;
             $scope.header.editing = true;
+            $scope.header.editing_domain = true;
             $scope.header.hostname.value = makeName("name");
             $scope.saveEditHeader();
 
             expect($scope.header.editing).toBe(false);
+            expect($scope.header.editing_domain).toBe(false);
         });
 
         it("calls updateItem with copy of node", function() {
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 00d0b11..bff8c1a 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -11,21 +11,23 @@
             <h1 class="page-header__title">
                 <span contenteditable="true"
                     data-ng-class="{ editable: canEdit(), 'has-error': editHeaderInvalid(), editmode: header.editing }"
+                    data-ng-show="canEdit()"
                     data-ng-model="header.hostname.value"
                     data-ng-disabled="!canEdit()"
                     data-maas-editing="editHeader()"></span>
-                <span class="page-header__title-dot ng-hide" data-ng-show="header.editing">.</span>
+                <span ng-click="editHeaderDomain()" data-ng-show="!canEdit()">{$ header.hostname.value $}</span> 
+                <span class="page-header__title-dot ng-hide" data-ng-show="header.editing || header.editing_domain">.</span>
                 <select class="page-header__title-domain ng-hide"
-                    data-ng-show="header.editing"
+                    data-ng-show="header.editing || header.editing_domain"
                     data-ng-model="header.domain.selected"
                     data-ng-options="domain as domain.name for domain in header.domain.options">
                 </select>
             </h1>
             <button class="button--base button--inline u-margin--bottom-small ng-hide"
-                data-ng-show="header.editing"
+                data-ng-show="header.editing || header.editing_domain"
                 data-ng-click="cancelEditHeader()">Cancel</button>
             <button class="button--positive button--inline u-margin--bottom-small ng-hide"
-                data-ng-show="header.editing"
+                data-ng-show="header.editing || header.editing_domain"
                 data-ng-disabled="editHeaderInvalid()"
                 data-ng-click="saveEditHeader()">Save</button>
 
diff --git a/src/maasserver/websockets/handlers/controller.py b/src/maasserver/websockets/handlers/controller.py
index 0aa8ff3..ca85333 100644
--- a/src/maasserver/websockets/handlers/controller.py
+++ b/src/maasserver/websockets/handlers/controller.py
@@ -8,11 +8,12 @@ __all__ = [
     ]
 
 from maasserver.enum import NODE_PERMISSION
-from maasserver.forms import AdminMachineWithMACAddressesForm
+from maasserver.forms import ControllerForm
 from maasserver.models.node import (
     Controller,
     RackController,
 )
+from maasserver.websockets.base import HandlerError
 from maasserver.websockets.handlers.machine import MachineHandler
 from maasserver.websockets.handlers.node import node_prefetch
 
@@ -40,7 +41,7 @@ class ControllerHandler(MachineHandler):
             'link_subnet',
             'unlink_subnet',
         ]
-        form = AdminMachineWithMACAddressesForm
+        form = ControllerForm
         exclude = [
             "status_expires",
             "parent",
@@ -74,6 +75,13 @@ class ControllerHandler(MachineHandler):
             "controller",
         ]
 
+    def get_form_class(self, action):
+        """Return the form class used for `action`."""
+        if action in ("create", "update"):
+            return ControllerForm
+        else:
+            raise HandlerError("Unknown action: %s" % action)
+
     def get_queryset(self):
         """Return `QuerySet` for controllers only viewable by `user`."""
         return Controller.controllers.get_nodes(
diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index 1a23df1..111ed57 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `maasserver.websockets.handlers.controller`"""
@@ -6,7 +6,7 @@
 __all__ = []
 
 from maasserver.enum import NODE_TYPE
-from maasserver.forms import AdminMachineWithMACAddressesForm
+from maasserver.forms import ControllerForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.websockets.base import dehydrate_datetime
@@ -68,14 +68,14 @@ class TestControllerHandler(MAASServerTestCase):
         user = factory.make_admin()
         handler = ControllerHandler(user, {})
         self.assertEqual(
-            AdminMachineWithMACAddressesForm,
+            ControllerForm,
             handler.get_form_class("create"))
 
     def test_get_form_class_for_update(self):
         user = factory.make_admin()
         handler = ControllerHandler(user, {})
         self.assertEqual(
-            AdminMachineWithMACAddressesForm,
+            ControllerForm,
             handler.get_form_class("update"))
 
     def test_check_images(self):
diff --git a/src/maasserver/websockets/protocol.py b/src/maasserver/websockets/protocol.py
index af5c195..f143fd7 100644
--- a/src/maasserver/websockets/protocol.py
+++ b/src/maasserver/websockets/protocol.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """The MAAS WebSockets protocol."""
@@ -218,7 +218,7 @@ class WebSocketProtocol(Protocol):
     def dataReceived(self, data):
         """Received message from client and queue up the message."""
         try:
-            message = json.loads(data.decode("ascii"))
+            message = json.loads(data.decode('utf-8'))
         except ValueError:
             # Only accept JSON data over the protocol. Close the connect
             # with invalid data.