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

[Blake Rouse]

Allow changing the name and MAC address of an interface on a deployed machine. Allow changing the name, model, serial, and id_path of a physical block device on a deployed machine.

[Mike Pontillo (mpontillo)]

Code looks pretty good (see a few comments below, though).

"Needs fixing", though, because I don't see any docstring updates. We need to explain to API users what [new] states editing is allowed in, and which values can be updated.

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Fixed issues and updated the docstrings. This is ready for another review.

[Mike Pontillo (mpontillo)]

Looks good. Thanks for refactoring the ng-if statements; it's much clearer now.

Just one comment about the docstring below.

review: Approve

=== modified file 'src/maasserver/api/blockdevices.py'
--- src/maasserver/api/blockdevices.py	2016-08-18 17:31:05 +0000
+++ src/maasserver/api/blockdevices.py	2016-10-19 18:09:00 +0000
@@ -22,6 +22,7 @@
 from maasserver.forms import (
     CreatePhysicalBlockDeviceForm,
     FormatBlockDeviceForm,
+    UpdateDeployedPhysicalBlockDeviceForm,
     UpdatePhysicalBlockDeviceForm,
     UpdateVirtualBlockDeviceForm,
 )
@@ -227,6 +228,11 @@
     def update(self, request, system_id, device_id):
         """Update block device on a machine.
 
+        Machines must have a status of Ready to have access to all options.
+        Machines with Deployed status can only have the name, model, serial,
+        and/or id_path updated for a block device. This is intented to allow a
+        bad block device to be replaced while the machine remains deployed.
+
         Fields for physical block device:
 
         :param name: Name of the block device.
@@ -252,18 +258,27 @@
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
-        if node.status != NODE_STATUS.READY:
+        if node.status not in [NODE_STATUS.READY, NODE_STATUS.DEPLOYED]:
             raise NodeStateViolation(
                 "Cannot update block device because the machine is not Ready.")
-        if device.type == 'physical':
-            form = UpdatePhysicalBlockDeviceForm(
-                instance=device, data=request.data)
-        elif device.type == 'virtual':
-            form = UpdateVirtualBlockDeviceForm(
-                instance=device, data=request.data)
+        if node.status == NODE_STATUS.DEPLOYED:
+            if device.type == 'physical':
+                form = UpdateDeployedPhysicalBlockDeviceForm(
+                    instance=device, data=request.data)
+            else:
+                raise NodeStateViolation(
+                    "Cannot update virtual block device because the machine "
+                    "is Deployed.")
         else:
-            raise ValueError(
-                'Cannot update block device of type %s' % device.type)
+            if device.type == 'physical':
+                form = UpdatePhysicalBlockDeviceForm(
+                    instance=device, data=request.data)
+            elif device.type == 'virtual':
+                form = UpdateVirtualBlockDeviceForm(
+                    instance=device, data=request.data)
+            else:
+                raise ValueError(
+                    'Cannot update block device of type %s' % device.type)
         if form.is_valid():
             return form.save()
         else:

=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2016-08-18 17:31:05 +0000
+++ src/maasserver/api/interfaces.py	2016-10-19 18:09:00 +0000
@@ -26,6 +26,7 @@
     BondInterfaceForm,
     BridgeInterfaceForm,
     ControllerInterfaceForm,
+    DeployedInterfaceForm,
     InterfaceForm,
     PhysicalInterfaceForm,
     VLANInterfaceForm,
@@ -73,8 +74,21 @@
 
 
 def raise_error_for_invalid_state_on_allocated_operations(
-        node, user, operation):
-    if node.status not in ALLOWED_STATES:
+        node, user, operation, extra_states=None):
+    """Raises `NodeStateViolation` when the status of the node is not
+    READY or BROKEN.
+
+    :param node: Node to check status.
+    :param user: User performing the operation.
+    :param operation: Nice name of the operation.
+    :param extra_states: Extra states that the node can be in when checking
+        the status of the node.
+    :type extra_states: `Iterable`.
+    """
+    allowed = list(ALLOWED_STATES)
+    if extra_states is not None:
+        allowed.extend(extra_states)
+    if node.status not in allowed:
         raise NodeStateViolation(
             "Cannot %s interface because the machine is not Ready or "
             "Broken." % operation)
@@ -378,6 +392,11 @@
     def update(self, request, system_id, interface_id):
         """Update interface on node.
 
+        Machines must has status of Ready or Broken to have access to all
+        options. Machines with Deployed status can only have the name and/or
+        mac_address updated for an interface. This is intented to allow a bad
+        interface to be replaced while the machine remains deployed.
+
         Fields for physical interface:
 
         :param name: Name of the interface.
@@ -477,12 +496,15 @@
             # This node needs to be in the correct state to modify
             # the interface.
             raise_error_for_invalid_state_on_allocated_operations(
-                node, request.user, "update interface")
+                node, request.user, "update interface",
+                extra_states=[NODE_STATUS.DEPLOYED])
         if node.is_controller:
             if interface.type == INTERFACE_TYPE.VLAN:
                 raise MAASAPIForbidden(
                     "Cannot modify VLAN interface on controller.")
             interface_form = ControllerInterfaceForm
+        elif node.status == NODE_STATUS.DEPLOYED:
+            interface_form = DeployedInterfaceForm
         else:
             interface_form = InterfaceForm.get_interface_form(interface.type)
         # For VLAN interface we cast parents to parent. As a VLAN can only

=== modified file 'src/maasserver/api/tests/test_blockdevice.py'
--- src/maasserver/api/tests/test_blockdevice.py	2016-08-14 17:36:30 +0000
+++ src/maasserver/api/tests/test_blockdevice.py	2016-10-19 18:09:00 +0000
@@ -908,6 +908,32 @@
         self.assertEqual('mynewname', parsed_device['name'])
         self.assertEqual(4096, parsed_device['block_size'])
 
+    def test_update_deployed_physical_block_device_as_admin(self):
+        """Update deployed physical block device.
+
+        PUT /api/2.0/nodes/{system_id}/blockdevice/{id}
+        """
+        self.become_admin()
+        node = factory.make_Node(
+            status=NODE_STATUS.DEPLOYED, owner=self.user)
+        block_device = factory.make_PhysicalBlockDevice(
+            node=node,
+            name='myblockdevice',
+            size=MIN_BLOCK_DEVICE_SIZE,
+            block_size=1024)
+        uri = get_blockdevice_uri(block_device)
+        response = self.client.put(uri, {
+            'name': 'mynewname',
+            'block_size': 4096
+        })
+        block_device = reload_object(block_device)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_device = json_load_bytes(response.content)
+        self.assertEqual(parsed_device['id'], block_device.id)
+        self.assertEqual('mynewname', parsed_device['name'])
+        self.assertEqual(1024, parsed_device['block_size'])
+
     def test_update_virtual_block_device_as_admin(self):
         """Check update block device with a virtual one.
 

=== modified file 'src/maasserver/api/tests/test_interfaces.py'
--- src/maasserver/api/tests/test_interfaces.py	2016-10-18 08:00:37 +0000
+++ src/maasserver/api/tests/test_interfaces.py	2016-10-19 18:09:00 +0000
@@ -877,6 +877,24 @@
         self.assertEqual(
             http.client.NOT_FOUND, response.status_code, response.content)
 
+    def test_update_deployed_machine_interface(self):
+        self.become_admin()
+        node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=node)
+        new_name = factory.make_name("name")
+        new_mac = factory.make_mac_address()
+        uri = get_interface_uri(interface)
+        response = self.client.put(uri, {
+            "name": new_name,
+            "mac_address": new_mac,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_interface = json_load_bytes(response.content)
+        self.assertEqual(new_name, parsed_interface["name"])
+        self.assertEqual(new_mac, parsed_interface["mac_address"])
+
     def test_update_physical_interface(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
@@ -963,9 +981,13 @@
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_read_409_when_not_ready_or_broken(self):
+    def test_update_409_when_not_ready_broken_or_deployed(self):
         self.become_admin()
-        for status in STATUSES:
+        statuses = list(STATUSES)
+        # Update is the only call that a deployed node can have called on
+        # its interface.
+        statuses.remove(NODE_STATUS.DEPLOYED)
+        for status in statuses:
             node = factory.make_Node(interface=True, status=status)
             interface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, node=node)

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2016-09-25 03:40:16 +0000
+++ src/maasserver/forms.py	2016-10-19 18:09:00 +0000
@@ -2537,6 +2537,22 @@
         ]
 
 
+class UpdateDeployedPhysicalBlockDeviceForm(MAASModelForm):
+    """For updating physical block device on deployed machine."""
+
+    name = forms.CharField(required=False)
+    id_path = AbsolutePathField(required=False)
+
+    class Meta:
+        model = PhysicalBlockDevice
+        fields = [
+            "name",
+            "model",
+            "serial",
+            "id_path",
+        ]
+
+
 class UpdateVirtualBlockDeviceForm(MAASModelForm):
     """For updating virtual block device."""
 

=== modified file 'src/maasserver/forms_interface.py'
--- src/maasserver/forms_interface.py	2016-09-27 00:47:54 +0000
+++ src/maasserver/forms_interface.py	2016-10-19 18:09:00 +0000
@@ -187,6 +187,17 @@
         return interface
 
 
+class DeployedInterfaceForm(MAASModelForm):
+    """Interface update form for machines when deployed."""
+
+    class Meta:
+        model = Interface
+        fields = (
+            'name',
+            'mac_address',
+            )
+
+
 class PhysicalInterfaceForm(InterfaceForm):
     """Form used to create/edit a physical interface."""
 

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-09-21 14:49:23 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-10-19 18:09:00 +0000
@@ -556,6 +556,23 @@
             return true;
         };
 
+        // Return true if only the name or mac address of an interface can
+        // be edited.
+        $scope.isLimitedEditingAllowed = function(nic) {
+            if (!$scope.isSuperUser()) {
+                // If the user is not the superuser, pretend it's not Ready.
+                return false;
+            }
+            if ($scope.$parent.isController) {
+                // Controllers never in limited mode.
+                return false;
+            }
+            return (
+                angular.isObject($scope.node) &&
+                $scope.node.status === "Deployed" &&
+                nic.type !== "vlan");
+        };
+
         // Return true if the networking information cannot be edited.
         // (it can't be changed when the node is in any state other
         // than Ready or Broken and the user is not a superuser)
@@ -903,6 +920,17 @@
             return $scope.selectedMode === SELECTION_MODE.ADD;
         };
 
+        // Return true if either an alias or VLAN can be added.
+        $scope.canAddAliasOrVLAN = function(nic) {
+            if($scope.$parent.isController) {
+                return false;
+            } else if (!$scope.isNodeEditingAllowed()) {
+                return false;
+            } else {
+                return $scope.canAddAlias(nic) || $scope.canAddVLAN(nic);
+            }
+        };
+
         // Return true if the alias can be added to interface.
         $scope.canAddAlias = function(nic) {
             if(!angular.isObject(nic)) {
@@ -950,6 +978,13 @@
             }
         };
 
+        // Return true if the interface can be removed.
+        $scope.canBeRemoved = function() {
+            return (
+                !$scope.$parent.isController &&
+                $scope.isNodeEditingAllowed());
+        };
+
         // Enter remove mode.
         $scope.remove = function() {
             $scope.selectedMode = SELECTION_MODE.DELETE;

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2016-08-18 17:31:05 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2016-10-19 18:09:00 +0000
@@ -2027,6 +2027,45 @@
         });
     });
 
+    describe("canAddAliasOrVLAN", function() {
+
+        it("returns false if isController", function() {
+            var controller = makeController();
+            $parentScope.isController = true;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(true);
+            spyOn($scope, "canAddAlias").and.returnValue(true);
+            spyOn($scope, "canAddVLAN").and.returnValue(true);
+            expect($scope.canAddAliasOrVLAN({})).toBe(false);
+        });
+
+        it("returns false if no node editing", function() {
+            var controller = makeController();
+            $parentScope.isController = false;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(false);
+            spyOn($scope, "canAddAlias").and.returnValue(true);
+            spyOn($scope, "canAddVLAN").and.returnValue(true);
+            expect($scope.canAddAliasOrVLAN({})).toBe(false);
+        });
+
+        it("returns true if can edit alias", function() {
+            var controller = makeController();
+            $parentScope.isController = false;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(true);
+            spyOn($scope, "canAddAlias").and.returnValue(true);
+            spyOn($scope, "canAddVLAN").and.returnValue(false);
+            expect($scope.canAddAliasOrVLAN({})).toBe(true);
+        });
+
+        it("returns true if can edit VLAN", function() {
+            var controller = makeController();
+            $parentScope.isController = false;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(true);
+            spyOn($scope, "canAddAlias").and.returnValue(false);
+            spyOn($scope, "canAddVLAN").and.returnValue(true);
+            expect($scope.canAddAliasOrVLAN({})).toBe(true);
+        });
+    });
+
     describe("canAddAlias", function() {
 
         it("returns false if nic undefined", function() {
@@ -2365,6 +2404,30 @@
         });
     });
 
+    describe("canBeRemoved", function() {
+
+        it("false if isController", function() {
+            var controller = makeController();
+            $parentScope.isController = true;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(true);
+            expect($scope.canBeRemoved()).toBe(false);
+        });
+
+        it("false if no node editing", function() {
+            var controller = makeController();
+            $parentScope.isController = false;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(false);
+            expect($scope.canBeRemoved()).toBe(false);
+        });
+
+        it("true if node can be edited", function() {
+            var controller = makeController();
+            $parentScope.isController = false;
+            spyOn($scope, "isNodeEditingAllowed").and.returnValue(true);
+            expect($scope.canBeRemoved()).toBe(true);
+        });
+    });
+
     describe("remove", function() {
 
         it("sets selectedMode to delete", function() {
@@ -2935,6 +2998,35 @@
         });
     });
 
+    describe("isLimitedEditingAllowed", function() {
+
+        it("returns false when not superuser", function() {
+            var controller = makeController();
+            $scope.isSuperUser = function() { return false; };
+            expect($scope.isLimitedEditingAllowed()).toBe(false);
+        });
+
+        it("returns false when isController", function() {
+            var controller = makeController();
+            $scope.isSuperUser = function() { return true; };
+            $parentScope.isController = true;
+            expect($scope.isLimitedEditingAllowed()).toBe(false);
+        });
+
+        it("returns true when deployed and not vlan", function() {
+            var controller = makeController();
+            $scope.isSuperUser = function() { return true; };
+            $parentScope.isController = false;
+            $scope.node = {
+                status: "Deployed"
+            };
+            var nic = {
+                type: "physical"
+            };
+            expect($scope.isLimitedEditingAllowed(nic)).toBe(true);
+        });
+    });
+
     describe("isAllNetworkingDisabled", function() {
 
         it("returns true if the user is not a superuser " +

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2016-09-30 12:50:08 +0000
+++ src/maasserver/static/partials/node-details.html	2016-10-19 18:09:00 +0000
@@ -574,7 +574,7 @@
                         </header>
                         <main class="table__body" data-selected-rows>
                             <div class="table__row"
-                                data-ng-class="{ disabled: isDisabled(), 'is-active': isInterfaceSelected(interface) && isNodeEditingAllowed(), noEdit: cannotEditInterface(interface) }"
+                                data-ng-class="{ disabled: isDisabled(), 'is-active': isInterfaceSelected(interface) && (isNodeEditingAllowed() || isLimitedEditingAllowed(interface)), noEdit: cannotEditInterface(interface) }"
                                 data-ng-repeat="interface in interfaces | removeInterfaceParents:newBondInterface:!isNodeEditingAllowed() | removeInterfaceParents:newBridgeInterface:!isNodeEditingAllowed()">
                                 <div class="table__data table-col--3">
                                     <input type="checkbox" class="checkbox" id="{$ getUniqueKey(interface) $}"
@@ -588,7 +588,7 @@
                                 <div class="table__data table-col--12" data-ng-show="column == 'name'">
                                     <span data-ng-if="!isEditing(interface)">{$ interface.name $}</span>
                                     <input type="text" class="table__input"
-                                        data-ng-if="isEditing(interface)"
+                                        data-ng-if="isEditing(interface) && interface.type != 'vlan'"
                                         data-ng-model="editInterface.name"
                                         data-ng-class="{ 'has-error': isInterfaceNameInvalid(editInterface) }">
                                 </div>
@@ -624,17 +624,17 @@
                                     </span>
                                 </div>
                                 <div class="table__data table-col--8">
-                                    <div class="table__controls u-align--right" data-ng-if="isNodeEditingAllowed()">
+                                    <div class="table__controls u-align--right" data-ng-if="isNodeEditingAllowed() || isLimitedEditingAllowed(interface)">
                                         <a class="icon icon--add tooltip"
                                             aria-label="Add Alias or VLAN"
-                                            data-ng-if="!isController && (canAddAlias(interface) || canAddVLAN(interface))"
+                                            data-ng-if="canAddAliasOrVLAN(interface)"
                                             data-ng-click="quickAdd(interface)"></a>
                                         <a class="icon icon--edit tooltip"
                                             data-ng-if="!cannotEditInterface(interface)"
                                             aria-label="Edit"
                                             data-ng-click="edit(interface)"></a>
                                         <a class="icon icon--delete tooltip u-margin--left"
-                                            data-ng-if="!isController"
+                                            data-ng-if="canBeRemoved()"
                                             aria-label="Remove"
                                             data-ng-click="quickRemove(interface)"></a>
                                     </div>
@@ -653,7 +653,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div data-ng-show="isNodeEditingAllowed()">
+                                <div data-ng-if="isNodeEditingAllowed() || isLimitedEditingAllowed(interface)">
                                     <div class="table__dropdown">
                                         <div class="table__row form form--stack u-padding--top u-padding--right u-padding--left box-sizing" data-ng-class="{ 'is-active': isEditing(interface) || isShowingAdd() }">
                                             <div data-ng-if="isShowingAdd()" class="table__row--indent">
@@ -742,14 +742,14 @@
                                                             data-ng-model="editInterface.mac_address"
                                                             data-ng-class="{ 'has-error': isMACAddressInvalid(editInterface.mac_address, true) }">
                                                     </div>
-                                                    <div class="form__group">
+                                                    <div class="form__group" data-ng-if="!isLimitedEditingAllowed(interface)">
                                                         <label class="two-col" data-ng-if="interface.type != 'alias'">Tags</label>
                                                             <div class="form__group-input three-col last-col" data-ng-if="interface.type != 'alias'">
                                                                 <tags-input ng-model="editInterface.tags" allow-tags-pattern="[\w-]+"></tags-input>
                                                             </div>
                                                     </div>
                                                 </div>
-                                                <div class="form__fieldset six-col last-col">
+                                                <div class="form__fieldset six-col last-col" data-ng-if="!isLimitedEditingAllowed(interface)">
                                                     <div class="form__group">
                                                         <label for="fabric" class="two-col">Fabric</label>
                                                         <select name="fabric" class="three-col"

=== modified file 'src/maasserver/tests/test_forms_blockdevice.py'
--- src/maasserver/tests/test_forms_blockdevice.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/tests/test_forms_blockdevice.py	2016-10-19 18:09:00 +0000
@@ -12,6 +12,7 @@
 from maasserver.forms import (
     CreatePhysicalBlockDeviceForm,
     FormatBlockDeviceForm,
+    UpdateDeployedPhysicalBlockDeviceForm,
     UpdatePhysicalBlockDeviceForm,
     UpdateVirtualBlockDeviceForm,
 )
@@ -245,6 +246,40 @@
             ))
 
 
+class TestUpdateDeployedPhysicalBlockDeviceForm(MAASServerTestCase):
+
+    def test_requires_no_fields(self):
+        block_device = factory.make_PhysicalBlockDevice()
+        form = UpdateDeployedPhysicalBlockDeviceForm(
+            instance=block_device, data={})
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertItemsEqual([], form.errors.keys())
+
+    def test_updates_deployed_physical_block_device(self):
+        block_device = factory.make_PhysicalBlockDevice()
+        name = factory.make_name("sd")
+        model = factory.make_name("model")
+        serial = factory.make_name("serial")
+        id_path = factory.make_absolute_path()
+        form = UpdateDeployedPhysicalBlockDeviceForm(
+            instance=block_device, data={
+                'name': name,
+                'model': model,
+                'serial': serial,
+                'id_path': id_path,
+                })
+        self.assertTrue(form.is_valid(), form.errors)
+        block_device = form.save()
+        self.assertThat(block_device, MatchesStructure.byEquality(
+            name=name,
+            model=model,
+            serial=serial,
+            id_path=id_path,
+            size=block_device.size,
+            block_size=block_device.block_size,
+            ))
+
+
 class TestUpdateVirtualBlockDeviceForm(MAASServerTestCase):
 
     def test_requires_no_fields(self):

=== modified file 'src/maasserver/tests/test_forms_interface.py'
--- src/maasserver/tests/test_forms_interface.py	2016-09-27 14:24:19 +0000
+++ src/maasserver/tests/test_forms_interface.py	2016-10-19 18:09:00 +0000
@@ -20,6 +20,7 @@
     BondInterfaceForm,
     BridgeInterfaceForm,
     ControllerInterfaceForm,
+    DeployedInterfaceForm,
     InterfaceForm,
     PhysicalInterfaceForm,
     VLANInterfaceForm,
@@ -104,6 +105,27 @@
                 name=interface.name, vlan=None, enabled=interface.enabled))
 
 
+class DeployedInterfaceFormTest(MAASServerTestCase):
+
+    def test__updates_interface(self):
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, name='eth0')
+        new_name = 'eth1'
+        new_mac = factory.make_mac_address()
+        form = DeployedInterfaceForm(
+            instance=interface,
+            data={
+                'name': new_name,
+                'mac_address': new_mac,
+            })
+        self.assertTrue(form.is_valid(), form.errors)
+        interface = form.save()
+        self.assertThat(
+            interface,
+            MatchesStructure.byEquality(
+                name=new_name, mac_address=new_mac))
+
+
 class PhysicalInterfaceFormTest(MAASServerTestCase):
 
     def test__creates_physical_interface(self):

=== modified file 'src/maasserver/websockets/handlers/machine.py'
--- src/maasserver/websockets/handlers/machine.py	2016-10-13 01:35:42 +0000
+++ src/maasserver/websockets/handlers/machine.py	2016-10-19 18:09:00 +0000
@@ -45,6 +45,7 @@
     AcquiredBridgeInterfaceForm,
     BondInterfaceForm,
     BridgeInterfaceForm,
+    DeployedInterfaceForm,
     InterfaceForm,
     PhysicalInterfaceForm,
     VLANInterfaceForm,
@@ -811,7 +812,10 @@
 
         node = self.get_object(params)
         interface = Interface.objects.get(node=node, id=params["interface_id"])
-        interface_form = InterfaceForm.get_interface_form(interface.type)
+        if node.status == NODE_STATUS.DEPLOYED:
+            interface_form = DeployedInterfaceForm
+        else:
+            interface_form = InterfaceForm.get_interface_form(interface.type)
         form = interface_form(instance=interface, data=params)
         if form.is_valid():
             interface = form.save()

=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
--- src/maasserver/websockets/handlers/tests/test_machine.py	2016-10-12 16:34:23 +0000
+++ src/maasserver/websockets/handlers/tests/test_machine.py	2016-10-19 18:09:00 +0000
@@ -2326,6 +2326,20 @@
         self.assertEqual(new_name, interface.name)
         self.assertEqual(new_vlan, interface.vlan)
 
+    def test_update_interface_for_deployed_node(self):
+        user = factory.make_admin()
+        node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
+        handler = MachineHandler(user, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        new_name = factory.make_name("name")
+        handler.update_interface({
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            "name": new_name,
+            })
+        interface = reload_object(interface)
+        self.assertEqual(new_name, interface.name)
+
     def test_update_interface_raises_ValidationError(self):
         user = factory.make_admin()
         node = factory.make_Node()