Merge lp:~allenap/maas/dont-crash-when-selecting-fpi--bug-1293676 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Inhibit the controls to change between fast and default installers when the use-fastpath-installer tag is defined with an expression.

Drive-by change: I updated the error messages in the Node model (relating to installer choice) to match the terminology used in the UI.

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-03-27 17:52:53 +0000
+++ src/maasserver/models/node.py	2014-04-02 16:50:35 +0000
@@ -837,8 +837,8 @@
         if uti_tag.is_defined:
             raise RuntimeError(
                 "The use-fastpath-installer tag is defined with an "
-                "expression. This expression must be updated to prevent "
-                "this node from booting with the Fast Path installer.")
+                "expression. This expression must instead be updated to set "
+                "this node to install with the default installer.")
         self.tags.remove(uti_tag)
 
     def use_fastpath_installer(self):
@@ -856,6 +856,6 @@
         if uti_tag.is_defined:
             raise RuntimeError(
                 "The use-fastpath-installer tag is defined with an "
-                "expression. This expression must be updated to make this "
-                "node boot with the Fast Path Installer.")
+                "expression. This expression must instead be updated to set "
+                "this node to install with the fast installer.")
         self.tags.add(uti_tag)

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2013-11-15 18:15:51 +0000
+++ src/maasserver/node_action.py	2014-04-02 16:50:35 +0000
@@ -44,6 +44,7 @@
     Node,
     SSHKey,
     )
+from maasserver.models.tag import Tag
 from maasserver.utils import map_enum
 
 # All node statuses.
@@ -198,6 +199,18 @@
         self.node.use_fastpath_installer()
         return "Node marked as using curtin for install."
 
+    def inhibit(self):
+        """Inhibit if ``use-fastpath-installer`` uses an expression."""
+        tag, _ = Tag.objects.get_or_create(name="use-fastpath-installer")
+        if tag.is_defined:
+            return dedent("""\
+            The use-fastpath-installer tag is defined with an
+            expression. This expression must instead be updated to set
+            this node to install with the fast installer.
+            """)
+        else:
+            return None
+
 
 class UseDI(NodeAction):
     """Set this node to use d-i for installation."""
@@ -216,6 +229,18 @@
         self.node.use_traditional_installer()
         return "Node marked as using the default installer."
 
+    def inhibit(self):
+        """Inhibit if ``use-fastpath-installer`` uses an expression."""
+        tag, _ = Tag.objects.get_or_create(name="use-fastpath-installer")
+        if tag.is_defined:
+            return dedent("""\
+            The use-fastpath-installer tag is defined with an
+            expression. This expression must instead be updated to set
+            this node to install with the default installer.
+            """)
+        else:
+            return None
+
 
 class StartNode(NodeAction):
     """Acquire and start a node."""

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2014-01-14 00:43:21 +0000
+++ src/maasserver/tests/test_node_action.py	2014-04-02 16:50:35 +0000
@@ -23,6 +23,7 @@
     NODE_STATUS_CHOICES_DICT,
     )
 from maasserver.exceptions import Redirect
+from maasserver.models import Tag
 from maasserver.node_action import (
     Commission,
     compile_node_actions,
@@ -264,6 +265,11 @@
             self.celery.tasks[0]['task'].name)
 
 
+def make_use_fastpath_installer_tag_with_expression():
+    Tag.objects.get_or_create(
+        name="use-fastpath-installer", definition="true()")
+
+
 class TestUseCurtinNodeAction(MAASServerTestCase):
 
     def test_sets_tag(self):
@@ -287,6 +293,18 @@
         user = factory.make_admin()
         self.assertFalse(UseCurtin(node, user).is_permitted())
 
+    def test_inhibited_if_use_fastpath_installer_tag_uses_expr(self):
+        make_use_fastpath_installer_tag_with_expression()
+        node = factory.make_node()
+        user = factory.make_admin()
+        self.assertDocTestMatches(
+            """\
+            The use-fastpath-installer tag is defined with an
+            expression. This expression must instead be updated to set
+            this node to install with the fast installer.
+            """,
+            UseCurtin(node, user).inhibit())
+
 
 class TestUseDINodeAction(MAASServerTestCase):
 
@@ -310,3 +328,15 @@
         node.use_traditional_installer()
         user = factory.make_admin()
         self.assertFalse(UseDI(node, user).is_permitted())
+
+    def test_inhibited_if_use_fastpath_installer_tag_uses_expr(self):
+        make_use_fastpath_installer_tag_with_expression()
+        node = factory.make_node()
+        user = factory.make_admin()
+        self.assertDocTestMatches(
+            """\
+            The use-fastpath-installer tag is defined with an
+            expression. This expression must instead be updated to set
+            this node to install with the default installer.
+            """,
+            UseDI(node, user).inhibit())