Merge lp:~tvansteenburgh/juju-deployer/beta11 into lp:juju-deployer

[Tim Van Steenburgh]

Changes to support juju2 api changes.

[lp:~tvansteenburgh/juju-deployer/beta11]

188. By Tim Van Steenburgh on 2016-07-20

s/lxc/lxd/

189. By Tim Van Steenburgh on 2016-07-29

Fix lxc/lxd placement support

- On juju1, lxd is not a valid placment directive (only lxc/kvm).
- On juju2, lxc/lxd/kvm are all supported, but lxc directives will
  be changed to lxd before being passed to juju.

=== modified file 'deployer/action/diff.py'
--- deployer/action/diff.py	2016-05-12 20:22:06 +0000
+++ deployer/action/diff.py	2016-07-29 13:47:45 +0000
@@ -32,7 +32,7 @@
             self.env_state['services'][svc_name][
                 'constraints'] = self.env.get_constraints(svc_name)
             self.env_state['services'][svc_name]['unit_count'] = len(
-                self.env_status['services'][svc_name].get('units', {}))
+                (self.env_status['services'][svc_name].get('units') or {}))
             rels.update(self._load_rels(svc_name))
         self.env_state['relations'] = sorted(rels)
 
@@ -61,7 +61,7 @@
         for r, eps in svc_rels.items():
             if src in eps:
                 if found:
-                    raise ValueError("Ambigious relations for service")
+                    raise ValueError("Ambigious relations for application")
                 found = r
         return found
 
 
=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2016-05-07 23:02:56 +0000
+++ deployer/action/importer.py	2016-07-29 13:47:45 +0000
@@ -32,7 +32,7 @@
             while delay > time.time():
                 if svc.name in env_status['services']:
                     cur_units = len(
-                        env_status['services'][svc.name].get('units', ())
+                        (env_status['services'][svc.name].get('units') or ())
                     )
                     if cur_units > 0:
                         break
@@ -43,7 +43,7 @@
 
             if delta <= 0:
                 self.log.debug(
-                    " Service %r does not need any more units added.",
+                    " Application %r does not need any more units added.",
                     svc.name)
                 continue
 
@@ -161,19 +161,19 @@
           in a machine spec, and units will be placed accordingly if this
           flag is false.
         """
-        self.log.info("Deploying services...")
+        self.log.info("Deploying applications...")
         env_status = self.env.status()
         reloaded = False
 
         for svc in self.deployment.get_services():
             if svc.name in env_status['services']:
                 self.log.debug(
-                    " Service %r already deployed. Skipping" % svc.name)
+                    " Application %r already deployed. Skipping" % svc.name)
                 continue
 
             charm = self.deployment.get_charm_for(svc.name)
             self.log.info(
-                " Deploying service %s using %s", svc.name,
+                " Deploying application %s using %s", svc.name,
                 charm.charm_url if not charm.is_absolute() else charm.path
             )
 
@@ -343,5 +343,5 @@
         # Finally expose things
         for svc in self.deployment.get_services():
             if svc.expose:
-                self.log.info(" Exposing service %r" % svc.name)
+                self.log.info(" Exposing application %r" % svc.name)
                 self.env.expose(svc.name)
 
=== modified file 'deployer/charm.py'
--- deployer/charm.py	2016-05-07 23:48:30 +0000
+++ deployer/charm.py	2016-07-29 13:47:45 +0000
@@ -96,7 +96,8 @@
 
         if store_url and branch:
             cls.log.error(
-                "Service: %s has both charm url: %s and branch: %s specified",
+                'Application: %s has both charm url: %s and '
+                'branch: %s specified',
                 name, store_url, branch)
         if not store_url:
             build = data.get('build', '')
 
=== modified file 'deployer/cli.py'
--- deployer/cli.py	2016-05-07 23:02:56 +0000
+++ deployer/cli.py	2016-07-29 13:47:45 +0000
@@ -47,14 +47,14 @@
         '-l', '--ls', help='List available deployments',
         dest="list_deploys", action="store_true", default=False)
     parser.add_argument(
-        '-D', '--destroy-services',
-        help='Destroy all services (do not terminate machines)',
-        dest="destroy_services", action="store_true",
+        '-D', '--destroy-applications',
+        help='Destroy all applications (do not terminate machines)',
+        dest="destroy_applications", action="store_true",
         default=False)
     parser.add_argument(
         '-T', '--terminate-machines',
         help=('Terminate all machines but the bootstrap node. '
-              'Destroy any services that exist on each. '
+              'Destroy any applications that exist on each. '
               'Use -TT to forcefully terminate.'),
         dest="terminate_machines", action="count", default=0)
     parser.add_argument(
@@ -62,9 +62,9 @@
         help='Timeout (sec) for entire deployment (45min default)',
         dest='timeout', action='store', type=int, default=2700)
     parser.add_argument(
-        "-f", '--find-service', action="store", type=str,
-        help='Find hostname from first unit of a specific service.',
-        dest="find_service")
+        "-f", '--find-application', action="store", type=str,
+        help='Find hostname from first unit of a specific application.',
+        dest="find_application")
     parser.add_argument(
         "-b", '--branch-only', action="store_true",
         help='Update vcs branches and exit.',
@@ -93,7 +93,7 @@
     parser.add_argument(
         '-o', '--override', action='append', type=str,
         help=('Override *all* config options of the same name '
-              'across all services.  Input as key=value.'),
+              'across all applications.  Input as key=value.'),
         dest='overrides', default=None)
     parser.add_argument(
         '--series', type=str,
@@ -126,7 +126,7 @@
     parser.add_argument(
         '-n', '--no-relations',
         default=False, dest='no_relations', action='store_true',
-        help=('Do not add relations to environment, just services/units '
+        help=('Do not add relations to environment, just applications/units '
               '(default: False)'))
     parser.add_argument("--description", help=argparse.SUPPRESS,
                         action="store_true")
@@ -181,8 +181,8 @@
 
     config = ConfigStack(options.configs or [], options.series)
 
-    # Destroy services and exit
-    if options.destroy_services or options.terminate_machines:
+    # Destroy applications and exit
+    if options.destroy_applications or options.terminate_machines:
         log.info("Resetting environment...")
         env.connect()
         env.reset(terminate_machines=bool(options.terminate_machines),
@@ -192,17 +192,19 @@
         log.info("Environment reset in %0.2f", time.time() - start_time)
         sys.exit(0)
 
-    # Display service info and exit
-    if options.find_service:
-        address = env.get_service_address(options.find_service)
+    # Display application info and exit
+    if options.find_application:
+        address = env.get_service_address(options.find_application)
         if address is None:
-            log.error("Service not found %r", options.find_service)
+            log.error("Application not found %r", options.find_application)
             sys.exit(1)
         elif not address:
-            log.warning("Service: %s has no address for first unit",
-                        options.find_service)
+            log.warning("Application: %s has no address for first unit",
+                        options.find_application)
         else:
-            log.info("Service: %s address: %s", options.find_service, address)
+            log.info(
+                "Application: %s address: %s",
+                options.find_application, address)
             print(address)
         sys.exit(0)
 
 
=== modified file 'deployer/config.py'
--- deployer/config.py	2016-05-07 23:48:30 +0000
+++ deployer/config.py	2016-07-29 13:47:45 +0000
@@ -11,7 +11,12 @@
 from six.moves.urllib.parse import urlparse
 
 from .deployment import Deployment
-from .utils import ErrorExit, yaml_load, path_exists, dict_merge
+from .utils import (
+    ErrorExit,
+    yaml_load,
+    path_exists,
+    dict_merge,
+)
 
 
 class ConfigStack(object):
@@ -54,7 +59,8 @@
 
         # Check if this is a v4 bundle.
         services = yaml_result.get('services')
-        if isinstance(services, dict) and 'services' not in services:
+        if (isinstance(services, dict) and
+                'services' not in services):
             self.version = 4
             yaml_result = {config_file: yaml_result}
 
 
=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2016-05-08 02:59:17 +0000
+++ deployer/env/base.py	2016-07-29 13:47:45 +0000
@@ -2,8 +2,14 @@
 import logging
 
 from ..utils import (
-    yaml_load, ErrorExit,
-    yaml_dump, temp_file, _check_call, get_juju_major_version)
+    AlternateKeyDict,
+    ErrorExit,
+    yaml_load,
+    yaml_dump,
+    temp_file,
+    _check_call,
+    get_juju_major_version,
+)
 
 
 class BaseEnvironment(object):
@@ -34,17 +40,17 @@
         except KeyError:
             # 'agent-state' has been removed for new versions of Juju. Respond
             # with the closest status parameter.
-            return entity['jujustatus']['Current']
+            return entity['agent-status']['status']
 
     def _get_units_in_error(self, status=None):
         units = []
         if status is None:
             status = self.status()
         for s in status.get('services', {}).keys():
-            for uid, u in status['services'][s].get('units', {}).items():
+            for uid, u in (status['services'][s].get('units') or {}).items():
                 if 'error' in self._get_agent_state(u):
                     units.append(uid)
-                for uid, u in u.get('subordinates', {}).items():
+                for uid, u in (u.get('subordinates') or {}).items():
                     if 'error' in self._get_agent_state(u):
                         units.append(uid)
         return units
@@ -91,20 +97,20 @@
 
             params.extend([charm_url, name])
             self._check_call(
-                params, self.log, "Error deploying service %r", name)
+                params, self.log, "Error deploying application %r", name)
 
     def expose(self, name):
         params = self._named_env(["juju", "expose", name])
         self._check_call(
-            params, self.log, "Error exposing service %r", name)
+            params, self.log, "Error exposing application %r", name)
 
     def terminate_machine(self, mid, wait=False, force=False):
         """Terminate a machine.
 
         Unless ``force=True``, the machine can't have any running units.
-        After removing the units or destroying the service, use wait_for_units
-        to know when its safe to delete the machine (i.e., units have finished
-        executing stop hooks and are removed).
+        After removing the units or destroying the application, use
+        wait_for_units to know when its safe to delete the machine (i.e.,
+        units have finished executing stop hooks and are removed).
 
         """
         if ((isinstance(mid, int) and mid == 0) or
@@ -130,21 +136,22 @@
     def get_service_address(self, svc_name):
         status = self.get_cli_status()
         if svc_name not in status['services']:
-            self.log.warning("Service %s does not exist", svc_name)
+            self.log.warning("Application %s does not exist", svc_name)
             return None
         svc = status['services'][svc_name]
         if 'subordinate-to' in svc:
             ps = svc['subordinate-to'][0]
             self.log.info(
-                'Service %s is a subordinate to %s, finding principle service'
+                'Application %s is a subordinate to %s, '
+                'finding principle application'
                 % (svc_name, ps))
             return self.get_service_address(svc['subordinate-to'][0])
 
-        units = svc.get('units', {})
+        units = svc.get('units') or {}
         unit_keys = list(sorted(units.keys()))
         if unit_keys:
             return units[unit_keys[0]].get('public-address', '')
-        self.log.warning("Service %s has no units" % svc_name)
+        self.log.warning("Application %s has no units" % svc_name)
 
     def get_cli_status(self):
         params = self._named_env(["juju", "status", "--format=yaml"])
@@ -153,10 +160,21 @@
                 params, self.log, "Error getting status, is it bootstrapped?",
                 stderr=fh)
         status = yaml_load(output)
-        return status
+        return NormalizedStatus(status)
 
     def add_unit(self, service_name, machine_spec):
         raise NotImplementedError()
 
     def set_annotation(self, entity, annotations, entity_type='service'):
         raise NotImplementedError()
+
+
+class NormalizedStatus(AlternateKeyDict):
+    alternates = {
+        'services': ('Services', 'applications'),
+        'machines': ('Machines',),
+        'units': ('Units',),
+        'relations': ('Relations',),
+        'subordinates': ('Subordinates',),
+        'agent-state': ('AgentState',),
+    }
 
=== modified file 'deployer/env/go.py'
--- deployer/env/go.py	2016-05-07 23:48:30 +0000
+++ deployer/env/go.py	2016-07-29 13:47:45 +0000
@@ -2,21 +2,25 @@
 from functools import cmp_to_key
 import time
 
-from .base import BaseEnvironment
+from .base import (
+    BaseEnvironment,
+    NormalizedStatus,
+)
+
 from ..utils import (
     ErrorExit,
     get_juju_major_version,
     parse_constraints,
 )
 
-from jujuclient import (
+from jujuclient.exc import (
     EnvError,
-    Environment as EnvironmentClient,
     UnitErrors,
 )
 
 from .watchers import (
     raise_on_errors,
+    NormalizedDelta,
     WaitForMachineTermination,
     WaitForUnits,
 )
@@ -31,6 +35,14 @@
         self.client = None
         self.juju_version = get_juju_major_version()
 
+    @property
+    def client_class(self):
+        if self.juju_version == 1:
+            from jujuclient.juju1.environment import Environment
+        else:
+            from jujuclient.juju2.environment import Environment
+        return Environment
+
     def add_machine(self, series="", constraints={}):
         """Add a top level machine to the Juju environment.
 
@@ -41,9 +53,12 @@
         constraints: a map of constraints (such as mem, arch, etc.) which
           can be parsed by utils.parse_constraints
         """
-        return self.client.add_machine(
+        result = self.client.add_machine(
             series=series,
-            constraints=parse_constraints(constraints))['Machine']
+            constraints=parse_constraints(constraints))
+        if 'Machine' in result:
+            return result['Machine']
+        return result['machine']
 
     def add_unit(self, service_name, machine_spec):
         return self.client.add_unit(service_name, machine_spec)
@@ -70,7 +85,7 @@
                 self.log, "Error getting env api endpoints, env bootstrapped?",
                 stderr=fh)
 
-        self.client = EnvironmentClient.connect(self.name)
+        self.client = self.client_class.connect(self.name)
         self.log.debug("Connected to environment")
 
     def get_config(self, svc_name):
@@ -80,7 +95,7 @@
         try:
             return self.client.get_constraints(svc_name)
         except EnvError as err:
-            if 'constraints do not apply to subordinate services' in str(err):
+            if 'constraints do not apply to subordinate' in str(err):
                 return {}
             raise
 
@@ -97,7 +112,7 @@
         status = self.status()
         destroyed = False
         for s in status.get('services', {}).keys():
-            self.log.debug(" Destroying service %s", s)
+            self.log.debug(" Destroying application %s", s)
             self.client.destroy_service(s)
             destroyed = True
 
@@ -137,7 +152,7 @@
         containers = set()
 
         def machine_sort(x, y):
-            for ctype in ('lxc', 'kvm'):
+            for ctype in ('lxc', 'lxd', 'kvm'):
                 for m in (x, y):
                     if ctype in m:
                         container_hosts.add(m.split('/', 1)[0])
@@ -230,15 +245,16 @@
     def set_annotation(self, entity_name, annotation, entity_type='service'):
         """Set an annotation on an entity.
 
-        entity_name: the name of the entity (machine, service, etc.) to
-          annotate.
+        entity_name: the name of the entity (machine, application, etc.) to
+            annotate.
         annotation: a dict of key/value pairs to set on the entity.
-        entity_type: the type of entity (machine, service, etc.) to annotate.
+        entity_type: the type of entity (machine, application, etc.) to
+            annotate.
         """
         return self.client.set_annotation(entity_name, entity_type, annotation)
 
     def status(self):
-        return self.client.get_stat()
+        return NormalizedStatus(self.client.status())
 
     def log_errors(self, errors):
         """Log the given unit errors.
@@ -246,6 +262,14 @@
         This can be used in the WaitForUnits error handling machinery, e.g.
         see deployer.watchers.log_on_errors.
         """
+        for e in errors:
+            if 'StatusInfo' not in e:
+                # convert from juju2 format
+                e['Name'] = e['name']
+                e['MachineId'] = e['machine-id']
+                e['Status'] = e['workload-status']['current']
+                e['StatusInfo'] = e['workload-status']['message']
+
         messages = [
             'unit: {Name}: machine: {MachineId} agent-state: {Status} '
             'details: {StatusInfo}'.format(**error) for error in errors
@@ -266,8 +290,14 @@
 
     def _delta_event_log(self, et, ct, d):
         # event type, change type, data
+        d = NormalizedDelta(d)
         name = d.get('Name', d.get('Id', 'unknown'))
-        state = d.get('Status', d.get('Life', 'unknown'))
+        state = (
+            d.get('workload-status') or
+            d.get('Status') or
+            d.get('Life') or
+            'unknown'
+        )
         if et == "relation":
             name = self._format_endpoints(d['Endpoints'])
             state = "created"
 
=== modified file 'deployer/env/gui.py'
--- deployer/env/gui.py	2016-05-03 16:03:18 +0000
+++ deployer/env/gui.py	2016-07-29 13:47:45 +0000
@@ -4,7 +4,7 @@
 See <https://code.launchpad.net/~juju-gui/charms/precise/juju-gui/trunk>.
 """
 
-from .go import GoEnvironment, EnvironmentClient
+from .go import GoEnvironment
 from ..utils import get_qualified_charm_url, parse_constraints
 
 
@@ -27,7 +27,7 @@
         client is already connected.
         """
         if self.client is None:
-            self.client = EnvironmentClient(self.api_endpoint)
+            self.client = self.client_class(self.api_endpoint)
             self.client.login(self._password, user=self._username)
 
     def close(self):
 
=== modified file 'deployer/env/mem.py'
--- deployer/env/mem.py	2016-05-07 23:48:30 +0000
+++ deployer/env/mem.py	2016-07-29 13:47:45 +0000
@@ -1,7 +1,9 @@
 from __future__ import absolute_import
 from deployer.utils import parse_constraints
-from jujuclient import (UnitErrors,
-                        EnvError)
+from jujuclient.exc import (
+    UnitErrors,
+    EnvError,
+)
 from six.moves import range
 
 
 
=== modified file 'deployer/env/watchers.py'
--- deployer/env/watchers.py	2016-05-07 23:48:30 +0000
+++ deployer/env/watchers.py	2016-07-29 13:47:45 +0000
@@ -1,15 +1,34 @@
 """A collection of juju-core environment watchers."""
 
 from __future__ import absolute_import
-from jujuclient import WatchWrapper
+from jujuclient.watch import WatchWrapper
 
-from ..utils import ErrorExit
+from ..utils import (
+    AlternateKeyDict,
+    ErrorExit,
+)
 
 # _status_map provides a translation of Juju 2 status codes to the closest
 # Juju 1 equivalent. Only defines codes that need translation.
 _status_map = {'idle': 'started'}
 
 
+class NormalizedDelta(AlternateKeyDict):
+    alternates = {
+        'Name': ('name',),
+        'Id': ('id',),
+        'Status': ('status',),
+        'JujuStatus': ('juju-status',),
+        'Current': ('current',),
+        'Life': ('life',),
+        'Endpoints': ('endpoints',),
+        'Service': ('service', 'application'),
+        'ServiceName': ('application-name',),
+        'Relation': ('relation',),
+        'Role': ('role',),
+    }
+
+
 class WaitForMachineTermination(WatchWrapper):
     """Wait until the given machines are terminated."""
 
@@ -21,6 +40,8 @@
     def process(self, entity_type, change, data):
         if entity_type != 'machine':
             return
+
+        data = NormalizedDelta(data)
         if change == 'remove' and data['Id'] in self.machines:
             self.machines.remove(data['Id'])
         else:
@@ -57,6 +78,8 @@
     def process(self, entity, action, data):
         if entity != 'unit':
             return
+
+        data = NormalizedDelta(data)
         if (self.services is None) or (data['Service'] in self.services):
             unit_name = data['Name']
             if action == 'remove' and unit_name in self.units:
@@ -72,19 +95,21 @@
         units_in_error = self.units_in_error
         for unit_name, data in self.units.items():
             try:
-                status = data['Status']
+                err_status = data['Status']
+                goal_status = err_status
             except KeyError:
                 # 'Status' has been removed from newer versions of Juju.
                 # Respond with the closest status parameter, translating it
                 # through the _status_map. If the status value is not in
                 # _status_map, just use the original value.
-                status = data['JujuStatus']['Current']
-                status = _status_map.get(status, status)
-            if status == 'error':
+                err_status = data['workload-status']['current']
+                goal_status = data['agent-status']['current']
+                goal_status = _status_map.get(goal_status, goal_status)
+            if err_status == 'error':
                 if unit_name not in units_in_error:
                     units_in_error.append(unit_name)
                     new_errors.append(data)
-            elif status != goal_state:
+            elif goal_status != goal_state:
                 ready = False
         if new_errors and goal_state != 'removed' and callable(on_errors):
             on_errors(new_errors)
 
=== modified file 'deployer/errors.py'
--- deployer/errors.py	2016-05-07 23:48:30 +0000
+++ deployer/errors.py	2016-07-29 13:47:45 +0000
@@ -1,4 +1,4 @@
 # TODO make deployer specific exceptions,
 # also move errorexit from utils to here.
 from __future__ import absolute_import
-from jujuclient import UnitErrors, EnvError  # noqa
+from jujuclient.exc import UnitErrors, EnvError  # noqa
 
=== modified file 'deployer/service.py'
--- deployer/service.py	2016-05-12 20:22:06 +0000
+++ deployer/service.py	2016-07-29 13:47:45 +0000
@@ -2,8 +2,25 @@
 import itertools
 
 from .feedback import Feedback
+from .utils import get_juju_major_version
 from six.moves import map
 
+# Map of container-type-used-in-bundle to actual-container-type-passed-to-juju.
+if get_juju_major_version() == 1:
+    # lxd not supported on juju1
+    CONTAINER_TYPES = {
+        'lxc': 'lxc',
+        'kvm': 'kvm',
+    }
+else:
+    # If you use 'lxc' in a bundle with juju2, deployer will translate it to
+    # 'lxd' before passing the deploy command to juju.
+    CONTAINER_TYPES = {
+        'lxc': 'lxd',
+        'lxd': 'lxd',
+        'kvm': 'kvm',
+    }
+
 
 class Service(object):
 
@@ -82,8 +99,8 @@
             # Should be caught in validate relations but sanity check
             # for concurrency.
             self.deployment.log.error(
-                "Service %s to be deployed with non-existent service %s",
-                svc.name, placement)
+                "Application %s to be deployed with non-existent "
+                "application %s", svc.name, placement)
             # Prefer continuing deployment with a new machine rather
             # than an in-progress abort.
             return None
@@ -91,7 +108,8 @@
         svc_units = with_service['units']
         if int(u_idx) >= len(svc_units):
             self.deployment.log.warning(
-                "Service:%s, Deploy-with-service:%s, Requested-unit-index=%s, "
+                "Application:%s, Deploy-with-application:%s, "
+                "Requested-unit-index=%s, "
                 "Cannot solve, falling back to default placement",
                 svc.name, placement, u_idx)
             return None
@@ -100,7 +118,7 @@
         machine = svc_units[unit_names[int(u_idx)]].get('machine')
         if not machine:
             self.deployment.log.warning(
-                "Service:%s deploy-with unit missing machine %s",
+                "Application:%s deploy-with unit missing machine %s",
                 svc.name, unit_names[int(u_idx)])
             return None
         return self._format_placement(machine, container)
@@ -134,23 +152,23 @@
 
         for idx, p in enumerate(unit_placement):
             container, p, u_idx = self._parse_placement(p)
-            if container and container not in ('lxc', 'kvm'):
+            if container and container not in CONTAINER_TYPES:
                 feedback.error(
-                    "Invalid container type:%s service: %s placement: %s"
+                    "Invalid container type:%s application: %s placement: %s"
                     % (container, self.service.name, unit_placement[idx]))
             if u_idx:
                 if p in ('maas', 'zone'):
                     continue
                 if not u_idx.isdigit():
                     feedback.error(
-                        "Invalid service:%s placement: %s" % (
+                        "Invalid application:%s placement: %s" % (
                             self.service.name, unit_placement[idx]))
             if p.isdigit():
                 if p == '0' or p in machines or self.arbitrary_machines:
                     continue
                 else:
                     feedback.error(
-                        ("Service placement to machine "
+                        ("Application placement to machine "
                          "not supported %s to %s") % (
                             self.service.name, unit_placement[idx]))
             elif p in services:
@@ -160,11 +178,11 @@
                             self.service.name, p, services[p].unit_placement))
                 elif self.deployment.get_charm_for(p).is_subordinate():
                     feedback.error(
-                        "Cannot place to a subordinate service: %s -> %s" % (
-                            self.service.name, p))
+                        "Cannot place to a subordinate application: "
+                        "%s -> %s" % (self.service.name, p))
             else:
                 feedback.error(
-                    "Invalid service placement %s to %s" % (
+                    "Invalid application placement %s to %s" % (
                         self.service.name, unit_placement[idx]))
         return feedback
 
@@ -188,6 +206,7 @@
 
         if ':' in unit_placement:
             container, placement = unit_placement.split(":")
+            container = CONTAINER_TYPES[container]
         if '=' in placement:
             placement, u_idx = placement.split("=")
 
@@ -222,14 +241,15 @@
         """Fill the placement spec with necessary data.
 
         From the spec:
-        A unit placement may be specified with a service name only, in which
-        case its unit number is assumed to be one more than the unit number of
-        the previous unit in the list with the same service, or zero if there
-        were none.
+        A unit placement may be specified with an application name only,
+        in which case its unit number is assumed to be one more than the
+        unit number of the previous unit in the list with the same
+        application, or zero if there were none.
 
         If there are less elements in To than NumUnits, the last element is
         replicated to fill it. If there are no elements (or To is omitted),
         "new" is replicated.
+
         """
         unit_mapping = self.service.unit_placement
         unit_count = self.service.num_units
@@ -264,24 +284,27 @@
 
         This splits the placement into a container, a placement, and a unit
         number.  Both container and unit number are optional and can be None.
+
         """
         container = unit_number = None
         if ':' in placement:
             container, placement = placement.split(':')
+            container = CONTAINER_TYPES.get(container, container)
         if '/' in placement:
             placement, unit_number = placement.split('/')
         return container, placement, unit_number
 
     def validate(self):
-        """Validate the placement of a service and all of its units.
+        """Validate the placement of an application and all of its units.
 
-        If a service has a 'to' block specified, the list of machines, units,
-        containers, and/or services must be internally consistent, consistent
-        with other services in the deployment, and consistent with any machines
-        specified in the 'machines' block of the deployment.
+        If an application has a 'to' block specified, the list of machines,
+        units, containers, and/or applications must be internally consistent,
+        consistent with other applications in the deployment, and consistent
+        with any machines specified in the 'machines' block of the deployment.
 
         A feedback object is returned, potentially with errors and warnings
         inside it.
+
         """
         feedback = Feedback()
 
@@ -301,9 +324,9 @@
             container, target, unit_number = self._parse_placement(placement)
 
             # Validate the container type.
-            if container and container not in ('lxc', 'kvm'):
+            if container and container not in CONTAINER_TYPES:
                 feedback.error(
-                    'Invalid container type: {} service: {} placement: {}'
+                    'Invalid container type: {} application: {} placement: {}'
                     ''.format(container, service_name, placement))
             # Specify an existing machine (or, if the number is in the
             # list of machine specs, one of those).
@@ -311,7 +334,7 @@
                 continue
             if target.isdigit():
                 feedback.error(
-                    'Service placement to machine not supported: {} to {}'
+                    'Application placement to machine not supported: {} to {}'
                     ''.format(service_name, placement))
             # Specify a service for co-location.
             elif target in services:
@@ -326,24 +349,24 @@
                         continue
                     if unit_number > services[target].num_units:
                         feedback.error(
-                            'Service unit does not exist: {} to {}/{}'
+                            'Application unit does not exist: {} to {}/{}'
                             ''.format(service_name, target, unit_number))
                         continue
                 if self.deployment.get_charm_for(target).is_subordinate():
                     feedback.error(
-                        'Cannot place to a subordinate service: {} -> {}'
+                        'Cannot place to a subordinate application: {} -> {}'
                         ''.format(service_name, target))
             # Create a new machine or container.
             elif target == 'new':
                 continue
             else:
                 feedback.error(
-                    'Invalid service placement: {} to {}'
+                    'Invalid application placement: {} to {}'
                     ''.format(service_name, placement))
         return feedback
 
     def get_new_machines_for_containers(self):
-        """Return a list of containers in the service's unit placement that
+        """Return a list of containers in the application's unit placement that
         have been requested to be put on new machines."""
         new_machines = []
         unit = itertools.count()
 
=== modified file 'deployer/tests/test_deployment.py'
--- deployer/tests/test_deployment.py	2016-05-08 01:11:12 +0000
+++ deployer/tests/test_deployment.py	2016-07-29 13:47:45 +0000
@@ -6,6 +6,7 @@
 
 from deployer.deployment import Deployment
 from deployer.utils import setup_logging, ErrorExit
+from deployer.service import CONTAINER_TYPES
 
 from .base import Base, skip_if_offline
 
@@ -151,18 +152,18 @@
 
         self.assertEqual(p.colocate(status, 'asdf', '1', '', svc),
                          None)
-        self.assertIn('Service bar to be deployed with non-existent service '
-                      'asdf',
+        self.assertIn('Application bar to be deployed with non-existent '
+                      'application asdf',
                       self.output.getvalue())
         self.assertEqual(p.colocate(status, 'foo', '2', '', svc),
                          None)
-        self.assertIn('Service:bar, Deploy-with-service:foo, '
+        self.assertIn('Application:bar, Deploy-with-application:foo, '
                       'Requested-unit-index=2, Cannot solve, '
                       'falling back to default placement',
                       self.output.getvalue())
         self.assertEqual(p.colocate(status, 'foo', '1', '', svc),
                          None)
-        self.assertIn('Service:bar deploy-with unit missing machine 2',
+        self.assertIn('Application:bar deploy-with unit missing machine 2',
                       self.output.getvalue())
         self.assertEqual(p.colocate(status, 'foo', '0', '', svc), 1)
 
@@ -201,9 +202,11 @@
             deployment.validate_placement()
         output = self.output.getvalue()
         self.assertIn(
-            'Cannot place to a subordinate service: ceph -> nrpe\n', output)
+            'Cannot place to a subordinate application: '
+            'ceph -> nrpe\n', output)
         self.assertIn(
-            'Cannot place to a subordinate service: nova-compute -> nrpe\n',
+            'Cannot place to a subordinate application: '
+            'nova-compute -> nrpe\n',
             output)
 
     @skip_if_offline
@@ -215,7 +218,8 @@
             deployment.validate_placement()
         output = self.output.getvalue()
         self.assertIn(
-            'Cannot place to a subordinate service: nova-compute -> nrpe\n',
+            'Cannot place to a subordinate application: '
+            'nova-compute -> nrpe\n',
             output)
 
     def test_validate_invalid_unit_number(self):
@@ -228,6 +232,12 @@
             'Invalid unit number for placement: django to bad-wolf\n', output)
 
     def test_get_unit_placement_v3(self):
+        def _container(s):
+            if ':' in s:
+                typ, num = s.split(':')
+                return '{}:{}'.format(CONTAINER_TYPES[typ], num)
+            return CONTAINER_TYPES[typ]
+
         d = self.get_named_deployment_v3("stack-placement.yaml", "stack")
         status = {
             'services': {
@@ -242,12 +252,12 @@
         self.assertEqual(placement.get(2), None)
 
         placement = d.get_unit_placement('quantum', status)
-        self.assertEqual(placement.get(0), 'lxc:1')
-        self.assertEqual(placement.get(2), 'lxc:3')
+        self.assertEqual(placement.get(0), _container('lxc:1'))
+        self.assertEqual(placement.get(2), _container('lxc:3'))
         self.assertEqual(placement.get(3), None)
 
         placement = d.get_unit_placement('verity', status)
-        self.assertEqual(placement.get(0), 'lxc:3')
+        self.assertEqual(placement.get(0), _container('lxc:3'))
 
         placement = d.get_unit_placement('mysql', status)
         self.assertEqual(placement.get(0), '0')
@@ -256,11 +266,11 @@
         self.assertEqual(placement.get(0), '3')
 
         placement = d.get_unit_placement('lxc-service', status)
-        self.assertEqual(placement.get(0), 'lxc:2')
-        self.assertEqual(placement.get(1), 'lxc:3')
-        self.assertEqual(placement.get(2), 'lxc:1')
-        self.assertEqual(placement.get(3), 'lxc:1')
-        self.assertEqual(placement.get(4), 'lxc:3')
+        self.assertEqual(placement.get(0), _container('lxc:2'))
+        self.assertEqual(placement.get(1), _container('lxc:3'))
+        self.assertEqual(placement.get(2), _container('lxc:1'))
+        self.assertEqual(placement.get(3), _container('lxc:1'))
+        self.assertEqual(placement.get(4), _container('lxc:3'))
 
     def test_fill_placement_v4(self):
         d = self.get_deployment_v4('fill_placement.yaml')
@@ -290,7 +300,7 @@
         self.assertEqual(u, '1')
 
         c, p, u = placement._parse_placement('lxc:mysql')
-        self.assertEqual(c, 'lxc')
+        self.assertEqual(c, CONTAINER_TYPES['lxc'])
         self.assertEqual(p, 'mysql')
         self.assertEqual(u, None)
 
@@ -299,12 +309,13 @@
         placement = d.get_unit_placement('mysql', {})
         feedback = placement.validate()
         self.assertEqual(feedback.get_errors(), [
-            'Invalid container type: asdf service: mysql placement: asdf:0',
-            'Service placement to machine not supported: mysql to asdf:0',
-            'Invalid service placement: mysql to lxc:asdf',
-            'Service placement to machine not supported: mysql to 1',
-            'Service unit does not exist: mysql to wordpress/3',
-            'Invalid service placement: mysql to asdf'])
+            'Invalid container type: asdf application: mysql '
+            'placement: asdf:0',
+            'Application placement to machine not supported: mysql to asdf:0',
+            'Invalid application placement: mysql to lxc:asdf',
+            'Application placement to machine not supported: mysql to 1',
+            'Application unit does not exist: mysql to wordpress/3',
+            'Invalid application placement: mysql to asdf'])
 
     def test_get_unit_placement_v4_simple(self):
         d = self.get_deployment_v4('simple.yaml')
@@ -419,7 +430,10 @@
         d.set_machines(machines)
 
         placement = d.get_unit_placement('mysql', status)
-        self.assertEqual(placement.get(0), 'lxc:1')
+        self.assertEqual(
+            placement.get(0),
+            '{}:1'.format(CONTAINER_TYPES['lxc'])
+        )
 
         placement = d.get_unit_placement('mediawiki', status)
         self.assertEqual(placement.get(0), 1)
@@ -446,7 +460,10 @@
         self.assertEqual(
             placement.get_new_machines_for_containers(),
             ['mysql/0'])
-        self.assertEqual(placement.get(0), 'lxc:2')
+        self.assertEqual(
+            placement.get(0),
+            '{}:2'.format(CONTAINER_TYPES['lxc'])
+        )
 
         placement = d.get_unit_placement('mediawiki', status)
         self.assertEqual(placement.get(0), 1)
 
=== modified file 'deployer/tests/test_goenv.py'
--- deployer/tests/test_goenv.py	2016-05-07 23:02:56 +0000
+++ deployer/tests/test_goenv.py	2016-07-29 13:47:45 +0000
@@ -77,7 +77,7 @@
                     self.assertIn(u['agent-state'],
                                   ("allocating", "pending", "started"))
                 except KeyError:
-                    self.assertIn(u['jujustatus']['Current'],
+                    self.assertIn(u['agent-status']['status'],
                                   ("allocating", "idle"))
 
     def test_add_machine(self):
 
=== modified file 'deployer/tests/test_guienv.py'
--- deployer/tests/test_guienv.py	2016-05-07 23:02:56 +0000
+++ deployer/tests/test_guienv.py	2016-07-29 13:47:45 +0000
@@ -9,7 +9,7 @@
 )
 
 
[e-mail]('deployer.env.gui.EnvironmentClient')
[e-mail](GUIEnvironment, 'client_class')
 class TestGUIEnvironment(unittest.TestCase):
 
     endpoint = 'wss://api.example.com:17070'
 
=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2016-05-07 23:02:56 +0000
+++ deployer/tests/test_guiserver.py	2016-07-29 13:47:45 +0000
@@ -28,8 +28,8 @@
         # When adding/modifying options, ensure the defaults are sane for us.
         expected_keys = set([
             'bootstrap', 'branch_only', 'configs', 'debug', 'deploy_delay',
-            'deployment', 'description', 'destroy_services', 'diff',
-            'find_service', 'ignore_errors', 'juju_env', 'list_deploys',
+            'deployment', 'description', 'destroy_applications', 'diff',
+            'find_application', 'ignore_errors', 'juju_env', 'list_deploys',
             'no_local_mods', 'no_relations', 'overrides', 'rel_wait',
             'retry_count', 'series', 'skip_unit_wait', 'terminate_machines',
             'timeout', 'update_charms', 'verbose', 'watch'
@@ -46,9 +46,9 @@
         self.assertFalse(options.debug)
         self.assertEqual(0, options.deploy_delay)
         self.assertIsNone(options.deployment)
-        self.assertFalse(options.destroy_services)
+        self.assertFalse(options.destroy_applications)
         self.assertFalse(options.diff)
-        self.assertIsNone(options.find_service)
+        self.assertIsNone(options.find_application)
         self.assertTrue(options.ignore_errors)
         self.assertEqual(os.getenv("JUJU_ENV"), options.juju_env)
         self.assertFalse(options.list_deploys)
 
=== modified file 'deployer/utils.py'
--- deployer/utils.py	2016-05-13 14:16:48 +0000
+++ deployer/utils.py	2016-07-29 13:47:45 +0000
@@ -427,3 +427,40 @@
         if x.name == placement:
             return True
     return False
+
+
+class AlternateKeyDict(dict):
+    def __getitem__(self, key):
+        try:
+            val = super(AlternateKeyDict, self).__getitem__(key)
+            if isinstance(val, dict):
+                return self.__class__(val)
+            return val
+        except KeyError:
+            if key not in self.alternates:
+                raise
+
+            for alt in self.alternates[key]:
+                if alt in self:
+                    return self[alt]
+            raise
+
+    def get(self, key, default=None):
+        try:
+            return self.__getitem__(key)
+        except KeyError:
+            return default
+
+    def values(self):
+        for val in super(AlternateKeyDict, self).values():
+            if isinstance(val, dict):
+                yield self.__class__(val)
+            else:
+                yield val
+
+    def items(self):
+        for key, val in super(AlternateKeyDict, self).items():
+            if isinstance(val, dict):
+                yield key, self.__class__(val)
+            else:
+                yield key, val
 
=== modified file 'tox.ini'
--- tox.ini	2016-05-13 12:26:48 +0000
+++ tox.ini	2016-07-29 13:47:45 +0000
@@ -15,7 +15,7 @@
         JUJU_DATA = {homedir}/.local/share/juju
         HOME = {env:HOME}
 commands=
-  nosetests --with-coverage --cover-package=deployer deployer/tests
+  nosetests -s --with-coverage --cover-package=deployer deployer/tests
 
 [testenv:pep8]
 commands = flake8 deployer