juju/control should be aware of subordinates

juju/control/constraints_set.py

 import argparse
 
 from twisted.internet.defer import inlineCallbacks
 
-from juju.control.utils import get_environment
-from juju.machine.constraints import Constraints
+from juju.control import legacy
+from juju.control.utils import get_environment, sync_environment_state
+from juju.state.environment import EnvironmentStateManager
 from juju.state.service import ServiceStateManager
 
 
 def configure_subparser(subparsers):
     sub_parser = subparsers.add_parser(
         "set-constraints",
         help=command.__doc__,
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description=constraints_set.__doc__)
 
@@ skipping 10 matching lines @@
         nargs="+",
         help="name=value for constraint to set")
 
     return sub_parser
 
 
 def command(options):
     """Set machine constraints for the environment, or for a named service.
     """
     environment = get_environment(options)
+    env_config = options.environments
     return constraints_set(
-        environment, options.service, options.constraints)
+        env_config, environment, options.service, options.constraints)
 
 
 @inlineCallbacks
-def constraints_set(environment, service_name, constraint_strs):
+def constraints_set(env_config, environment, service_name, constraint_strs):
     """
     Machine constraints allow you to pick the hardware to which your services
     will be deployed. Examples:
 
     $ juju set-constraints --service-name mysql mem=8G cpu=4
 
-    $ juju set-constraints ec2-instance-type=t1.micro
+    $ juju set-constraints instance-type=t1.micro
 
-    "arch", "cpu" and "mem" are always available; other constraints are
-    provider-specific, and will be ignored if specified in an environment of
-    the wrong kind. The recognised constraints are currently:
+    Available constraints vary by provider type, and will be ignored if not
+    understood by the current environment's provider. The current set of
+    available constraints across all providers is:
 
-    * arch (CPU architecture: x86/amd64/arm; unset by default)
-    * cpu (processing power in Amazon ECU; 1 by default)
-    * mem (memory in [MGT]iB; 512M by default)
-    * ec2-region (us-east-1 by default)
-    * ec2-zone (unset by default)
-    * ec2-instance-type (unset by default)
-    * orchestra-classes (unset by default)
-    * orchestra-name (unset by default)
+    On Amazon EC2:
+
+        * arch (CPU architecture: i386/amd64/arm; amd64 by default)
+        * cpu (processing power in Amazon ECU; 1 by default)
+        * mem (memory in [MGT]iB; 512M by default)
+        * instance-type (unset by default)
+        * ec2-zone (unset by default)
+
+    On Orchestra:
+
+        * orchestra-classes (unset by default)
+
+    On MAAS:
+
+        * maas-name (unset by default)
 
     Service settings, if specified, will override environment settings, which
-    will in turn override the juju defaults of mem=512M, cpu=1,
-    ec2-region=us-east-1.
+    will in turn override the juju defaults of mem=512M, cpu=1, arch=amd64.
 
     New constraints set on an entity will completely replace that entity's
     pre-existing constraints.
 
     To override an environment constraint with the juju default when setting
     service constraints, just specify "name=" (rather than just not specifying
     the constraint at all, which will cause it to inherit the environment's
     value).
+
+    To entirely unset a constraint, specify "name=any".
     """
-    constraints = Constraints.from_strs(environment.type, constraint_strs)
-
-    if service_name is None:
-        raise NotImplementedError("Environment constraints not implemented")
-
     provider = environment.get_machine_provider()
+    constraint_set = yield provider.get_constraint_set()
+    constraints = constraint_set.parse(constraint_strs)
     client = yield provider.connect()
     try:
-        service_state_manager = ServiceStateManager(client)
-        service = yield service_state_manager.get_service_state(service_name)
-        yield service.set_constraints(constraints)
+        yield legacy.check_constraints(client, constraint_strs)
+        yield sync_environment_state(client, env_config, environment.name)
+        if service_name is None:
+            esm = EnvironmentStateManager(client)
+            yield esm.set_constraints(constraints)
+        else:
+            ssm = ServiceStateManager(client)
+            service = yield ssm.get_service_state(service_name)
+            yield service.set_constraints(constraints)
     finally:
         yield client.close()