Merge lp:~ltrager/maas/fix_messages-1.9 into lp:maas/1.9

[Lee Trager]

Backport of 4513 from trunk: Clean up validate storage error messages.

Backport of 4513 from trunk: Clean up validate storage error messages

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~ltrager/maas/fix_messages/+merge/278090

review: Approve

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2015-11-18 18:14:30 +0000
+++ src/maasserver/models/node.py	2015-11-21 02:18:14 +0000
@@ -820,12 +820,17 @@
                     boot_mounted = True
         issues = []
         if not has_boot:
-            issues.append("Node must have boot disk.")
+            issues.append(
+                "Specify a storage device to be able to deploy this node.")
         if not root_mounted:
-            issues.append("Node must have / mounted.")
+            issues.append(
+                "Mount the root '/' filesystem to be able to deploy this "
+                "node.")
         if root_mounted and root_on_bcache and not boot_mounted:
-            issues.append("Because / is on a bcache volume you must create "
-                          "/boot on a non-bcache volume")
+            issues.append(
+                "This node cannot be deployed because it cannot boot from a "
+                "bcache volume. Mount /boot on a non-bcache device to be "
+                "able to deploy this node.")
         return issues
 
     def on_network(self):

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2015-11-18 18:14:30 +0000
+++ src/maasserver/models/tests/test_node.py	2015-11-21 02:18:14 +0000
@@ -3799,9 +3799,10 @@
 
     def test_storage_layout_issues_returns_invalid_when_no_disk(self):
         node = factory.make_Node(with_boot_disk=False)
-        self.assertEquals(["Node must have boot disk.",
-                           "Node must have / mounted."],
-                          node.storage_layout_issues())
+        self.assertEquals(
+            ["Specify a storage device to be able to deploy this node.",
+             "Mount the root '/' filesystem to be able to deploy this node."],
+            node.storage_layout_issues())
 
     def test_storage_layout_issues_returns_invalid_when_root_on_bcache(self):
         node = factory.make_Node(with_boot_disk=False)
@@ -3810,9 +3811,10 @@
             node=node, group_type=FILESYSTEM_GROUP_TYPE.BCACHE)
         bcache = fs_group.virtual_device
         factory.make_Filesystem(block_device=bcache, mount_point="/")
-        self.assertEquals(["Because / is on a bcache volume you must create "
-                          "/boot on a non-bcache volume"],
-                          node.storage_layout_issues())
+        self.assertEquals(
+            ["This node cannot be deployed because it cannot boot from a "
+             "bcache volume. Mount /boot on a non-bcache device to be able to "
+             "deploy this node."], node.storage_layout_issues())
 
 
 class TestNode_Stop(MAASServerTestCase):