Merge lp:~andreserl/maas/maas_fix_constraints_arch_mapping into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

[Gavin Panella (allenap)]

I think this is the wrong solution. If a subarch is not supplied I
would expect it to match any subarch. _constraints_arch_map is a
kludge to force this issue to go away, but I think it needs a
different fix. If we run out of time then I guess this is okay, but
I'd rather Blue Squad have a chance to comment first.

[1]

+_constraints_arch_map = {

Can you add a comment here, explaining to our future selves what the
purpose of this is?

[2]

+            if request_params[request_name] in _constraints_arch_map:
+                constraints[db_name] = _constraints_arch_map[request_params[request_name]]
+            else:
+                constraints[db_name] = request_params[request_name]

This could be simplified a little:

            constraint = request_params[request_name]
            constraint = _constraints_arch_map.get(constraint, constraint)
            constraints[db_name] = constraint

review: Needs Information

[Julian Edwards (julian-edwards)]

I agree with Gavin. Tests are also missing.

[Robie Basak (racb)]

I've just synced with Martin on how we want to amend this. Andres: please hold for now - I should have a merge proposal shortly.

[Martin Packman (gz)]

So, we've landed a more complete version of this fix now.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-10-05 08:04:58 +0000
+++ src/maasserver/api.py	2012-10-08 00:36:23 +0000
@@ -658,6 +658,15 @@
     }
 
 
+# Map the architecture constraint value as passed in the request to the value
+# of the constraint in the database.
+_constraints_arch_map = {
+    'i386': 'i386/generic',
+    'amd64': 'amd64/generic',
+    'armhf': 'armhf/highbank',
+    }
+
+
 def extract_constraints(request_params):
     """Extract a dict of node allocation constraints from http parameters.
 
@@ -670,7 +679,9 @@
     for request_name in _constraints_map:
         if request_name in request_params:
             db_name = _constraints_map[request_name]
-            constraints[db_name] = request_params[request_name]
+            constraint = request_params[request_name]
+            constraint = _constraints_arch_map.get(constraint, constraint)
+            constraints[db_name] = constraint
     return constraints