Merge lp:~bac/charms/precise/juju-gui/support-constraints into lp:~juju-gui/charms/precise/juju-gui/trunk

[Brad Crittenden]

Support for juju core constraints

All juju core constraints should be supported by Juju GUI.
See https://juju.ubuntu.com/docs/reference-constraints.html
The 'tags' constraint was not implemented as it is only supported for MaaS
deployments.

https://codereview.appspot.com/61510051/

[Brad Crittenden (bac)]

Reviewers: mp+206006_code.launchpad.net,

Message:
Please take a look.

Description:
Support for juju core constraints

All juju core constraints should be supported by Juju GUI.
See https://juju.ubuntu.com/docs/reference-constraints.html
The 'tags' constraint was not implemented as it is only supported for
MaaS
deployments.

https://code.launchpad.net/~bac/charms/precise/juju-gui/support-constraints/+merge/206006

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/61510051/

Affected files (+14, -1 lines):
   [revision details]
   server/guiserver/bundles/utils.py
   server/guiserver/tests/bundles/test_utils.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision: <email address hidden>

Index: server/guiserver/bundles/utils.py
=== modified file 'server/guiserver/bundles/utils.py'
--- server/guiserver/bundles/utils.py 2013-11-27 19:25:54 +0000
+++ server/guiserver/bundles/utils.py 2014-02-12 13:55:47 +0000
@@ -39,7 +39,16 @@
  COMPLETED = 'completed'
  # Define a sequence of allowed constraints to be used in the process of
  # preparing the bundle object. See the _prepare_constraints function below.
-ALLOWED_CONSTRAINTS = ('arch', 'cpu-cores', 'cpu-power', 'mem')
+ALLOWED_CONSTRAINTS = (
+ 'arch',
+ 'container',
+ 'cpu-cores',
+ 'cpu-power',
+ 'mem',
+ 'root-disk',
+ # tags are supported by MaaS only so they are not currently supported.
+ # 'tags',
+)

  def create_change(deployment_id, status, queue=None, error=None):

Index: server/guiserver/tests/bundles/test_utils.py
=== modified file 'server/guiserver/tests/bundles/test_utils.py'
--- server/guiserver/tests/bundles/test_utils.py 2013-11-27 19:28:03 +0000
+++ server/guiserver/tests/bundles/test_utils.py 2014-02-12 13:55:47 +0000
@@ -278,6 +278,8 @@
              'cpu-cores': 4,
              'cpu-power': 2,
              'mem': 2000,
+ 'root-disk': '1G',
+ 'container': 'lxc',
          }
          self.assertEqual(constraints,
utils._prepare_constraints(constraints))

[Francesco Banconi (frankban)]

LGTM with just a minor comment.
Thank you!

https://codereview.appspot.com/61510051/diff/1/server/guiserver/bundles/utils.py
File server/guiserver/bundles/utils.py (right):

https://codereview.appspot.com/61510051/diff/1/server/guiserver/bundles/utils.py#newcode49
server/guiserver/bundles/utils.py:49:
Could you please expand on why we do not support MAAS specific
constraints?

https://codereview.appspot.com/61510051/

[lp:~bac/charms/precise/juju-gui/support-constraints]

165. By Brad Crittenden on 2014-02-12

Further document the decision to leave out tag constraints.

166. By Brad Crittenden on 2014-02-12

Further document the decision to leave out tag constraints.

[Brad Crittenden (bac)]

Done

https://codereview.appspot.com/61510051/

[Brad Crittenden (bac)]

*** Submitted:

Support for juju core constraints

All juju core constraints should be supported by Juju GUI.
See https://juju.ubuntu.com/docs/reference-constraints.html
The 'tags' constraint was not implemented as it is only supported for
MaaS
deployments.

R=frankban
CC=
https://codereview.appspot.com/61510051

https://codereview.appspot.com/61510051/

=== modified file 'server/guiserver/bundles/utils.py'
--- server/guiserver/bundles/utils.py	2013-11-27 19:25:54 +0000
+++ server/guiserver/bundles/utils.py	2014-02-12 19:11:43 +0000
@@ -39,7 +39,21 @@
 COMPLETED = 'completed'
 # Define a sequence of allowed constraints to be used in the process of
 # preparing the bundle object. See the _prepare_constraints function below.
-ALLOWED_CONSTRAINTS = ('arch', 'cpu-cores', 'cpu-power', 'mem')
+ALLOWED_CONSTRAINTS = (
+    'arch',
+    'container',
+    'cpu-cores',
+    'cpu-power',
+    'mem',
+    'root-disk',
+    # XXX: BradCrittenden 2014-02-12:
+    # tags are supported by MaaS only so they are not currently implemented.
+    # It is unclear whether the GUI should support them or not so they are
+    # being left out for now.
+    # Also, tags are a comma-separated, which would clash with the currently
+    # broken constraint parsing in the GUI.
+    # 'tags',
+)
 
 
 def create_change(deployment_id, status, queue=None, error=None):
 
=== modified file 'server/guiserver/tests/bundles/test_utils.py'
--- server/guiserver/tests/bundles/test_utils.py	2013-11-27 19:28:03 +0000
+++ server/guiserver/tests/bundles/test_utils.py	2014-02-12 19:11:43 +0000
@@ -278,6 +278,8 @@
             'cpu-cores': 4,
             'cpu-power': 2,
             'mem': 2000,
+            'root-disk': '1G',
+            'container': 'lxc',
         }
         self.assertEqual(constraints, utils._prepare_constraints(constraints))