Merge lp:~fwereade/pyjuju/block-legacy-constraints-usage into lp:~fwereade/pyjuju/shadow-trunk-1204

[William Reade]

Block set-constraints, and deploy --constraints, in legacy deployments

https://codereview.appspot.com/5952045/

[William Reade (fwereade)]

Reviewers: mp+99856_code.launchpad.net,

Message:
Please take a look.

Description:
Block set-constraints, and deploy --constraints, in legacy deployments

https://code.launchpad.net/~fwereade/juju/block-legacy-constraints-usage/+merge/99856

Requires:
https://code.launchpad.net/~fwereade/juju/env-constraints/+merge/99852

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M juju/control/constraints_set.py
   M juju/control/deploy.py
   M juju/control/legacy.py
   M juju/control/tests/test_constraints_set.py
   M juju/control/tests/test_deploy.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: juju/control/constraints_set.py
=== modified file 'juju/control/constraints_set.py'
--- juju/control/constraints_set.py 2012-03-29 02:00:04 +0000
+++ juju/control/constraints_set.py 2012-03-29 03:20:51 +0000
@@ -2,6 +2,7 @@

  from twisted.internet.defer import inlineCallbacks

+from juju.control import legacy
  from juju.control.utils import get_environment
  from juju.state.environment import EnvironmentStateManager
  from juju.state.service import ServiceStateManager
@@ -35,11 +36,13 @@
      """
      environment = get_environment(options)
      return constraints_set(
- options.environments, environment, options.service,
options.constraints)
+ options.environments, environment, options.service,
+ options.constraints, options.log)

  @inlineCallbacks
-def constraints_set(env_config, environment, service_name,
constraint_strs):
+def constraints_set(env_config, environment, service_name, constraint_strs,
+ log):
      """
      Machine constraints allow you to pick the hardware to which your
services
      will be deployed. Examples:
@@ -86,6 +89,7 @@
      constraints = constraint_set.parse(constraint_strs)
      client = yield provider.connect()
      try:
+ yield legacy.check_constraints(client, constraint_strs)
          esm = EnvironmentStateManager(client)
          yield esm.set_config_state(env_config, environment.name)
          if service_name is None:

Index: juju/control/deploy.py
=== modified file 'juju/control/deploy.py'
--- juju/control/deploy.py 2012-03-29 01:37:57 +0000
+++ juju/control/deploy.py 2012-03-29 03:20:51 +0000
@@ -138,6 +138,7 @@
      client = yield provider.connect()

      try:
+ yield legacy.check_constraints(client, constraint_strs)
          yield legacy.check_environment(
              client, provider.get_legacy_config_keys())

Index: juju/control/legacy.py
=== modified file 'juju/control/legacy.py'
--- juju/control/legacy.py 2012-03-28 19:48:24 +0000
+++ juju/control/legacy.py 2012-03-29 03:20:51 +0000
@@ -1,8 +1,19 @@
+import logging
+import sys
+
  from twisted.internet.defer import inlineCallbacks

  from juju.errors import JujuError
  from juju.state.environment import Environm...

[William Reade (fwereade)]

Please take a look.

https://codereview.appspot.com/5952045/

[lp:~fwereade/pyjuju/block-legacy-constraints-usage]

516. By William Reade on 2012-03-29

code tidying after post-sleep self-review

517. By William Reade on 2012-03-29

merge parent

[Kapil Thangavelu (hazmat)]

short and sweet, LGTM

https://codereview.appspot.com/5952045/

[lp:~fwereade/pyjuju/block-legacy-constraints-usage]

518. By William Reade on 2012-03-30

merge parent

[William Reade (fwereade)]

*** Submitted:

Block set-constraints, and deploy --constraints, in legacy deployments

R=hazmat
CC=
https://codereview.appspot.com/5952045

https://codereview.appspot.com/5952045/

[lp:~fwereade/pyjuju/block-legacy-constraints-usage]

519. By William Reade on 2012-03-30

merge parent

=== modified file 'juju/control/constraints_set.py'
--- juju/control/constraints_set.py	2012-03-30 08:41:34 +0000
+++ juju/control/constraints_set.py	2012-03-30 08:41:34 +0000
@@ -2,6 +2,7 @@
 
 from twisted.internet.defer import inlineCallbacks
 
+from juju.control import legacy
 from juju.control.utils import get_environment
 from juju.state.environment import EnvironmentStateManager
 from juju.state.service import ServiceStateManager
@@ -34,8 +35,9 @@
     """Set machine constraints for the environment, or for a named service.
     """
     environment = get_environment(options)
+    env_config = options.environments
     return constraints_set(
-        options.environments, environment, options.service, options.constraints)
+        env_config, environment, options.service, options.constraints)
 
 
 @inlineCallbacks
@@ -86,6 +88,7 @@
     constraints = constraint_set.parse(constraint_strs)
     client = yield provider.connect()
     try:
+        yield legacy.check_constraints(client, constraint_strs)
         esm = EnvironmentStateManager(client)
         yield esm.set_config_state(env_config, environment.name)
         if service_name is None:

=== modified file 'juju/control/deploy.py'
--- juju/control/deploy.py	2012-03-30 08:41:34 +0000
+++ juju/control/deploy.py	2012-03-30 08:41:34 +0000
@@ -138,6 +138,7 @@
     client = yield provider.connect()
 
     try:
+        yield legacy.check_constraints(client, constraint_strs)
         yield legacy.check_environment(
             client, provider.get_legacy_config_keys())
 

=== modified file 'juju/control/legacy.py'
--- juju/control/legacy.py	2012-03-28 19:48:24 +0000
+++ juju/control/legacy.py	2012-03-30 08:41:34 +0000
@@ -14,9 +14,11 @@
     https://juju.ubuntu.com/DeprecatedEnvironmentSettings
 """
 
+
 def error(keys):
     raise JujuError(_ERROR % "\n    ".join(sorted(keys)))
 
+
 @inlineCallbacks
 def check_environment(client, keys):
     if not keys:
@@ -24,3 +26,16 @@
     esm = EnvironmentStateManager(client)
     if not (yield esm.get_in_legacy_environment()):
         error(keys)
+
+
+@inlineCallbacks
+def check_constraints(client, constraint_strs):
+    if not constraint_strs:
+        return
+    esm = EnvironmentStateManager(client)
+    if (yield esm.get_in_legacy_environment()):
+        raise JujuError(
+            "Constraints are not valid in legacy deployments. To use machine "
+            "constraints, please deploy your environment again from scratch. "
+            "You can continue to use this environment as before, but any "
+            "attempt to set constraints will fail.")

=== modified file 'juju/control/tests/test_constraints_set.py'
--- juju/control/tests/test_constraints_set.py	2012-03-30 08:41:34 +0000
+++ juju/control/tests/test_constraints_set.py	2012-03-30 08:41:34 +0000
@@ -62,3 +62,16 @@
             "arch": "arm",
             "cpu": None,
             "mem": 512.0})
+
+    @inlineCallbacks
+    def test_legacy_environment(self):
+        yield self.client.delete("/constraints")
+        finished = self.setup_cli_reactor()
+        self.setup_exit(0)
+        self.mocker.replay()
+        main(["set-constraints", "arch=arm", "cpu=any"])
+        yield finished
+
+        self.assertIn(
+            "Constraints are not valid in legacy deployments.",
+            self.stderr.getvalue())

=== modified file 'juju/control/tests/test_deploy.py'
--- juju/control/tests/test_deploy.py	2012-03-30 08:41:34 +0000
+++ juju/control/tests/test_deploy.py	2012-03-30 08:41:34 +0000
@@ -546,3 +546,24 @@
         yield self.assertFailure(
             service_manager.get_service_state("beekeeper"),
             ServiceStateNotFound)
+
+    @inlineCallbacks
+    def test_deploy_constraints_in_legacy_env(self):
+        yield self.client.delete("/constraints")
+
+        finished = self.setup_cli_reactor()
+        self.setup_exit(0)
+        self.mocker.replay()
+        stderr = self.capture_stream("stderr")
+
+        main(["deploy", "--repository", self.unbundled_repo_path,
+              "local:sample", "beekeeper", "--constraints", "arch=i386"])
+        yield finished
+
+        self.assertIn(
+            "Constraints are not valid in legacy deployments.",
+            stderr.getvalue())
+        service_manager = ServiceStateManager(self.client)
+        yield self.assertFailure(
+            service_manager.get_service_state("beekeeper"),
+            ServiceStateNotFound)