Merge ~newell-jensen/maas:lp1651165 into maas:master

[Newell Jensen]

Update the disk when editing the disk in the UI and not only the filesystem. This saves a new disk name if that was changed. Code for any filesystem updates is still in tact via the machine websocket handler update_disk method.

[Andres Rodriguez (andreserl)]

review: Needs Information

[Newell Jensen (newell-jensen)]

What information is needed?

[Newell Jensen (newell-jensen)]

Reply inline.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/static/js/angular/controllers/node_details_storage.js b/src/maasserver/static/js/angular/controllers/node_details_storage.js
index f9efa04..31e32cd 100644
--- a/src/maasserver/static/js/angular/controllers/node_details_storage.js
+++ b/src/maasserver/static/js/angular/controllers/node_details_storage.js
@@ -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).
  *
  * MAAS Node Storage Controller
@@ -1094,10 +1094,8 @@ angular.module('MAAS').controller('NodeStorageController', [
             }
 
             // Save the options.
-            MachinesManager.updateFilesystem(
-                $scope.node, disk.block_id, disk.partition_id,
-                disk.$options.fstype, disk.$options.mountPoint,
-                disk.$options.mountOptions, disk.$options.tags);
+            MachinesManager.updateDisk(
+                $scope.node, disk.block_id, params);
 
             // Set the options on the object so no flicker occurs while waiting
             // for the new object to be received.
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js
index a3e2045..9d7223a 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js
@@ -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).
  *
  * Unit tests for NodeStorageController.
@@ -3048,14 +3048,14 @@ describe("NodeStorageController", function() {
                     name: name
                 }
             };
-            spyOn(MachinesManager, "updateFilesystem");
+            spyOn(MachinesManager, "updateDisk");
 
             $scope.availableConfirmEdit(disk);
             expect(disk.name).toBe(name);
-            expect(MachinesManager.updateFilesystem).toHaveBeenCalled();
+            expect(MachinesManager.updateDisk).toHaveBeenCalled();
         });
 
-        it("calls updateDisks with new name for logical volume", function() {
+        it("calls updateDisk with new name for logical volume", function() {
             var controller = makeController();
             var disk = {
                 name: "vg0-lvnew",
@@ -3072,10 +3072,10 @@ describe("NodeStorageController", function() {
                     name: "vg0-lvold"
                 }
             };
-            spyOn(MachinesManager, "updateFilesystem");
+            spyOn(MachinesManager, "updateDisk");
 
             $scope.availableConfirmEdit(disk);
-            expect(MachinesManager.updateFilesystem).toHaveBeenCalled();
+            expect(MachinesManager.updateDisk).toHaveBeenCalled();
         });
 
     });