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

[Blake Rouse]

Allow deleting items from the storage filesystem section. Allow deleting formatted available items in the storage available section. Show which disk is the boot disk. Allow the boot disk to easily be changed.

[Andres Rodriguez (andreserl)]

I haven't tested this, but code wise couldn't spot anything!

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/node_details_storage.js	2015-11-09 22:23:42 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_storage.js	2015-11-10 17:38:20 +0000
@@ -201,15 +201,21 @@
             var filesystems = [];
             angular.forEach($scope.node.disks, function(disk) {
                 if(hasMountedFilesystem(disk)) {
-                    filesystems.push({
+                    var data = {
                         "type": "filesystem",
                         "name": disk.name,
                         "size_human": disk.size_human,
                         "fstype": disk.filesystem.fstype,
                         "mount_point": disk.filesystem.mount_point,
                         "block_id": disk.id,
-                        "partition_id": null
-                    });
+                        "partition_id": null,
+                        "original_type": disk.type,
+                        "original": disk
+                    };
+                    if(disk.type === "virtual") {
+                        disk.parent_type = disk.parent.type;
+                    }
+                    filesystems.push(data);
                 }
                 angular.forEach(disk.partitions, function(partition) {
                     if(hasMountedFilesystem(partition)) {
@@ -220,7 +226,9 @@
                             "fstype": partition.filesystem.fstype,
                             "mount_point": partition.filesystem.mount_point,
                             "block_id": disk.id,
-                            "partition_id": partition.id
+                            "partition_id": partition.id,
+                            "original_type": "partition",
+                            "original": partition
                         });
                     }
                 });
@@ -312,6 +320,7 @@
                         "block_id": disk.id,
                         "partition_id": null,
                         "has_partitions": has_partitions,
+                        "is_boot": disk.is_boot,
                         "original": disk
                     };
                     if(disk.type === "virtual") {
@@ -337,6 +346,7 @@
                             "block_id": disk.id,
                             "partition_id": partition.id,
                             "has_partitions": false,
+                            "is_boot": false,
                             "original": partition
                         });
                     }
@@ -402,7 +412,8 @@
                         "model": disk.model,
                         "serial": disk.serial,
                         "tags": getTags(disk),
-                        "used_for": disk.used_for
+                        "used_for": disk.used_for,
+                        "is_boot": disk.is_boot
                     };
                     if(disk.type === "virtual") {
                         data.parent_type = disk.parent.type;
@@ -417,7 +428,8 @@
                             "model": "",
                             "serial": "",
                             "tags": [],
-                            "used_for": partition.used_for
+                            "used_for": partition.used_for,
+                            "is_boot": false
                         });
                     }
                 });
@@ -539,6 +551,37 @@
             $scope.$watch("node.disks", updateDisks);
         };
 
+        // Return true if the item can be a boot disk.
+        $scope.isBootDiskDisabled = function(item, section) {
+            if(item.type !== "physical") {
+                return true;
+            }
+
+            // If the disk is in the used section and does not have any
+            // partitions then it cannot be a boot disk. Boot disk either
+            // require that it be unused or that some partitions exists
+            // on the disk. This is because the boot disk has to have a
+            // partition table header.
+            if(section === "used") {
+                return !item.has_partitions;
+            }
+            return false;
+        };
+
+        // Called to change the disk to a boot disk.
+        $scope.setAsBootDisk = function(item) {
+            // Do nothing if already the boot disk.
+            if(item.is_boot) {
+                return;
+            }
+            // Do nothing if disabled.
+            if($scope.isBootDiskDisabled(item)) {
+                return;
+            }
+
+            NodesManager.setBootDisk($scope.node, item.block_id);
+        };
+
         // Return array of selected filesystems.
         $scope.getSelectedFilesystems = function() {
             var filesystems = [];
@@ -632,6 +675,36 @@
             $scope.updateFilesystemSelection();
         };
 
+        // Enter delete mode.
+        $scope.filesystemDelete = function() {
+            $scope.filesystemMode = SELECTION_MODE.DELETE;
+        };
+
+        // Quickly enter delete by selecting the filesystem first.
+        $scope.quickFilesystemDelete = function(filesystem) {
+            deselectAll($scope.filesystems);
+            filesystem.$selected = true;
+            $scope.updateFilesystemSelection(true);
+            $scope.filesystemDelete();
+        };
+
+        // Confirm the delete action for filesystem.
+        $scope.filesystemConfirmDelete = function(filesystem) {
+            if(filesystem.original_type === "partition") {
+                // Delete the partition.
+                NodesManager.deletePartition(
+                    $scope.node, filesystem.original.id);
+            } else {
+                // Delete the disk.
+                NodesManager.deleteDisk(
+                    $scope.node, filesystem.original.id);
+            }
+
+            var idx = $scope.filesystems.indexOf(filesystem);
+            $scope.filesystems.splice(idx, 1);
+            $scope.updateFilesystemSelection();
+        };
+
         // Return true if the disk has an unmouted filesystem.
         $scope.hasUnmountedFilesystem = function(disk) {
             if(angular.isString(disk.fstype) && disk.fstype !== "") {
@@ -850,7 +923,7 @@
         };
 
         // Enter unformat mode.
-        $scope.availableUnformat = function(disk) {
+        $scope.availableUnformat = function() {
             $scope.availableMode = SELECTION_MODE.UNFORMAT;
         };
 
@@ -949,35 +1022,42 @@
             } else if(disk.type === "lvm-vg") {
                 return disk.original.used_size === 0;
             } else {
-                if(!disk.has_partitions && (
-                    !angular.isString(disk.fstype) || disk.fstype === "")) {
-                    return true;
-                } else {
-                    return false;
-                }
+                return !disk.has_partitions;
             }
         };
 
+        // Enter unformat mode.
+        $scope.availableUnformat = function() {
+            $scope.availableMode = SELECTION_MODE.UNFORMAT;
+        };
+
+        // Quickly enter unformat mode.
+        $scope.availableQuickUnformat = function(disk) {
+            deselectAll($scope.available);
+            disk.$selected = true;
+            $scope.updateAvailableSelection(true);
+            $scope.availableUnformat();
+        };
+
         // Enter delete mode.
         $scope.availableDelete = function() {
             $scope.availableMode = SELECTION_MODE.DELETE;
         };
 
-        // Quickly enter delete mode. If the disk has a filesystem it will
-        // enter unformat mode.
+        // Quickly enter delete mode.
         $scope.availableQuickDelete = function(disk) {
             deselectAll($scope.available);
             disk.$selected = true;
             $scope.updateAvailableSelection(true);
-            if($scope.hasUnmountedFilesystem(disk)) {
-                $scope.availableUnformat(disk);
-            } else {
-                $scope.availableDelete();
-            }
+            $scope.availableDelete();
         };
 
         // Return the text for remove confirmation message.
         $scope.getRemoveTypeText = function(disk) {
+            if(disk.type === "filesystem") {
+                disk = disk.original;
+            }
+
             if(disk.type === "physical") {
                 return "physical disk";
             } else if(disk.type === "partition") {

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2015-11-09 22:27:48 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2015-11-10 17:38:20 +0000
@@ -127,6 +127,7 @@
             {
                 // Blank disk
                 id: 0,
+                is_boot: true,
                 name: makeName("name"),
                 model: makeName("model"),
                 serial: makeName("serial"),
@@ -146,6 +147,7 @@
             {
                 // Disk with filesystem, no mount point
                 id: 1,
+                is_boot: false,
                 name: makeName("name"),
                 model: makeName("model"),
                 serial: makeName("serial"),
@@ -169,6 +171,7 @@
             {
                 // Disk with mounted filesystem
                 id: 2,
+                is_boot: false,
                 name: makeName("name"),
                 model: makeName("model"),
                 serial: makeName("serial"),
@@ -192,6 +195,7 @@
             {
                 // Partitioned disk, one partition free one used
                 id: 3,
+                is_boot: false,
                 name: makeName("name"),
                 model: makeName("model"),
                 serial: makeName("serial"),
@@ -231,6 +235,7 @@
             {
                 // Disk that is a cache set.
                 id: 4,
+                is_boot: false,
                 name: "cache0",
                 model: "",
                 serial: "",
@@ -297,6 +302,8 @@
                 mount_point: disks[2].filesystem.mount_point,
                 block_id: disks[2].id,
                 partition_id: null,
+                original_type: disks[2].type,
+                original: disks[2],
                 $selected: false
             },
             {
@@ -307,6 +314,8 @@
                 mount_point: disks[3].partitions[1].filesystem.mount_point,
                 block_id: disks[3].id,
                 partition_id: disks[3].partitions[1].id,
+                original_type: "partition",
+                original: disks[3].partitions[1],
                 $selected: false
             }
         ];
@@ -323,6 +332,7 @@
         var available = [
             {
                 name: disks[0].name,
+                is_boot: disks[0].is_boot,
                 size_human: disks[0].size_human,
                 available_size_human: disks[0].available_size_human,
                 used_size_human: disks[0].used_size_human,
@@ -341,6 +351,7 @@
             },
             {
                 name: disks[1].name,
+                is_boot: disks[1].is_boot,
                 size_human: disks[1].size_human,
                 available_size_human: disks[1].available_size_human,
                 used_size_human: disks[1].used_size_human,
@@ -359,6 +370,7 @@
             },
             {
                 name: disks[3].partitions[0].name,
+                is_boot: false,
                 size_human: disks[3].partitions[0].size_human,
                 available_size_human: (
                     disks[3].partitions[0].available_size_human),
@@ -380,6 +392,7 @@
         var used = [
             {
                 name: disks[2].name,
+                is_boot: disks[2].is_boot,
                 type: disks[2].type,
                 model: disks[2].model,
                 serial: disks[2].serial,
@@ -388,6 +401,7 @@
             },
             {
                 name: disks[3].name,
+                is_boot: disks[3].is_boot,
                 type: disks[3].type,
                 model: disks[3].model,
                 serial: disks[3].serial,
@@ -396,6 +410,7 @@
             },
             {
                 name: disks[3].partitions[1].name,
+                is_boot: false,
                 type: "partition",
                 model: "",
                 serial: "",
@@ -509,6 +524,74 @@
         expect($scope.availableNew.devices[1]).not.toBe(disk1);
     });
 
+    describe("isBootDiskDisabled", function() {
+
+        it("returns true if not physical", function() {
+            var controller = makeController();
+            var disk = { type: "virtual" };
+
+            expect($scope.isBootDiskDisabled(disk, "available")).toBe(true);
+        });
+
+        it("returns false if in available", function() {
+            var controller = makeController();
+            var disk = { type: "physical" };
+
+            expect($scope.isBootDiskDisabled(disk, "available")).toBe(false);
+        });
+
+        it("returns true when used and no partitions", function() {
+            var controller = makeController();
+            var disk = { type: "physical", has_partitions: false };
+
+            expect($scope.isBootDiskDisabled(disk, "used")).toBe(true);
+        });
+
+        it("returns false when used and partitions", function() {
+            var controller = makeController();
+            var disk = { type: "physical", has_partitions: true };
+
+            expect($scope.isBootDiskDisabled(disk, "used")).toBe(false);
+        });
+    });
+
+    describe("setAsBootDisk", function() {
+
+        it("does nothing if already boot disk", function() {
+            var controller = makeController();
+            var disk = { is_boot: true };
+            spyOn(NodesManager, "setBootDisk");
+            spyOn($scope, "isBootDiskDisabled").and.returnValue(false);
+
+            $scope.setAsBootDisk(disk);
+
+            expect(NodesManager.setBootDisk).not.toHaveBeenCalled();
+        });
+
+        it("does nothing if set boot disk disabled", function() {
+            var controller = makeController();
+            var disk = { is_boot: false };
+            spyOn(NodesManager, "setBootDisk");
+            spyOn($scope, "isBootDiskDisabled").and.returnValue(true);
+
+            $scope.setAsBootDisk(disk);
+
+            expect(NodesManager.setBootDisk).not.toHaveBeenCalled();
+        });
+
+        it("calls NodesManager.setBootDisk", function() {
+            var controller = makeController();
+            var disk = { block_id: makeInteger(0, 100), is_boot: false };
+            spyOn(NodesManager, "setBootDisk");
+            spyOn($scope, "isBootDiskDisabled").and.returnValue(false);
+
+            $scope.setAsBootDisk(disk);
+
+            expect(NodesManager.setBootDisk).toHaveBeenCalledWith(
+                node, disk.block_id);
+        });
+    });
+
     describe("getSelectedFilesystems", function() {
 
         it("returns selected filesystems", function() {
@@ -789,6 +872,78 @@
         });
     });
 
+    describe("filesystemDelete", function() {
+
+        it("sets filesystemMode to DELETE", function() {
+            var controller = makeController();
+            $scope.filesystemMode = "other";
+
+            $scope.filesystemDelete();
+
+            expect($scope.filesystemMode).toBe("delete");
+        });
+    });
+
+    describe("quickFilesystemDelete", function() {
+
+        it("selects filesystem and calls filesystemDelete", function() {
+            var controller = makeController();
+            var filesystems = [{ $selected: true }, { $selected: false }];
+            $scope.filesystems = filesystems;
+            spyOn($scope, "updateFilesystemSelection");
+            spyOn($scope, "filesystemDelete");
+
+            $scope.quickFilesystemDelete(filesystems[1]);
+
+            expect(filesystems[0].$selected).toBe(false);
+            expect(filesystems[1].$selected).toBe(true);
+            expect($scope.updateFilesystemSelection).toHaveBeenCalledWith(
+                true);
+            expect($scope.filesystemDelete).toHaveBeenCalled();
+        });
+    });
+
+    describe("filesystemConfirmDelete", function() {
+
+        it("calls NodesManager.deletePartition for partition", function() {
+            var controller = makeController();
+            var filesystem = {
+                original_type: "partition",
+                original: {
+                    id: makeInteger(0, 100)
+                }
+            };
+            $scope.filesystems = [filesystem];
+            spyOn(NodesManager, "deletePartition");
+            spyOn($scope, "updateFilesystemSelection");
+
+            $scope.filesystemConfirmDelete(filesystem);
+            expect(NodesManager.deletePartition).toHaveBeenCalledWith(
+                node, filesystem.original.id);
+            expect($scope.filesystems).toEqual([]);
+            expect($scope.updateFilesystemSelection).toHaveBeenCalledWith();
+        });
+
+        it("calls NodesManager.deleteDisk for disk", function() {
+            var controller = makeController();
+            var filesystem = {
+                original_type: "physical",
+                original: {
+                    id: makeInteger(0, 100)
+                }
+            };
+            $scope.filesystems = [filesystem];
+            spyOn(NodesManager, "deleteDisk");
+            spyOn($scope, "updateFilesystemSelection");
+
+            $scope.filesystemConfirmDelete(filesystem);
+            expect(NodesManager.deleteDisk).toHaveBeenCalledWith(
+                node, filesystem.original.id);
+            expect($scope.filesystems).toEqual([]);
+            expect($scope.updateFilesystemSelection).toHaveBeenCalledWith();
+        });
+    });
+
     describe("hasUnmountedFilesystem", function() {
 
         it("returns false if no fstype", function() {
@@ -1871,6 +2026,15 @@
             expect($scope.canDelete(disk)).toBe(true);
         });
 
+        it("returns true if fstype is not empty", function() {
+            var controller = makeController();
+            var disk = { fstype: "ext4" };
+            $scope.isSuperUser = function() { return true; };
+            spyOn($scope, "isAllStorageDisabled").and.returnValue(false);
+
+            expect($scope.canDelete(disk)).toBe(true);
+        });
+
         it("returns false if has_partitions is true", function() {
             var controller = makeController();
             var disk = { fstype: "", has_partitions: true };
@@ -1879,15 +2043,58 @@
 
             expect($scope.canDelete(disk)).toBe(false);
         });
-
-        it("returns false if fstype is not empty", function() {
-            var controller = makeController();
-            var disk = { fstype: "ext4" };
-            $scope.isSuperUser = function() { return true; };
-            spyOn($scope, "isAllStorageDisabled").and.returnValue(false);
-
-            expect($scope.canDelete(disk)).toBe(false);
-        });
+    });
+
+    describe("availableUnformat", function() {
+
+        it("sets availableMode to UNFORMAT", function() {
+            var controller = makeController();
+            $scope.availableMode = "other";
+
+            $scope.availableUnformat();
+
+            expect($scope.availableMode).toBe("unformat");
+        });
+    });
+
+    describe("availableQuickUnformat", function() {
+
+        it("selects disks and deselects others", function() {
+            var controller = makeController();
+            var available = [{ $selected: false }, { $selected: true }];
+            $scope.available = available;
+            spyOn($scope, "updateAvailableSelection");
+            spyOn($scope, "availableUnformat");
+
+            $scope.availableQuickUnformat(available[0]);
+
+            expect(available[0].$selected).toBe(true);
+            expect(available[1].$selected).toBe(false);
+        });
+
+        it("calls updateAvailableSelection with force true", function() {
+            var controller = makeController();
+            var available = [{ $selected: false }, { $selected: true }];
+            spyOn($scope, "updateAvailableSelection");
+            spyOn($scope, "availableUnformat");
+
+            $scope.availableQuickUnformat(available[0]);
+
+            expect($scope.updateAvailableSelection).toHaveBeenCalledWith(
+                true);
+        });
+
+        it("calls availableUnformat",
+            function() {
+                var controller = makeController();
+                var available = [{ $selected: false }, { $selected: true }];
+                spyOn($scope, "updateAvailableSelection");
+                spyOn($scope, "availableUnformat");
+
+                $scope.availableQuickUnformat(available[0]);
+
+                expect($scope.availableUnformat).toHaveBeenCalledWith();
+            });
     });
 
     describe("availableDelete", function() {
@@ -1909,7 +2116,6 @@
             var available = [{ $selected: false }, { $selected: true }];
             $scope.available = available;
             spyOn($scope, "updateAvailableSelection");
-            spyOn($scope, "availableUnformat");
             spyOn($scope, "availableDelete");
 
             $scope.availableQuickDelete(available[0]);
@@ -1922,7 +2128,6 @@
             var controller = makeController();
             var available = [{ $selected: false }, { $selected: true }];
             spyOn($scope, "updateAvailableSelection");
-            spyOn($scope, "availableUnformat");
             spyOn($scope, "availableDelete");
 
             $scope.availableQuickDelete(available[0]);
@@ -1931,40 +2136,31 @@
                 true);
         });
 
-        it("calls availableUnformat when hasUnmountedFilesystem returns true",
-            function() {
-                var controller = makeController();
-                var available = [{ $selected: false }, { $selected: true }];
-                spyOn($scope, "updateAvailableSelection");
-                spyOn($scope, "availableUnformat");
-                spyOn($scope, "availableDelete");
-                spyOn($scope, "hasUnmountedFilesystem").and.returnValue(true);
-
-                $scope.availableQuickDelete(available[0]);
-
-                expect($scope.availableUnformat).toHaveBeenCalledWith(
-                    available[0]);
-                expect($scope.availableDelete).not.toHaveBeenCalled();
-            });
-
-        it("calls availableDelete when hasUnmountedFilesystem returns true",
-            function() {
-                var controller = makeController();
-                var available = [{ $selected: false }, { $selected: true }];
-                spyOn($scope, "updateAvailableSelection");
-                spyOn($scope, "availableUnformat");
-                spyOn($scope, "availableDelete");
-                spyOn($scope, "hasUnmountedFilesystem").and.returnValue(false);
+        it("calls availableDelete",
+            function() {
+                var controller = makeController();
+                var available = [{ $selected: false }, { $selected: true }];
+                spyOn($scope, "updateAvailableSelection");
+                spyOn($scope, "availableDelete");
 
                 $scope.availableQuickDelete(available[0]);
 
                 expect($scope.availableDelete).toHaveBeenCalledWith();
-                expect($scope.availableUnformat).not.toHaveBeenCalled();
             });
     });
 
     describe("getRemoveTypeText", function() {
 
+        it("returns 'physical disk' for physical on filesystem", function() {
+            var controller = makeController();
+            expect($scope.getRemoveTypeText({
+                type: "filesystem",
+                original: {
+                    type: "physical"
+                }
+            })).toBe("physical disk");
+        });
+
         it("returns 'physical disk' for physical", function() {
             var controller = makeController();
             expect($scope.getRemoveTypeText({

=== modified file 'src/maasserver/static/js/angular/factories/nodes.js'
--- src/maasserver/static/js/angular/factories/nodes.js	2015-11-10 15:35:12 +0000
+++ src/maasserver/static/js/angular/factories/nodes.js	2015-11-10 17:38:20 +0000
@@ -323,5 +323,16 @@
                     "node.update_disk", params);
             };
 
+        // Set disk as the boot disk.
+        NodesManager.prototype.setBootDisk = function(
+            node, block_id) {
+                var params = {
+                    system_id: node.system_id,
+                    block_id: block_id
+                };
+                return RegionConnection.callMethod(
+                    "node.set_boot_disk", params);
+            };
+
         return new NodesManager();
     }]);

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_nodes.js'
--- src/maasserver/static/js/angular/factories/tests/test_nodes.js	2015-11-10 15:35:12 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_nodes.js	2015-11-10 17:38:20 +0000
@@ -761,4 +761,23 @@
             });
         });
     });
+
+    describe("setBootDisk", function() {
+
+        it("calls node.set_boot_disk", function(done) {
+            var fakeNode = makeNode();
+            var block_id = makeInteger(0, 100);
+            webSocket.returnData.push(makeFakeResponse(null));
+            NodesManager.setBootDisk(
+                    fakeNode, block_id).then(
+                        function() {
+                var sentObject = angular.fromJson(webSocket.sentData[0]);
+                expect(sentObject.method).toBe("node.set_boot_disk");
+                expect(sentObject.params.system_id).toBe(fakeNode.system_id);
+                expect(sentObject.params.block_id).toBe(
+                    block_id);
+                done();
+            });
+        });
+    });
 });

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-11-10 15:35:12 +0000
+++ src/maasserver/static/partials/node-details.html	2015-11-10 17:38:20 +0000
@@ -771,7 +771,7 @@
                     </ul>
                 </div>
                 <div class="twelve-col padding-bottom no-margin">
-                    <h3>File System</h3>
+                    <h3>File systems</h3>
                     <section class="table">
                         <header class="table__head">
                             <div class="table__row">
@@ -816,23 +816,35 @@
                                     <div class="table__data table__column--10">
                                         <div class="table__controls">
                                             <a class="icon unmount tooltip" data-tooltip="Unmount" data-ng-click="quickFilesystemUnmount(filesystem)">Unmount</a>
+                                            <a class="icon delete tooltip" data-tooltip="Remove" data-ng-click="quickFilesystemDelete(filesystem)">Remove</a>
                                         </div>
                                     </div>
                                     <div class="table__dropdown">
                                         <div class="table__row table__dropdown-row" data-ng-class="{ active: filesystemMode !== null && filesystemMode !== 'multi' }">
                                             <div class="ng-hide" data-ng-show="filesystemMode === 'single'">
                                                 <div class="table__data left">
-                                                      <a class="link-cta-ubuntu text-button"
-                                                        data-ng-click="filesystemUnmount()">Unmount</a>
+                                                    <button class="cta-ubuntu secondary margin-right"
+                                                        data-ng-click="filesystemUnmount()">Unmount</button>
+                                                    <a class="link-cta-ubuntu text-button"
+                                                        data-ng-click="filesystemDelete()">Remove {$ getRemoveTypeText(filesystem) $}</a>
                                                 </div>
                                             </div>
                                             <div class="ng-hide" data-ng-show="filesystemMode === 'unmount'">
                                                 <div class="table__data left margin-top--five">
-                                                      <p><span class="icon warning margin-right--ten"></span> Are you sure you want to unmount this filesystem?</p>
-                                                </div>
-                                                <div class="table__data right">
-                                                      <a class="link-cta-ubuntu text-button" data-ng-click="filesystemCancel()">Cancel</a>
-                                                      <button class="cta-ubuntu" data-ng-click="filesystemConfirmUnmount(filesystem)">Unmount</button>
+                                                    <p><span class="icon warning margin-right--ten"></span> Are you sure you want to unmount this filesystem?</p>
+                                                </div>
+                                                <div class="table__data right">
+                                                    <a class="link-cta-ubuntu text-button" data-ng-click="filesystemCancel()">Cancel</a>
+                                                    <button class="cta-ubuntu" data-ng-click="filesystemConfirmUnmount(filesystem)">Unmount</button>
+                                                </div>
+                                            </div>
+                                            <div class="ng-hide" data-ng-show="filesystemMode === 'delete'">
+                                                <div class="table__data left margin-top--five">
+                                                    <p><span class="icon warning margin-right--ten"></span> Are you sure you want to remove this {$ getRemoveTypeText(filesystem) $}?</p>
+                                                </div>
+                                                <div class="table__data right">
+                                                    <a class="link-cta-ubuntu text-button" data-ng-click="filesystemCancel()">Cancel</a>
+                                                    <button class="cta-ubuntu" data-ng-click="filesystemConfirmDelete(filesystem)">Remove</button>
                                                 </div>
                                             </div>
                                         </div>
@@ -889,18 +901,18 @@
                                         <div class="table__row table__dropdown-row" data-ng-class="{ active: cachesetsMode !== null && cachesetsMode !== 'multi' }">
                                             <div data-ng-show="cachesetsMode === 'single' && canDeleteCacheSet(cacheset)">
                                                 <div class="table__data left">
-                                                      <a class="link-cta-ubuntu text-button"
+                                                    <a class="link-cta-ubuntu text-button"
                                                         data-ng-show="canDeleteCacheSet(cacheset)"
                                                         data-ng-click="cacheSetDelete()">Remove</a>
                                                 </div>
                                             </div>
                                             <div class="ng-hide" data-ng-show="cachesetsMode === 'delete'">
                                                 <div class="table__data left margin-top--five">
-                                                      <p><span class="icon warning margin-right--ten"></span> Are you sure you want to delete this cache set?</p>
+                                                    <p><span class="icon warning margin-right--ten"></span> Are you sure you want to delete this cache set?</p>
                                                 </div>
                                                 <div class="table__data right">
-                                                      <a class="link-cta-ubuntu text-button" data-ng-click="cacheSetCancel()">Cancel</a>
-                                                      <button class="cta-ubuntu" data-ng-click="cacheSetConfirmDelete(cacheset)">Remove</button>
+                                                    <a class="link-cta-ubuntu text-button" data-ng-click="cacheSetCancel()">Cancel</a>
+                                                    <button class="cta-ubuntu" data-ng-click="cacheSetConfirmDelete(cacheset)">Remove</button>
                                                 </div>
                                             </div>
                                         </div>
@@ -924,13 +936,14 @@
                                         <label class="checkbox-label" for="available-check-all"></label>
                                     </span>
                                 </div>
-                                <div class="table__header table__column--20">
+                                <div class="table__header table__column--17">
                                     <a data-ng-click="column = 'name'" data-ng-class="{active: column === 'name'}">Name</a>
                                     <span class="divide"></span>
                                     <a data-ng-click="column = 'model'" data-ng-class="{active: column === 'model'}">Model</a>
                                     <span class="divide"></span>
                                     <a data-ng-click="column = 'serial'" data-ng-class="{active: column === 'serial'}">Serial</a>
                                 </div>
+                                <div class="table__header table__column--3">Boot</div>
                                 <div class="table__header table__column--15">Size</div>
                                 <div class="table__header table__column--15">Device Type</div>
                                 <div class="table__header table__column--15">File system</div>
@@ -956,7 +969,7 @@
                                             <label class="checkbox-label" for="{$ item.name $}" ></label>
                                         </span>
                                     </div>
-                                    <div class="table__data table__column--20" data-ng-show="column === 'name'">
+                                    <div class="table__data table__column--17" data-ng-show="column === 'name'">
                                         <input type="text" class="table__input"
                                             data-ng-model="item.name"
                                             data-maas-enter-blur
@@ -965,8 +978,15 @@
                                             data-ng-disabled="item.type === 'partition' || isAllStorageDisabled() || !isSuperUser()"
                                             data-ng-change="nameHasChanged(item)">
                                     </div>
-                                    <div class="table__data table__column--20 ng-hide" data-ng-show="column === 'model'">{$ item.model $}</div>
-                                    <div class="table__data table__column--20 ng-hide" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table__column--17 ng-hide" data-ng-show="column === 'model'">{$ item.model $}</div>
+                                    <div class="table__data table__column--17 ng-hide" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table__column--3">
+                                        <input class="align-center" type="radio"
+                                            data-ng-click="setAsBootDisk(item)"
+                                            data-ng-checked="item.is_boot"
+                                            data-ng-if="item.type === 'physical'"
+                                            data-ng-disabled="isBootDiskDisabled(item, 'available')">
+                                    </div>
                                     <div class="table__data table__column--15">{$ item.size_human $} <span class="table__label ng-hide" data-ng-show="showFreeSpace(item)">Free: {$ item.available_size_human $}</span></div>
                                     <div class="table__data table__column--15">{$ getDeviceType(item) $}</div>
                                     <div class="table__data table__column--15">
@@ -995,9 +1015,13 @@
                                                 data-tooltip="Partition"
                                                 data-ng-show="canAddPartition(item)"
                                                 data-ng-click="availableQuickPartition(item)">Partition</a>
-                                            <a class="icon delete tooltip"  data-tooltip="Remove"
-                                                data-tooltip="Delete"
-                                                data-ng-show="hasUnmountedFilesystem(item) || canDelete(item)"
+                                            <a class="icon unmount tooltip ng-hide"
+                                                data-tooltip="Unformat"
+                                                data-ng-show="hasUnmountedFilesystem(item)"
+                                                data-ng-click="availableQuickUnformat(item)">Unformat</a>
+                                            <a class="icon delete tooltip ng-hide"
+                                                data-tooltip="Remove"
+                                                data-ng-show="canDelete(item)"
                                                 data-ng-click="availableQuickDelete(item)">Remove</a>
                                         </div>
                                     </div>
@@ -1156,9 +1180,9 @@
                                                     <button class="cta-ubuntu secondary margin-right"
                                                         data-ng-show="canAddLogicalVolume(item)"
                                                         data-ng-click="availableLogicalVolume(item)">Add logical volume</button>
-                                                    <a class="link-cta-ubuntu text-button margin-right"
+                                                    <button class="cta-ubuntu secondary margin-right"
                                                         data-ng-show="hasUnmountedFilesystem(item)"
-                                                        data-ng-click="availableUnformat()">Unformat</a>
+                                                        data-ng-click="availableUnformat()">Unformat</button>
                                                     <a class="link-cta-ubuntu text-button"
                                                         data-ng-show="canDelete(item)"
                                                         data-ng-click="availableDelete()">Remove {$ getRemoveTypeText(item) $}</a>
@@ -1402,13 +1426,14 @@
                         <header class="table__head">
                             <div class="table__row">
                                 <div class="table__header table__column--3"></div>
-                                <div class="table__header table__column--20">
+                                <div class="table__header table__column--17">
                                     <a data-ng-click="column = 'name'" data-ng-class="{active: column === 'name'}">Name</a>
                                     <span class="divide"></span>
                                     <a data-ng-click="column = 'model'" data-ng-class="{active: column === 'model'}">Model</a>
                                     <span class="divide"></span>
                                     <a data-ng-click="column = 'serial'" data-ng-class="{active: column === 'serial'}">Serial</a>
                                 </div>
+                                <div class="table__header table__column--3">Boot</div>
                                 <div class="table__header table__column--15">Device type</div>
                                 <div class="table__header table__column--52">Used for</div>
                             </div>
@@ -1422,9 +1447,16 @@
                             <div data-ng-repeat="item in used">
                                 <div class="table__row details__used">
                                     <div class="table__data table__column--3"></div>
-                                    <div class="table__data table__column--20" data-ng-show="column === 'name'">{$ item.name $}</div>
-                                    <div class="table__data table__column--20" data-ng-show="column === 'model'">{$ item.model $}</div>
-                                    <div class="table__data table__column--20" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table__column--17" data-ng-show="column === 'name'">{$ item.name $}</div>
+                                    <div class="table__data table__column--17" data-ng-show="column === 'model'">{$ item.model $}</div>
+                                    <div class="table__data table__column--17" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table__column--3">
+                                        <input class="align-center" type="radio"
+                                            data-ng-click="setAsBootDisk(item)"
+                                            data-ng-checked="item.is_boot"
+                                            data-ng-if="item.type === 'physical'"
+                                            data-ng-disabled="isBootDiskDisabled(item, 'used')">
+                                    </div>
                                     <div class="table__data table__column--15">{$ getDeviceType(item) $}</div>
                                     <div class="table__data table__column--52">{$ item.used_for $}</div>
                                 </div>

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2015-11-10 15:35:12 +0000
+++ src/maasserver/websockets/handlers/node.py	2015-11-10 17:38:20 +0000
@@ -156,6 +156,7 @@
             'create_raid',
             'create_volume_group',
             'create_logical_volume',
+            'set_boot_disk',
         ]
         form = AdminNodeWithMACAddressesForm
         exclude = [
@@ -904,6 +905,10 @@
 
     def create_partition(self, params):
         """Create a partition."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         disk_obj = BlockDevice.objects.get(id=params['block_id'], node=node)
         form = AddPartitionForm(
@@ -922,6 +927,10 @@
 
     def create_cache_set(self, params):
         """Create a cache set."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         block_id = params.get('block_id')
         partition_id = params.get('partition_id')
@@ -943,6 +952,10 @@
 
     def create_bcache(self, params):
         """Create a bcache."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         block_id = params.get('block_id')
         partition_id = params.get('partition_id')
@@ -974,6 +987,10 @@
 
     def create_raid(self, params):
         """Create a RAID."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         form = CreateRaidForm(node=node, data=params)
         if not form.is_valid():
@@ -988,6 +1005,10 @@
 
     def create_volume_group(self, params):
         """Create a volume group."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         form = CreateVolumeGroupForm(node=node, data=params)
         if not form.is_valid():
@@ -997,6 +1018,10 @@
 
     def create_logical_volume(self, params):
         """Create a logical volume."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
         node = self.get_object(params)
         volume_group = VolumeGroup.objects.get(id=params['volume_group_id'])
         if volume_group.get_node() != node:
@@ -1016,6 +1041,21 @@
                 node, logical_volume.id,
                 params.get("fstype"), params.get("mount_point"))
 
+    def set_boot_disk(self, params):
+        """Set the disk as the boot disk."""
+        # Only admin users can perform delete.
+        if not self.user.is_superuser:
+            raise HandlerPermissionError()
+
+        node = self.get_object(params)
+        device = BlockDevice.objects.get(
+            id=params['block_id'], node=node).actual_instance
+        if device.type != 'physical':
+            raise HandlerError(
+                "Only a physical disk can be set as the boot disk.")
+        node.boot_disk = device
+        node.save()
+
     def action(self, params):
         """Perform the action on the object."""
         obj = self.get_object(params)

=== modified file 'src/maasserver/websockets/handlers/tests/test_node.py'
--- src/maasserver/websockets/handlers/tests/test_node.py	2015-11-10 15:35:12 +0000
+++ src/maasserver/websockets/handlers/tests/test_node.py	2015-11-10 17:38:20 +0000
@@ -1784,6 +1784,31 @@
             mount_point,
             logical_volume.get_effective_filesystem().mount_point)
 
+    def test_set_boot_disk(self):
+        user = factory.make_admin()
+        handler = NodeHandler(user, {})
+        architecture = make_usable_architecture(self)
+        node = factory.make_Node(interface=True, architecture=architecture)
+        boot_disk = factory.make_PhysicalBlockDevice(node=node)
+        handler.set_boot_disk({
+            'system_id': node.system_id,
+            'block_id': boot_disk.id,
+            })
+        self.assertEquals(boot_disk.id, reload_object(node).get_boot_disk().id)
+
+    def test_set_boot_disk_raises_error_for_none_physical(self):
+        user = factory.make_admin()
+        handler = NodeHandler(user, {})
+        architecture = make_usable_architecture(self)
+        node = factory.make_Node(interface=True, architecture=architecture)
+        boot_disk = factory.make_VirtualBlockDevice(node=node)
+        error = self.assertRaises(HandlerError, handler.set_boot_disk, {
+            'system_id': node.system_id,
+            'block_id': boot_disk.id,
+            })
+        self.assertEquals(
+            error.message, "Only a physical disk can be set as the boot disk.")
+
     def test_update_raise_HandlerError_if_tag_has_definition(self):
         user = factory.make_admin()
         handler = NodeHandler(user, {})