Merge lp:~rvb/maas/constraint-error-bug-1274085 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

1865. By Raphaël Badin on 2014-01-29

Add constraints representation in error message.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-01-22 17:33:48 +0000
+++ src/maasserver/api.py	2014-01-30 11:07:47 +0000
@@ -828,7 +828,11 @@
             nodes = form.filter_nodes(nodes)
             node = get_first(nodes)
             if node is None:
-                raise NodesNotAvailable("No matching node is available.")
+                error_msg = "No matching node is available."
+                constraints_str = form.get_constraints_representation()
+                if constraints_str is not '':
+                    error_msg += " (%s)" % constraints_str
+                raise NodesNotAvailable(error_msg)
             agent_name = request.data.get('agent_name', '')
             node.acquire(
                 request.user, get_oauth_token(request),

=== modified file 'src/maasserver/node_constraint_filter_forms.py'
--- src/maasserver/node_constraint_filter_forms.py	2013-12-18 17:35:45 +0000
+++ src/maasserver/node_constraint_filter_forms.py	2014-01-30 11:07:47 +0000
@@ -15,6 +15,7 @@
     ]
 
 
+import collections
 import itertools
 from itertools import chain
 import re
@@ -247,6 +248,27 @@
                 self._errors[constraint] = self.error_class([msg])
         return super(AcquireNodeForm, self).clean()
 
+    def get_constraints_representation(self):
+        """Return a string representation of the constraints of the form.
+
+        The representation is of the form:
+        "mem=1.0 not_in_zone=zone-iPx4fJ tags=tag1,tag2".
+        """
+        constraints = {}
+        for field in self.fields:
+            constraint_name = self.get_field_name(field)
+            constraint_value = self.cleaned_data.get(constraint_name)
+            if isinstance(constraint_value, collections.Iterable):
+                constraint_value = ','.join(sorted(constraint_value))
+            # Exclude empty constraints.
+            if constraint_value not in (None, ''):
+                constraints[constraint_name] = constraint_value
+        return " ".join(
+            [
+                "%s=%s" % (key, constraints[key])
+                for key in sorted(constraints.iterkeys())
+            ])
+
     def filter_nodes(self, nodes):
         filtered_nodes = nodes
 

=== modified file 'src/maasserver/tests/test_node_constraint_filter_forms.py'
--- src/maasserver/tests/test_node_constraint_filter_forms.py	2014-01-20 09:01:25 +0000
+++ src/maasserver/tests/test_node_constraint_filter_forms.py	2014-01-30 11:07:47 +0000
@@ -366,3 +366,20 @@
                 'mem': ["Invalid memory: number of MB required."],
             }),
             (form.is_valid(), form.errors))
+
+    def test_get_constraints_representation(self):
+        factory.make_tag(name='tag1')
+        factory.make_tag(name='tag2')
+        factory.make_zone(name='zone')
+        form = AcquireNodeForm(
+            data={
+                'tags': ['tag1', 'tag2'],
+                'mem': '1',
+                'not_connected_to': ['aa:bb:cc:dd:ee:ff'],
+                'not_in_zone': ['zone'],
+            })
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEquals(
+            "mem=1.0 not_connected_to=aa:bb:cc:dd:ee:ff "
+            "not_in_zone=zone tags=tag1,tag2",
+            form.get_constraints_representation())