Merge lp:~corey.bryant/charms/trusty/quantum-gateway/amulet-basic into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Corey Bryant]

[James Page (james-page)]

Not relevant for essex and folsom - I'd just drop the tests.

[lp:~corey.bryant/charms/trusty/quantum-gateway/amulet-basic]

56. By Corey Bryant on 2014-07-17

Add Amulet basic tests

[Corey Bryant (corey.bryant)]

Ok. I pushed a new version with essex/folsom tests dropped.

[Corey Bryant (corey.bryant)]

> Not relevant for essex and folsom - I'd just drop the tests.

Ok. I pushed a new version with essex/folsom tests dropped.

[James Page (james-page)]

I'm going to merge this as I think the tests are all 100% OK; however I do keep hitting a race where sentry.wait() in _deploy is not actually waiting for all hook execution to complete; resulting in the neutron-server on the nova-cc being restarted and connections from the client in the tests failing.

review: Approve

[Corey Bryant (corey.bryant)]

Thanks James. I'll add support to charm-helpers for the sentry.wait() issue.

[Stuart Bishop (stub)]

sentry.wait() is likely Bug #1254766

=== modified file 'Makefile'
--- Makefile	2014-05-21 10:07:03 +0000
+++ Makefile	2014-07-17 15:16:47 +0000
@@ -3,15 +3,23 @@
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers unit_tests
+	@flake8 --exclude hooks/charmhelpers unit_tests tests
 	@charm proof
 
+unit_test:
+	@echo Starting unit tests...
+	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
+
 test:
-	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
+	@echo Starting Amulet tests...
+	# coreycb note: The -v should only be temporary until Amulet sends
+	# raise_status() messages to stderr:
+	#   https://bugs.launchpad.net/amulet/+bug/1320357
+	@juju test -v -p AMULET_HTTP_PROXY
 
 sync:
-	@charm-helper-sync -c charm-helpers-sync.yaml
+	@charm-helper-sync -c charm-helpers-hooks.yaml
+	@charm-helper-sync -c charm-helpers-tests.yaml
 
 publish: lint test
 	bzr push lp:charms/quantum-gateway

=== added file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	1970-01-01 00:00:00 +0000
+++ charm-helpers-hooks.yaml	2014-07-17 15:16:47 +0000
@@ -0,0 +1,10 @@
+branch: lp:charm-helpers
+destination: hooks/charmhelpers
+include:
+    - core
+    - fetch
+    - contrib.openstack
+    - contrib.hahelpers
+    - contrib.network.ovs
+    - contrib.storage.linux
+    - payload.execd

=== removed file 'charm-helpers-sync.yaml'
--- charm-helpers-sync.yaml	2014-03-27 11:20:28 +0000
+++ charm-helpers-sync.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-branch: lp:charm-helpers
-destination: hooks/charmhelpers
-include:
-    - core
-    - fetch
-    - contrib.openstack
-    - contrib.hahelpers
-    - contrib.network.ovs
-    - contrib.storage.linux
-    - payload.execd

=== added file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	1970-01-01 00:00:00 +0000
+++ charm-helpers-tests.yaml	2014-07-17 15:16:47 +0000
@@ -0,0 +1,5 @@
+branch: lp:charm-helpers
+destination: tests/charmhelpers
+include:
+    - contrib.amulet
+    - contrib.openstack.amulet

=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2014-03-27 11:20:28 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2014-07-17 15:16:47 +0000
@@ -170,6 +170,7 @@
 
     :configs    : OSTemplateRenderer: A config tempating object to inspect for
                                       a complete https context.
+
     :vip_setting:                str: Setting in charm config that specifies
                                       VIP address.
     '''

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-06-24 13:40:39 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-07-17 15:16:47 +0000
@@ -7,19 +7,38 @@
     """This class inherits from AmuletDeployment and has additional support
        that is specifically for use by OpenStack charms."""
 
-    def __init__(self, series=None, openstack=None):
+    def __init__(self, series, openstack=None, source=None):
         """Initialize the deployment environment."""
-        self.openstack = None
         super(OpenStackAmuletDeployment, self).__init__(series)
-
-        if openstack:
-            self.openstack = openstack
+        self.openstack = openstack
+        self.source = source
+
+    def _add_services(self, this_service, other_services):
+        """Add services to the deployment and set openstack-origin."""
+        super(OpenStackAmuletDeployment, self)._add_services(this_service,
+                                                             other_services)
+        name = 0
+        services = other_services
+        services.append(this_service)
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+
+        if self.openstack:
+            for svc in services:
+                charm_name = self._get_charm_name(svc[name])
+                if charm_name not in use_source:
+                    config = {'openstack-origin': self.openstack}
+                    self.d.configure(svc[name], config)
+
+        if self.source:
+            for svc in services:
+                charm_name = self._get_charm_name(svc[name])
+                if charm_name in use_source:
+                    config = {'source': self.source}
+                    self.d.configure(svc[name], config)
 
     def _configure_services(self, configs):
         """Configure all of the services."""
         for service, config in configs.iteritems():
-            if service == self.this_service:
-                config['openstack-origin'] = self.openstack
             self.d.configure(service, config)
 
     def _get_openstack_release(self):

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2014-06-24 13:40:39 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2014-07-17 15:16:47 +0000
@@ -1,4 +1,7 @@
 import logging
+import os
+import time
+import urllib
 
 import glanceclient.v1.client as glance_client
 import keystoneclient.v2_0 as keystone_client
@@ -71,7 +74,7 @@
                     if ret:
                         return "unexpected tenant data - {}".format(ret)
             if not found:
-                return "tenant {} does not exist".format(e.name)
+                return "tenant {} does not exist".format(e['name'])
         return ret
 
     def validate_role_data(self, expected, actual):
@@ -88,7 +91,7 @@
                     if ret:
                         return "unexpected role data - {}".format(ret)
             if not found:
-                return "role {} does not exist".format(e.name)
+                return "role {} does not exist".format(e['name'])
         return ret
 
     def validate_user_data(self, expected, actual):
@@ -107,7 +110,7 @@
                     if ret:
                         return "unexpected user data - {}".format(ret)
             if not found:
-                return "user {} does not exist".format(e.name)
+                return "user {} does not exist".format(e['name'])
         return ret
 
     def validate_flavor_data(self, expected, actual):
@@ -149,3 +152,102 @@
                                               endpoint_type='publicURL')
         return nova_client.Client(username=user, api_key=password,
                                   project_id=tenant, auth_url=ep)
+
+    def create_cirros_image(self, glance, image_name):
+        """Download the latest cirros image and upload it to glance."""
+        http_proxy = os.getenv('AMULET_HTTP_PROXY')
+        self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
+        if http_proxy:
+            proxies = {'http': http_proxy}
+            opener = urllib.FancyURLopener(proxies)
+        else:
+            opener = urllib.FancyURLopener()
+
+        f = opener.open("http://download.cirros-cloud.net/version/released")
+        version = f.read().strip()
+        cirros_img = "tests/cirros-{}-x86_64-disk.img".format(version)
+
+        if not os.path.exists(cirros_img):
+            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
+                                                  version, cirros_img)
+            opener.retrieve(cirros_url, cirros_img)
+        f.close()
+
+        with open(cirros_img) as f:
+            image = glance.images.create(name=image_name, is_public=True,
+                                         disk_format='qcow2',
+                                         container_format='bare', data=f)
+        count = 1
+        status = image.status
+        while status != 'active' and count < 10:
+            time.sleep(3)
+            image = glance.images.get(image.id)
+            status = image.status
+            self.log.debug('image status: {}'.format(status))
+            count += 1
+
+        if status != 'active':
+            self.log.error('image creation timed out')
+            return None
+
+        return image
+
+    def delete_image(self, glance, image):
+        """Delete the specified image."""
+        num_before = len(list(glance.images.list()))
+        glance.images.delete(image)
+
+        count = 1
+        num_after = len(list(glance.images.list()))
+        while num_after != (num_before - 1) and count < 10:
+            time.sleep(3)
+            num_after = len(list(glance.images.list()))
+            self.log.debug('number of images: {}'.format(num_after))
+            count += 1
+
+        if num_after != (num_before - 1):
+            self.log.error('image deletion timed out')
+            return False
+
+        return True
+
+    def create_instance(self, nova, image_name, instance_name, flavor):
+        """Create the specified instance."""
+        image = nova.images.find(name=image_name)
+        flavor = nova.flavors.find(name=flavor)
+        instance = nova.servers.create(name=instance_name, image=image,
+                                       flavor=flavor)
+
+        count = 1
+        status = instance.status
+        while status != 'ACTIVE' and count < 60:
+            time.sleep(3)
+            instance = nova.servers.get(instance.id)
+            status = instance.status
+            self.log.debug('instance status: {}'.format(status))
+            count += 1
+
+        if status != 'ACTIVE':
+            self.log.error('instance creation timed out')
+            return None
+
+        return instance
+
+    def delete_instance(self, nova, instance):
+        """Delete the specified instance."""
+        num_before = len(list(nova.servers.list()))
+        nova.servers.delete(instance)
+
+        count = 1
+        num_after = len(list(nova.servers.list()))
+        while num_after != (num_before - 1) and count < 10:
+            time.sleep(3)
+            num_after = len(list(nova.servers.list()))
+            self.log.debug('number of instances: {}'.format(num_after))
+            count += 1
+
+        if num_after != (num_before - 1):
+            self.log.error('instance deletion timed out')
+            return False
+
+        return True

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-06-24 13:40:39 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-07-17 15:16:47 +0000
@@ -426,12 +426,13 @@
     """
     Generates a context for an apache vhost configuration that configures
     HTTPS reverse proxying for one or many endpoints.  Generated context
-    looks something like:
-    {
-        'namespace': 'cinder',
-        'private_address': 'iscsi.mycinderhost.com',
-        'endpoints': [(8776, 8766), (8777, 8767)]
-    }
+    looks something like::
+
+        {
+            'namespace': 'cinder',
+            'private_address': 'iscsi.mycinderhost.com',
+            'endpoints': [(8776, 8766), (8777, 8767)]
+        }
 
     The endpoints list consists of a tuples mapping external ports
     to internal ports.
@@ -641,7 +642,7 @@
     The subordinate interface allows subordinates to export their
     configuration requirements to the principle for multiple config
     files and multiple serivces.  Ie, a subordinate that has interfaces
-    to both glance and nova may export to following yaml blob as json:
+    to both glance and nova may export to following yaml blob as json::
 
         glance:
             /etc/glance/glance-api.conf:
@@ -660,7 +661,8 @@
 
     It is then up to the principle charms to subscribe this context to
     the service+config file it is interestd in.  Configuration data will
-    be available in the template context, in glance's case, as:
+    be available in the template context, in glance's case, as::
+
         ctxt = {
             ... other context ...
             'subordinate_config': {

=== modified file 'hooks/charmhelpers/contrib/openstack/templating.py'
--- hooks/charmhelpers/contrib/openstack/templating.py	2013-09-25 15:27:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templating.py	2014-07-17 15:16:47 +0000
@@ -30,17 +30,17 @@
     loading dir.
 
     A charm may also ship a templates dir with this module
-    and it will be appended to the bottom of the search list, eg:
-    hooks/charmhelpers/contrib/openstack/templates.
-
-    :param templates_dir: str: Base template directory containing release
-                               sub-directories.
-    :param os_release   : str: OpenStack release codename to construct template
-                               loader.
-
-    :returns            : jinja2.ChoiceLoader constructed with a list of
-                          jinja2.FilesystemLoaders, ordered in descending
-                          order by OpenStack release.
+    and it will be appended to the bottom of the search list, eg::
+
+        hooks/charmhelpers/contrib/openstack/templates
+
+    :param templates_dir (str): Base template directory containing release
+        sub-directories.
+    :param os_release (str): OpenStack release codename to construct template
+        loader.
+    :returns: jinja2.ChoiceLoader constructed with a list of
+        jinja2.FilesystemLoaders, ordered in descending
+        order by OpenStack release.
     """
     tmpl_dirs = [(rel, os.path.join(templates_dir, rel))
                  for rel in OPENSTACK_CODENAMES.itervalues()]
@@ -111,7 +111,8 @@
     and ease the burden of managing config templates across multiple OpenStack
     releases.
 
-    Basic usage:
+    Basic usage::
+
         # import some common context generates from charmhelpers
         from charmhelpers.contrib.openstack import context
 
@@ -131,21 +132,19 @@
         # write out all registered configs
         configs.write_all()
 
-    Details:
+    **OpenStack Releases and template loading**
 
-    OpenStack Releases and template loading
-    ---------------------------------------
     When the object is instantiated, it is associated with a specific OS
     release.  This dictates how the template loader will be constructed.
 
     The constructed loader attempts to load the template from several places
     in the following order:
-        - from the most recent OS release-specific template dir (if one exists)
-        - the base templates_dir
-        - a template directory shipped in the charm with this helper file.
-
-
-    For the example above, '/tmp/templates' contains the following structure:
+    - from the most recent OS release-specific template dir (if one exists)
+    - the base templates_dir
+    - a template directory shipped in the charm with this helper file.
+
+    For the example above, '/tmp/templates' contains the following structure::
+
         /tmp/templates/nova.conf
         /tmp/templates/api-paste.ini
         /tmp/templates/grizzly/api-paste.ini
@@ -169,8 +168,8 @@
     $CHARM/hooks/charmhelpers/contrib/openstack/templates.  This allows
     us to ship common templates (haproxy, apache) with the helpers.
 
-    Context generators
-    ---------------------------------------
+    **Context generators**
+
     Context generators are used to generate template contexts during hook
     execution.  Doing so may require inspecting service relations, charm
     config, etc.  When registered, a config file is associated with a list

=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-03-27 11:20:28 +0000
+++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-07-17 15:16:47 +0000
@@ -303,7 +303,7 @@
                         blk_device, fstype, system_services=[]):
     """
     NOTE: This function must only be called from a single service unit for
-          the same rbd_img otherwise data loss will occur.
+    the same rbd_img otherwise data loss will occur.
 
     Ensures given pool and RBD image exists, is mapped to a block device,
     and the device is formatted and mounted at the given mount_point.

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2014-05-19 11:43:55 +0000
+++ hooks/charmhelpers/core/hookenv.py	2014-07-17 15:16:47 +0000
@@ -25,7 +25,7 @@
 def cached(func):
     """Cache return values for multiple executions of func + args
 
-    For example:
+    For example::
 
         @cached
         def unit_get(attribute):
@@ -445,18 +445,19 @@
 class Hooks(object):
     """A convenient handler for hook functions.
 
-    Example:
+    Example::
+
         hooks = Hooks()
 
         # register a hook, taking its name from the function name
         @hooks.hook()
         def install():
-            ...
+            pass  # your code here
 
         # register a hook, providing a custom hook name
         @hooks.hook("config-changed")
         def config_changed():
-            ...
+            pass  # your code here
 
         if __name__ == "__main__":
             # execute a hook based on the name the program is called by

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2014-06-24 13:40:39 +0000
+++ hooks/charmhelpers/core/host.py	2014-07-17 15:16:47 +0000
@@ -211,13 +211,13 @@
 def restart_on_change(restart_map, stopstart=False):
     """Restart services based on configuration files changing
 
-    This function is used a decorator, for example
+    This function is used a decorator, for example::
 
         @restart_on_change({
             '/etc/ceph/ceph.conf': [ 'cinder-api', 'cinder-volume' ]
             })
         def ceph_client_changed():
-            ...
+            pass  # your code here
 
     In this example, the cinder-api and cinder-volume services
     would be restarted if /etc/ceph/ceph.conf is changed by the
@@ -313,9 +313,11 @@
 
 def cmp_pkgrevno(package, revno, pkgcache=None):
     '''Compare supplied revno with the revno of the installed package
-       1 => Installed revno is greater than supplied arg
-       0 => Installed revno is the same as supplied arg
-      -1 => Installed revno is less than supplied arg
+
+    *  1 => Installed revno is greater than supplied arg
+    *  0 => Installed revno is the same as supplied arg
+    * -1 => Installed revno is less than supplied arg
+
     '''
     import apt_pkg
     if not pkgcache:

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2014-06-24 13:40:39 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2014-07-17 15:16:47 +0000
@@ -235,31 +235,39 @@
                       sources_var='install_sources',
                       keys_var='install_keys'):
     """
-    Configure multiple sources from charm configuration
+    Configure multiple sources from charm configuration.
+
+    The lists are encoded as yaml fragments in the configuration.
+    The frament needs to be included as a string.
 
     Example config:
-        install_sources:
+        install_sources: |
           - "ppa:foo"
           - "http://example.com/repo precise main"
-        install_keys:
+        install_keys: |
           - null
           - "a1b2c3d4"
 
     Note that 'null' (a.k.a. None) should not be quoted.
     """
-    sources = safe_load(config(sources_var))
-    keys = config(keys_var)
-    if keys is not None:
-        keys = safe_load(keys)
-    if isinstance(sources, basestring) and (
-            keys is None or isinstance(keys, basestring)):
-        add_source(sources, keys)
+    sources = safe_load((config(sources_var) or '').strip()) or []
+    keys = safe_load((config(keys_var) or '').strip()) or None
+
+    if isinstance(sources, basestring):
+        sources = [sources]
+
+    if keys is None:
+        for source in sources:
+            add_source(source, None)
     else:
-        if not len(sources) == len(keys):
-            msg = 'Install sources and keys lists are different lengths'
-            raise SourceConfigError(msg)
-        for src_num in range(len(sources)):
-            add_source(sources[src_num], keys[src_num])
+        if isinstance(keys, basestring):
+            keys = [keys]
+
+        if len(sources) != len(keys):
+            raise SourceConfigError(
+                'Install sources and keys lists are different lengths')
+        for source, key in zip(sources, keys):
+            add_source(source, key)
     if update:
         apt_update(fatal=True)
 

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-07-17 15:16:47 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+sudo add-apt-repository --yes ppa:juju/stable
+sudo apt-get update --yes
+sudo apt-get install --yes python-amulet
+sudo apt-get install --yes python-neutronclient
+sudo apt-get install --yes python-keystoneclient
+sudo apt-get install --yes python-novaclient

=== added file 'tests/12-basic-precise-grizzly'
--- tests/12-basic-precise-grizzly	1970-01-01 00:00:00 +0000
+++ tests/12-basic-precise-grizzly	2014-07-17 15:16:47 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on precise-grizzly."""
+
+from basic_deployment import QuantumGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = QuantumGatewayBasicDeployment(series='precise',
+                                         openstack='cloud:precise-grizzly',
+                                         source='cloud:precise-updates/grizzly')
+    deployment.run_tests()

=== added file 'tests/13-basic-precise-havana'
--- tests/13-basic-precise-havana	1970-01-01 00:00:00 +0000
+++ tests/13-basic-precise-havana	2014-07-17 15:16:47 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on precise-havana."""
+
+from basic_deployment import QuantumGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = QuantumGatewayBasicDeployment(series='precise',
+                                          openstack='cloud:precise-havana',
+                                          source='cloud:precise-updates/havana')
+    deployment.run_tests()

=== added file 'tests/14-basic-precise-icehouse'
--- tests/14-basic-precise-icehouse	1970-01-01 00:00:00 +0000
+++ tests/14-basic-precise-icehouse	2014-07-17 15:16:47 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on precise-icehouse."""
+
+from basic_deployment import QuantumGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = QuantumGatewayBasicDeployment(series='precise',
+                                        openstack='cloud:precise-icehouse',
+                                        source='cloud:precise-updates/icehouse')
+    deployment.run_tests()

=== added file 'tests/15-basic-trusty-icehouse'
--- tests/15-basic-trusty-icehouse	1970-01-01 00:00:00 +0000
+++ tests/15-basic-trusty-icehouse	2014-07-17 15:16:47 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on trusty-icehouse."""
+
+from basic_deployment import QuantumGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = QuantumGatewayBasicDeployment(series='trusty')
+    deployment.run_tests()

=== added file 'tests/README'
--- tests/README	1970-01-01 00:00:00 +0000
+++ tests/README	2014-07-17 15:16:47 +0000
@@ -0,0 +1,47 @@
+This directory provides Amulet tests that focus on verification of
+quantum-gateway deployments.
+
+If you use a web proxy server to access the web, you'll need to set the
+AMULET_HTTP_PROXY environment variable to the http URL of the proxy server.
+
+The following examples demonstrate different ways that tests can be executed.
+All examples are run from the charm's root directory.
+
+  * To run all tests (starting with 00-setup):
+
+      make test
+
+  * To run a specific test module (or modules):
+
+      juju test -v -p AMULET_HTTP_PROXY 15-basic-trusty-icehouse
+
+  * To run a specific test module (or modules), and keep the environment
+    deployed after a failure:
+
+      juju test --set-e -v -p AMULET_HTTP_PROXY 15-basic-trusty-icehouse
+
+  * To re-run a test module against an already deployed environment (one
+    that was deployed by a previous call to 'juju test --set-e'):
+
+      ./tests/15-basic-trusty-icehouse
+
+For debugging and test development purposes, all code should be idempotent.
+In other words, the code should have the ability to be re-run without changing
+the results beyond the initial run.  This enables editing and re-running of a
+test module against an already deployed environment, as described above.
+
+Manual debugging tips:
+
+  * Set the following env vars before using the OpenStack CLI as admin:
+      export OS_AUTH_URL=http://`juju-deployer -f keystone 2>&1 | tail -n 1`:5000/v2.0
+      export OS_TENANT_NAME=admin
+      export OS_USERNAME=admin
+      export OS_PASSWORD=openstack
+      export OS_REGION_NAME=RegionOne
+
+  * Set the following env vars before using the OpenStack CLI as demoUser:
+      export OS_AUTH_URL=http://`juju-deployer -f keystone 2>&1 | tail -n 1`:5000/v2.0
+      export OS_TENANT_NAME=demoTenant
+      export OS_USERNAME=demoUser
+      export OS_PASSWORD=password
+      export OS_REGION_NAME=RegionOne

=== added file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	1970-01-01 00:00:00 +0000
+++ tests/basic_deployment.py	2014-07-17 15:16:47 +0000
@@ -0,0 +1,834 @@
+#!/usr/bin/python
+
+import amulet
+try:
+    from quantumclient.v2_0 import client as neutronclient
+except ImportError:
+    from neutronclient.v2_0 import client as neutronclient
+
+from charmhelpers.contrib.openstack.amulet.deployment import (
+    OpenStackAmuletDeployment
+)
+
+from charmhelpers.contrib.openstack.amulet.utils import (
+    OpenStackAmuletUtils,
+    DEBUG, # flake8: noqa
+    ERROR
+)
+
+# Use DEBUG to turn on debug logging
+u = OpenStackAmuletUtils(ERROR)
+
+
+class QuantumGatewayBasicDeployment(OpenStackAmuletDeployment):
+    """Amulet tests on a basic quantum-gateway deployment."""
+
+    def __init__(self, series, openstack=None, source=None):
+        """Deploy the entire test environment."""
+        super(QuantumGatewayBasicDeployment, self).__init__(series, openstack,
+                                                            source)
+        self._add_services()
+        self._add_relations()
+        self._configure_services()
+        self._deploy()
+        self._initialize_tests()
+
+    def _add_services(self):
+        """Add the service that we're testing, including the number of units,
+           where quantum-gateway is local, and the other charms are from
+           the charm store."""
+        this_service = ('quantum-gateway', 1)
+        other_services = [('mysql', 1),
+                          ('rabbitmq-server', 1), ('keystone', 1),
+                          ('nova-cloud-controller', 1)]
+        super(QuantumGatewayBasicDeployment, self)._add_services(this_service,
+                                                                 other_services)
+
+    def _add_relations(self):
+        """Add all of the relations for the services."""
+        relations = {
+          'keystone:shared-db': 'mysql:shared-db',
+          'quantum-gateway:shared-db': 'mysql:shared-db',
+          'quantum-gateway:amqp': 'rabbitmq-server:amqp',
+          'nova-cloud-controller:quantum-network-service': \
+                                      'quantum-gateway:quantum-network-service',
+          'nova-cloud-controller:shared-db': 'mysql:shared-db',
+          'nova-cloud-controller:identity-service': 'keystone:identity-service',
+          'nova-cloud-controller:amqp': 'rabbitmq-server:amqp'
+        }
+        super(QuantumGatewayBasicDeployment, self)._add_relations(relations)
+
+    def _configure_services(self):
+        """Configure all of the services."""
+        keystone_config = {'admin-password': 'openstack',
+                           'admin-token': 'ubuntutesting'}
+        nova_cc_config = {'network-manager': 'Quantum',
+                          'quantum-security-groups': 'yes'}
+        configs = {'keystone': keystone_config,
+                   'nova-cloud-controller': nova_cc_config}
+        super(QuantumGatewayBasicDeployment, self)._configure_services(configs)
+
+    def _initialize_tests(self):
+        """Perform final initialization before tests get run."""
+        # Access the sentries for inspecting service units
+        self.mysql_sentry = self.d.sentry.unit['mysql/0']
+        self.keystone_sentry = self.d.sentry.unit['keystone/0']
+        self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0']
+        self.nova_cc_sentry = self.d.sentry.unit['nova-cloud-controller/0']
+        self.quantum_gateway_sentry = self.d.sentry.unit['quantum-gateway/0']
+
+        # Authenticate admin with keystone
+        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
+                                                      user='admin',
+                                                      password='openstack',
+                                                      tenant='admin')
+
+
+        # Authenticate admin with neutron
+        ep = self.keystone.service_catalog.url_for(service_type='identity',
+                                                   endpoint_type='publicURL')
+        self.neutron = neutronclient.Client(auth_url=ep,
+                                            username='admin',
+                                            password='openstack',
+                                            tenant_name='admin',
+                                            region_name='RegionOne')
+
+    def test_services(self):
+        """Verify the expected services are running on the corresponding
+           service units."""
+        if self._get_openstack_release() >= self.precise_havana:
+            neutron_services = ['status neutron-dhcp-agent',
+                                'status neutron-lbaas-agent',
+                                'status neutron-metadata-agent',
+                                'status neutron-plugin-openvswitch-agent']
+            if self._get_openstack_release() == self.precise_havana:
+                neutron_services.append('status neutron-l3-agent')
+            else:
+                neutron_services.append('status neutron-vpn-agent')
+                neutron_services.append('status neutron-metering-agent')
+                neutron_services.append('status neutron-ovs-cleanup')
+        else:
+            neutron_services = ['status quantum-dhcp-agent',
+                                'status quantum-l3-agent',
+                                'status quantum-metadata-agent',
+                                'status quantum-plugin-openvswitch-agent']
+
+        nova_cc_services = ['status nova-api-ec2',
+                            'status nova-api-os-compute',
+                            'status nova-objectstore',
+                            'status nova-cert',
+                            'status nova-scheduler']
+        if self._get_openstack_release() >= self.precise_grizzly:
+            nova_cc_services.append('status nova-conductor')
+
+        commands = {
+            self.mysql_sentry: ['status mysql'],
+            self.keystone_sentry: ['status keystone'],
+            self.nova_cc_sentry: nova_cc_services,
+            self.quantum_gateway_sentry: neutron_services
+        }
+
+        ret = u.validate_services(commands)
+        if ret:
+            amulet.raise_status(amulet.FAIL, msg=ret)
+
+    def test_quantum_gateway_shared_db_relation(self):
+        """Verify the quantum-gateway to mysql shared-db relation data"""
+        unit = self.quantum_gateway_sentry
+        relation = ['shared-db', 'mysql:shared-db']
+        expected = {
+            'private-address': u.valid_ip,
+            'database': 'nova',
+            'username': 'nova',
+            'hostname': u.valid_ip
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('quantum-gateway shared-db', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_mysql_shared_db_relation(self):
+        """Verify the mysql to quantum-gateway shared-db relation data"""
+        unit = self.mysql_sentry
+        relation = ['shared-db', 'quantum-gateway:shared-db']
+        expected = {
+            'private-address': u.valid_ip,
+            'password': u.not_null,
+            'db_host': u.valid_ip
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('mysql shared-db', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_quantum_gateway_amqp_relation(self):
+        """Verify the quantum-gateway to rabbitmq-server amqp relation data"""
+        unit = self.quantum_gateway_sentry
+        relation = ['amqp', 'rabbitmq-server:amqp']
+        expected = {
+            'username': 'neutron',
+            'private-address': u.valid_ip,
+            'vhost': 'openstack'
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('quantum-gateway amqp', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_rabbitmq_amqp_relation(self):
+        """Verify the rabbitmq-server to quantum-gateway amqp relation data"""
+        unit = self.rabbitmq_sentry
+        relation = ['amqp', 'quantum-gateway:amqp']
+        expected = {
+            'private-address': u.valid_ip,
+            'password': u.not_null,
+            'hostname': u.valid_ip
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('rabbitmq amqp', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_quantum_gateway_network_service_relation(self):
+        """Verify the quantum-gateway to nova-cc quantum-network-service
+           relation data"""
+        unit = self.quantum_gateway_sentry
+        relation = ['quantum-network-service',
+                    'nova-cloud-controller:quantum-network-service']
+        expected = {
+            'private-address': u.valid_ip
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('quantum-gateway network-service', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_nova_cc_network_service_relation(self):
+        """Verify the nova-cc to quantum-gateway quantum-network-service
+           relation data"""
+        unit = self.nova_cc_sentry
+        relation = ['quantum-network-service',
+                    'quantum-gateway:quantum-network-service']
+        expected = {
+            'service_protocol': 'http',
+            'service_tenant': 'services',
+            'quantum_url': u.valid_url,
+            'quantum_port': '9696',
+            'service_port': '5000',
+            'region': 'RegionOne',
+            'service_password': u.not_null,
+            'quantum_host': u.valid_ip,
+            'auth_port': '35357',
+            'auth_protocol': 'http',
+            'private-address': u.valid_ip,
+            'keystone_host': u.valid_ip,
+            'quantum_plugin': 'ovs',
+            'auth_host': u.valid_ip,
+            'service_username': 'quantum_s3_ec2_nova',
+            'service_tenant_name': 'services'
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('nova-cc network-service', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_restart_on_config_change(self):
+        """Verify that the specified services are restarted when the config
+           is changed."""
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/neutron.conf'
+            services = ['neutron-dhcp-agent', 'neutron-openvswitch-agent',
+                        'neutron-metering-agent', 'neutron-lbaas-agent',
+                        'neutron-metadata-agent']
+            if self._get_openstack_release() == self.precise_havana:
+                services.append('neutron-l3-agent')
+            else:
+                services.append('neutron-vpn-agent')
+        else:
+            conf = '/etc/quantum/quantum.conf'
+            services = ['quantum-dhcp-agent', 'quantum-openvswitch-agent',
+                        'quantum-metadata-agent', 'quantum-l3-agent']
+
+        self.d.configure('quantum-gateway', {'debug': 'True'})
+
+        time = 20
+        for s in services:
+            if not u.service_restarted(self.quantum_gateway_sentry, s, conf,
+                                       pgrep_full=True, sleep_time=time):
+                msg = "service {} didn't restart after config change".format(s)
+                amulet.raise_status(amulet.FAIL, msg=msg)
+            time = 0
+
+        self.d.configure('quantum-gateway', {'debug': 'False'})
+
+    def test_neutron_config(self):
+        """Verify the data in the neutron config file."""
+        unit = self.quantum_gateway_sentry
+        rabbitmq_relation = self.rabbitmq_sentry.relation('amqp',
+                                                         'quantum-gateway:amqp')
+
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/neutron.conf'
+            expected = {
+                'DEFAULT': {
+                    'verbose': 'False',
+                    'debug': 'False',
+                    'lock_path': '/var/lock/neutron',
+                    'rabbit_userid': 'neutron',
+                    'rabbit_virtual_host': 'openstack',
+                    'rabbit_password': rabbitmq_relation['password'],
+                    'rabbit_host': rabbitmq_relation['hostname'],
+                    'control_exchange': 'neutron',
+                    'notification_driver': 'neutron.openstack.common.notifier.'
+                                           'list_notifier',
+                    'list_notifier_drivers': 'neutron.openstack.common.'
+                                             'notifier.rabbit_notifier'
+                },
+                'agent': {
+                    'root_helper': 'sudo /usr/bin/neutron-rootwrap '
+                                   '/etc/neutron/rootwrap.conf'
+                }
+            }
+        else:
+            conf = '/etc/quantum/quantum.conf'
+            expected = {
+                'DEFAULT': {
+                    'verbose': 'False',
+                    'debug': 'False',
+                    'lock_path': '/var/lock/quantum',
+                    'rabbit_userid': 'neutron',
+                    'rabbit_virtual_host': 'openstack',
+                    'rabbit_password': rabbitmq_relation['password'],
+                    'rabbit_host': rabbitmq_relation['hostname'],
+                    'control_exchange': 'quantum',
+                    'notification_driver': 'quantum.openstack.common.notifier.'
+                                           'list_notifier',
+                    'list_notifier_drivers': 'quantum.openstack.common.'
+                                             'notifier.rabbit_notifier'
+                },
+                'AGENT': {
+                    'root_helper': 'sudo /usr/bin/quantum-rootwrap '
+                                   '/etc/quantum/rootwrap.conf'
+                }
+            }
+
+        if self._get_openstack_release() >= self.precise_icehouse:
+            expected['DEFAULT']['core_plugin'] = \
+                                          'neutron.plugins.ml2.plugin.Ml2Plugin'
+        elif self._get_openstack_release() >= self.precise_havana:
+            expected['DEFAULT']['core_plugin'] = \
+             'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2'
+        else:
+            expected['DEFAULT']['core_plugin'] = \
+             'quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2'
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "neutron config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_ml2_config(self):
+        """Verify the data in the ml2 config file. This is only available
+           since icehouse."""
+        if self._get_openstack_release() < self.precise_icehouse:
+            return
+
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/neutron/plugins/ml2/ml2_conf.ini'
+        quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
+        expected = {
+            'ml2': {
+                'type_drivers': 'gre,vxlan',
+                'tenant_network_types': 'gre,vxlan',
+                'mechanism_drivers': 'openvswitch'
+            },
+            'ml2_type_gre': {
+                'tunnel_id_ranges': '1:1000'
+            },
+            'ml2_type_vxlan': {
+                'vni_ranges': '1001:2000'
+            },
+            'ovs': {
+                'enable_tunneling': 'True',
+                'local_ip': quantum_gateway_relation['private-address']
+            },
+            'agent': {
+                'tunnel_types': 'gre'
+            },
+            'securitygroup': {
+                'firewall_driver': 'neutron.agent.linux.iptables_firewall.'
+                                   'OVSHybridIptablesFirewallDriver'
+            }
+        }
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "ml2 config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_api_paste_config(self):
+        """Verify the data in the api paste config file."""
+        unit = self.quantum_gateway_sentry
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/api-paste.ini'
+            expected = {
+                'composite:neutron': {
+                    'use': 'egg:Paste#urlmap',
+                    '/': 'neutronversions',
+                    '/v2.0': 'neutronapi_v2_0'
+                },
+                'filter:keystonecontext': {
+                    'paste.filter_factory': 'neutron.auth:'
+                                            'NeutronKeystoneContext.factory'
+                },
+                'filter:authtoken': {
+                    'paste.filter_factory': 'keystoneclient.middleware.'
+                                            'auth_token:filter_factory'
+                },
+                'filter:extensions': {
+                    'paste.filter_factory': 'neutron.api.extensions:'
+                                            'plugin_aware_extension_middleware_'
+                                            'factory'
+                },
+                'app:neutronversions': {
+                    'paste.app_factory': 'neutron.api.versions:Versions.factory'
+                },
+                'app:neutronapiapp_v2_0': {
+                    'paste.app_factory': 'neutron.api.v2.router:APIRouter.'
+                                         'factory'
+                }
+            }
+            if self._get_openstack_release() == self.precise_havana:
+                expected_additional = {
+                    'composite:neutronapi_v2_0': {
+                        'use': 'call:neutron.auth:pipeline_factory',
+                        'noauth': 'extensions neutronapiapp_v2_0',
+                        'keystone': 'authtoken keystonecontext extensions '
+                                    'neutronapiapp_v2_0'
+                    }
+                }
+            else:
+                expected_additional = {
+                    'composite:neutronapi_v2_0': {
+                        'use': 'call:neutron.auth:pipeline_factory',
+                        'noauth': 'request_id catch_errors extensions '
+                                  'neutronapiapp_v2_0',
+                        'keystone': 'request_id catch_errors authtoken '
+                                    'keystonecontext extensions '
+                                    'neutronapiapp_v2_0'
+                    }
+                }
+            expected = dict(expected.items() + expected_additional.items())
+        else:
+            conf = '/etc/quantum/api-paste.ini'
+            expected = {
+                'composite:quantum': {
+                    'use': 'egg:Paste#urlmap',
+                    '/': 'quantumversions',
+                    '/v2.0': 'quantumapi_v2_0'
+                },
+                'composite:quantumapi_v2_0': {
+                    'use': 'call:quantum.auth:pipeline_factory',
+                    'noauth': 'extensions quantumapiapp_v2_0',
+                    'keystone': 'authtoken keystonecontext extensions '
+                                'quantumapiapp_v2_0',
+                },
+                'filter:keystonecontext': {
+                    'paste.filter_factory': 'quantum.auth:'
+                                            'QuantumKeystoneContext.factory'
+                },
+                'filter:authtoken': {
+                    'paste.filter_factory': 'keystoneclient.middleware.'
+                                            'auth_token:filter_factory'
+                },
+                'filter:extensions': {
+                    'paste.filter_factory': 'quantum.api.extensions:'
+                                            'plugin_aware_extension_middleware_'
+                                            'factory'
+                },
+                'app:quantumversions': {
+                    'paste.app_factory': 'quantum.api.versions:Versions.factory'
+                },
+                'app:quantumapiapp_v2_0': {
+                    'paste.app_factory': 'quantum.api.v2.router:APIRouter.'
+                                         'factory'
+                }
+            }
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "api paste config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_dhcp_agent_config(self):
+        """Verify the data in the dhcp agent config file."""
+        unit = self.quantum_gateway_sentry
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/dhcp_agent.ini'
+            expected = {
+                'state_path': '/var/lib/neutron',
+                'interface_driver': 'neutron.agent.linux.interface.'
+                                    'OVSInterfaceDriver',
+                'dhcp_driver': 'neutron.agent.linux.dhcp.Dnsmasq',
+                'root_helper': 'sudo /usr/bin/neutron-rootwrap '
+                               '/etc/neutron/rootwrap.conf',
+                'ovs_use_veth': 'True'
+            }
+        else:
+            conf = '/etc/quantum/dhcp_agent.ini'
+            expected = {
+                'state_path': '/var/lib/quantum',
+                'interface_driver': 'quantum.agent.linux.interface.'
+                                    'OVSInterfaceDriver',
+                'dhcp_driver': 'quantum.agent.linux.dhcp.Dnsmasq',
+                'root_helper': 'sudo /usr/bin/quantum-rootwrap '
+                               '/etc/quantum/rootwrap.conf'
+            }
+
+        ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
+        if ret:
+            message = "dhcp agent config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_fwaas_driver_config(self):
+        """Verify the data in the fwaas driver config file.  This is only
+           available since havana."""
+        if self._get_openstack_release() < self.precise_havana:
+            return
+
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/neutron/fwaas_driver.ini'
+        expected = {
+            'driver': 'neutron.services.firewall.drivers.linux.'
+                      'iptables_fwaas.IptablesFwaasDriver',
+            'enabled': 'True'
+        }
+
+        ret = u.validate_config_data(unit, conf, 'fwaas', expected)
+        if ret:
+            message = "fwaas driver config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_l3_agent_config(self):
+        """Verify the data in the l3 agent config file."""
+        unit = self.quantum_gateway_sentry
+        nova_cc_relation = self.nova_cc_sentry.relation(\
+                                      'quantum-network-service',
+                                      'quantum-gateway:quantum-network-service')
+        ep = self.keystone.service_catalog.url_for(service_type='identity',
+                                                   endpoint_type='publicURL')
+
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/l3_agent.ini'
+            expected = {
+                'interface_driver': 'neutron.agent.linux.interface.'
+                                    'OVSInterfaceDriver',
+                'auth_url': ep,
+                'auth_region': 'RegionOne',
+                'admin_tenant_name': 'services',
+                'admin_user': 'quantum_s3_ec2_nova',
+                'admin_password': nova_cc_relation['service_password'],
+                'root_helper': 'sudo /usr/bin/neutron-rootwrap '
+                               '/etc/neutron/rootwrap.conf',
+                'ovs_use_veth': 'True',
+                'handle_internal_only_routers': 'True'
+            }
+        else:
+            conf = '/etc/quantum/l3_agent.ini'
+            expected = {
+                'interface_driver': 'quantum.agent.linux.interface.'
+                                    'OVSInterfaceDriver',
+                'auth_url': ep,
+                'auth_region': 'RegionOne',
+                'admin_tenant_name': 'services',
+                'admin_user': 'quantum_s3_ec2_nova',
+                'admin_password': nova_cc_relation['service_password'],
+                'root_helper': 'sudo /usr/bin/quantum-rootwrap '
+                               '/etc/quantum/rootwrap.conf'
+            }
+
+        ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
+        if ret:
+            message = "l3 agent config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_lbaas_agent_config(self):
+        """Verify the data in the lbaas agent config file. This is only
+           available since havana."""
+        if self._get_openstack_release() < self.precise_havana:
+            return
+
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/neutron/lbaas_agent.ini'
+        expected = {
+            'DEFAULT': {
+                'periodic_interval': '10',
+                'interface_driver': 'neutron.agent.linux.interface.'
+                                    'OVSInterfaceDriver',
+                'ovs_use_veth': 'False',
+                'device_driver': 'neutron.services.loadbalancer.drivers.'
+                                 'haproxy.namespace_driver.HaproxyNSDriver'
+            },
+            'haproxy': {
+                'loadbalancer_state_path': '$state_path/lbaas',
+                'user_group': 'nogroup'
+            }
+        }
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "lbaas agent config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_metadata_agent_config(self):
+        """Verify the data in the metadata agent config file."""
+        unit = self.quantum_gateway_sentry
+        ep = self.keystone.service_catalog.url_for(service_type='identity',
+                                                   endpoint_type='publicURL')
+        quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
+        nova_cc_relation = self.nova_cc_sentry.relation(\
+                                      'quantum-network-service',
+                                      'quantum-gateway:quantum-network-service')
+
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/metadata_agent.ini'
+            expected = {
+                'auth_url': ep,
+                'auth_region': 'RegionOne',
+                'admin_tenant_name': 'services',
+                'admin_user': 'quantum_s3_ec2_nova',
+                'admin_password': nova_cc_relation['service_password'],
+                'root_helper': 'sudo neutron-rootwrap '
+                                 '/etc/neutron/rootwrap.conf',
+                'state_path': '/var/lib/neutron',
+                'nova_metadata_ip': quantum_gateway_relation['private-address'],
+                'nova_metadata_port': '8775'
+            }
+        else:
+            conf = '/etc/quantum/metadata_agent.ini'
+            expected = {
+                'auth_url': ep,
+                'auth_region': 'RegionOne',
+                'admin_tenant_name': 'services',
+                'admin_user': 'quantum_s3_ec2_nova',
+                'admin_password': nova_cc_relation['service_password'],
+                'root_helper': 'sudo quantum-rootwrap '
+                               '/etc/quantum/rootwrap.conf',
+                'state_path': '/var/lib/quantum',
+                'nova_metadata_ip': quantum_gateway_relation['private-address'],
+                'nova_metadata_port': '8775'
+            }
+
+        ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
+        if ret:
+            message = "metadata agent config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_metering_agent_config(self):
+        """Verify the data in the metering agent config file.  This is only
+           available since havana."""
+        if self._get_openstack_release() < self.precise_havana:
+            return
+
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/neutron/metering_agent.ini'
+        expected = {
+            'driver': 'neutron.services.metering.drivers.iptables.'
+                      'iptables_driver.IptablesMeteringDriver',
+            'measure_interval': '30',
+            'report_interval': '300',
+            'interface_driver': 'neutron.agent.linux.interface.'
+                                'OVSInterfaceDriver',
+            'use_namespaces': 'True'
+        }
+
+        ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
+        if ret:
+            message = "metering agent config error: {}".format(ret)
+
+    def test_nova_config(self):
+        """Verify the data in the nova config file."""
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/nova/nova.conf'
+        mysql_relation = self.mysql_sentry.relation('shared-db',
+                                                    'quantum-gateway:shared-db')
+        db_uri = "mysql://{}:{}@{}/{}".format('nova',
+                                              mysql_relation['password'],
+                                              mysql_relation['db_host'],
+                                              'nova')
+        rabbitmq_relation = self.rabbitmq_sentry.relation('amqp',
+                                                         'quantum-gateway:amqp')
+        nova_cc_relation = self.nova_cc_sentry.relation(\
+                                      'quantum-network-service',
+                                      'quantum-gateway:quantum-network-service')
+        ep = self.keystone.service_catalog.url_for(service_type='identity',
+                                                   endpoint_type='publicURL')
+
+        if self._get_openstack_release() >= self.precise_havana:
+            expected = {
+                'logdir': '/var/log/nova',
+                'state_path': '/var/lib/nova',
+                'lock_path': '/var/lock/nova',
+                'root_helper': 'sudo nova-rootwrap /etc/nova/rootwrap.conf',
+                'verbose': 'False',
+                'use_syslog': 'False',
+                'api_paste_config': '/etc/nova/api-paste.ini',
+                'enabled_apis': 'metadata',
+                'multi_host': 'True',
+                'sql_connection': db_uri,
+                'service_neutron_metadata_proxy': 'True',
+                'rabbit_userid': 'neutron',
+                'rabbit_virtual_host': 'openstack',
+                'rabbit_password': rabbitmq_relation['password'],
+                'rabbit_host': rabbitmq_relation['hostname'],
+                'network_api_class': 'nova.network.neutronv2.api.API',
+                'neutron_auth_strategy': 'keystone',
+                'neutron_url': nova_cc_relation['quantum_url'],
+                'neutron_admin_tenant_name': 'services',
+                'neutron_admin_username': 'quantum_s3_ec2_nova',
+                'neutron_admin_password': nova_cc_relation['service_password'],
+                'neutron_admin_auth_url': ep
+
+            }
+        else:
+            expected = {
+                'logdir': '/var/log/nova',
+                'state_path': '/var/lib/nova',
+                'lock_path': '/var/lock/nova',
+                'root_helper': 'sudo nova-rootwrap /etc/nova/rootwrap.conf',
+                'verbose': 'True',
+                'api_paste_config': '/etc/nova/api-paste.ini',
+                'enabled_apis': 'metadata',
+                'multi_host': 'True',
+                'sql_connection':  db_uri,
+                'service_quantum_metadata_proxy': 'True',
+                'rabbit_userid': 'neutron',
+                'rabbit_virtual_host': 'openstack',
+                'rabbit_password': rabbitmq_relation['password'],
+                'rabbit_host': rabbitmq_relation['hostname'],
+                'network_api_class': 'nova.network.quantumv2.api.API',
+                'quantum_auth_strategy': 'keystone',
+                'quantum_url': nova_cc_relation['quantum_url'],
+                'quantum_admin_tenant_name': 'services',
+                'quantum_admin_username': 'quantum_s3_ec2_nova',
+                'quantum_admin_password': nova_cc_relation['service_password'],
+                'quantum_admin_auth_url': ep
+            }
+
+        ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
+        if ret:
+            message = "nova config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_ovs_neutron_plugin_config(self):
+        """Verify the data in the ovs neutron plugin config file. The ovs
+           plugin is not used by default since icehouse."""
+        if self._get_openstack_release() >= self.precise_icehouse:
+            return
+
+        unit = self.quantum_gateway_sentry
+        quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
+
+        if self._get_openstack_release() >= self.precise_havana:
+            conf = '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini'
+            expected = {
+                'ovs': {
+                    'local_ip': quantum_gateway_relation['private-address'],
+                    'tenant_network_type': 'gre',
+                    'enable_tunneling': 'True',
+                    'tunnel_id_ranges': '1:1000'
+                }
+            }
+            if self._get_openstack_release() > self.precise_havana:
+                expected_additional = {
+                    'agent': {
+                        'polling_interval': '10',
+                        'root_helper': 'sudo /usr/bin/neutron-rootwrap '
+                        '/etc/neutron/rootwrap.conf'
+                    }
+                }
+                expected = dict(expected.items() + expected_additional.items())
+        else:
+            conf = '/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini'
+            expected = {
+                'OVS': {
+                    'local_ip': quantum_gateway_relation['private-address'],
+                    'tenant_network_type': 'gre',
+                    'enable_tunneling': 'True',
+                    'tunnel_id_ranges': '1:1000'
+                    },
+                'AGENT': {
+                    'polling_interval': '10',
+                    'root_helper': 'sudo /usr/bin/quantum-rootwrap '
+                                   '/etc/quantum/rootwrap.conf'
+                    }
+            }
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "ovs neutron plugin config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_vpn_agent_config(self):
+        """Verify the data in the vpn agent config file.  This isn't available
+           prior to havana."""
+        if self._get_openstack_release() < self.precise_havana:
+            return
+
+        unit = self.quantum_gateway_sentry
+        conf = '/etc/neutron/vpn_agent.ini'
+        expected = {
+            'vpnagent': {
+                'vpn_device_driver': 'neutron.services.vpn.device_drivers.'
+                                     'ipsec.OpenSwanDriver'
+            },
+            'ipsec': {
+                'ipsec_status_check_interval': '60'
+            }
+        }
+
+        for section, pairs in expected.iteritems():
+            ret = u.validate_config_data(unit, conf, section, pairs)
+            if ret:
+                message = "vpn agent config error: {}".format(ret)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_create_network(self):
+        """Create a network, verify that it exists, and then delete it."""
+        self.neutron.format = 'json'
+        net_name = 'ext_net'
+
+        #Verify that the network doesn't exist
+        networks = self.neutron.list_networks(name=net_name)
+        net_count = len(networks['networks'])
+        if net_count != 0:
+            msg = "Expected zero networks, found {}".format(net_count)
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Create a network and verify that it exists
+        network = {'name': net_name}
+        self.neutron.create_network({'network':network})
+
+        networks = self.neutron.list_networks(name=net_name)
+        net_len = len(networks['networks'])
+        if net_len != 1:
+            msg = "Expected 1 network, found {}".format(net_len)
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        network = networks['networks'][0]
+        if network['name'] != net_name:
+            amulet.raise_status(amulet.FAIL, msg="network ext_net not found")
+
+        #Cleanup
+        self.neutron.delete_network(network['id'])

=== added directory 'tests/charmhelpers'
=== added file 'tests/charmhelpers/__init__.py'
=== added directory 'tests/charmhelpers/contrib'
=== added file 'tests/charmhelpers/contrib/__init__.py'
=== added directory 'tests/charmhelpers/contrib/amulet'
=== added file 'tests/charmhelpers/contrib/amulet/__init__.py'
=== added file 'tests/charmhelpers/contrib/amulet/deployment.py'
--- tests/charmhelpers/contrib/amulet/deployment.py	1970-01-01 00:00:00 +0000
+++ tests/charmhelpers/contrib/amulet/deployment.py	2014-07-17 15:16:47 +0000
@@ -0,0 +1,63 @@
+import amulet
+import re
+
+
+class AmuletDeployment(object):
+    """This class provides generic Amulet deployment and test runner
+       methods."""
+
+    def __init__(self, series):
+        """Initialize the deployment environment."""
+        self.series = series
+        self.d = amulet.Deployment(series=self.series)
+
+    def _get_charm_name(self, service_name):
+        """Gets the charm name from the service name. Unique service names can
+           be specified with a '-service#' suffix (e.g. mysql-service1)."""
+        if re.match(r"^.*-service\d{1,3}$", service_name):
+            charm_name = re.sub('\-service\d{1,3}$', '', service_name)
+        else:
+            charm_name = service_name
+        return charm_name
+
+    def _add_services(self, this_service, other_services):
+        """Add services to the deployment where this_service is the local charm
+           that we're focused on testing and other_services are the other
+           charms that come from the charm store."""
+        name, units = range(2)
+
+        charm_name = self._get_charm_name(this_service[name])
+        self.d.add(this_service[name],
+                   units=this_service[units])
+
+        for svc in other_services:
+            charm_name = self._get_charm_name(svc[name])
+            self.d.add(svc[name],
+                       charm='cs:{}/{}'.format(self.series, charm_name),
+                       units=svc[units])
+
+    def _add_relations(self, relations):
+        """Add all of the relations for the services."""
+        for k, v in relations.iteritems():
+            self.d.relate(k, v)
+
+    def _configure_services(self, configs):
+        """Configure all of the services."""
+        for service, config in configs.iteritems():
+            self.d.configure(service, config)
+
+    def _deploy(self):
+        """Deploy environment and wait for all hooks to finish executing."""
+        try:
+            self.d.setup()
+            self.d.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.FAIL, msg="Deployment timed out")
+        except:
+            raise
+
+    def run_tests(self):
+        """Run all of the methods that are prefixed with 'test_'."""
+        for test in dir(self):
+            if test.startswith('test_'):
+                getattr(self, test)()

=== added file 'tests/charmhelpers/contrib/amulet/utils.py'
--- tests/charmhelpers/contrib/amulet/utils.py	1970-01-01 00:00:00 +0000
+++ tests/charmhelpers/contrib/amulet/utils.py	2014-07-17 15:16:47 +0000
@@ -0,0 +1,157 @@
+import ConfigParser
+import io
+import logging
+import re
+import sys
+from time import sleep
+
+
+class AmuletUtils(object):
+    """This class provides common utility functions that are used by Amulet
+       tests."""
+
+    def __init__(self, log_level=logging.ERROR):
+        self.log = self.get_logger(level=log_level)
+
+    def get_logger(self, name="amulet-logger", level=logging.DEBUG):
+        """Get a logger object that will log to stdout."""
+        log = logging
+        logger = log.getLogger(name)
+        fmt = \
+            log.Formatter("%(asctime)s %(funcName)s %(levelname)s: %(message)s")
+
+        handler = log.StreamHandler(stream=sys.stdout)
+        handler.setLevel(level)
+        handler.setFormatter(fmt)
+
+        logger.addHandler(handler)
+        logger.setLevel(level)
+
+        return logger
+
+    def valid_ip(self, ip):
+        if re.match(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", ip):
+            return True
+        else:
+            return False
+
+    def valid_url(self, url):
+        p = re.compile(
+            r'^(?:http|ftp)s?://'
+            r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' # flake8: noqa
+            r'localhost|'
+            r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'
+            r'(?::\d+)?'
+            r'(?:/?|[/?]\S+)$',
+            re.IGNORECASE)
+        if p.match(url):
+            return True
+        else:
+            return False
+
+    def validate_services(self, commands):
+        """Verify the specified services are running on the corresponding
+           service units."""
+        for k, v in commands.iteritems():
+            for cmd in v:
+                output, code = k.run(cmd)
+                if code != 0:
+                    return "command `{}` returned {}".format(cmd, str(code))
+        return None
+
+    def _get_config(self, unit, filename):
+        """Get a ConfigParser object for parsing a unit's config file."""
+        file_contents = unit.file_contents(filename)
+        config = ConfigParser.ConfigParser()
+        config.readfp(io.StringIO(file_contents))
+        return config
+
+    def validate_config_data(self, sentry_unit, config_file, section, expected):
+        """Verify that the specified section of the config file contains
+           the expected option key:value pairs."""
+        config = self._get_config(sentry_unit, config_file)
+
+        if section != 'DEFAULT' and not config.has_section(section):
+            return "section [{}] does not exist".format(section)
+
+        for k in expected.keys():
+            if not config.has_option(section, k):
+                return "section [{}] is missing option {}".format(section, k)
+            if config.get(section, k) != expected[k]:
+                return "section [{}] {}:{} != expected {}:{}".format(section,
+                       k, config.get(section, k), k, expected[k])
+        return None
+
+    def _validate_dict_data(self, expected, actual):
+        """Compare expected dictionary data vs actual dictionary data.
+           The values in the 'expected' dictionary can be strings, bools, ints,
+           longs, or can be a function that evaluate a variable and returns a
+           bool."""
+        for k, v in expected.iteritems():
+            if k in actual:
+                if isinstance(v, basestring) or \
+                   isinstance(v, bool) or \
+                   isinstance(v, (int, long)):
+                    if v != actual[k]:
+                        return "{}:{}".format(k, actual[k])
+                elif not v(actual[k]):
+                    return "{}:{}".format(k, actual[k])
+            else:
+                return "key '{}' does not exist".format(k)
+        return None
+
+    def validate_relation_data(self, sentry_unit, relation, expected):
+        """Validate actual relation data based on expected relation data."""
+        actual = sentry_unit.relation(relation[0], relation[1])
+        self.log.debug('actual: {}'.format(repr(actual)))
+        return self._validate_dict_data(expected, actual)
+
+    def _validate_list_data(self, expected, actual):
+        """Compare expected list vs actual list data."""
+        for e in expected:
+            if e not in actual:
+                return "expected item {} not found in actual list".format(e)
+        return None
+
+    def not_null(self, string):
+        if string != None:
+            return True
+        else:
+            return False
+
+    def _get_file_mtime(self, sentry_unit, filename):
+        """Get last modification time of file."""
+        return sentry_unit.file_stat(filename)['mtime']
+
+    def _get_dir_mtime(self, sentry_unit, directory):
+        """Get last modification time of directory."""
+        return sentry_unit.directory_stat(directory)['mtime']
+
+    def _get_proc_start_time(self, sentry_unit, service, pgrep_full=False):
+        """Determine start time of the process based on the last modification
+           time of the /proc/pid directory. If pgrep_full is True, the process
+           name is matched against the full command line."""
+        if pgrep_full:
+            cmd = 'pgrep -o -f {}'.format(service)
+        else:
+            cmd = 'pgrep -o {}'.format(service)
+        proc_dir = '/proc/{}'.format(sentry_unit.run(cmd)[0].strip())
+        return self._get_dir_mtime(sentry_unit, proc_dir)
+
+    def service_restarted(self, sentry_unit, service, filename,
+                          pgrep_full=False, sleep_time=20):
+        """Compare a service's start time vs a file's last modification time
+           (such as a config file for that service) to determine if the service
+           has been restarted."""
+        sleep(sleep_time)
+        if self._get_proc_start_time(sentry_unit, service, pgrep_full) >= \
+           self._get_file_mtime(sentry_unit, filename):
+            return True
+        else:
+            return False
+
+    def relation_error(self, name, data):
+        return 'unexpected relation data in {} - {}'.format(name, data)
+
+    def endpoint_error(self, name, data):
+        return 'unexpected endpoint data in {} - {}'.format(name, data)

=== added directory 'tests/charmhelpers/contrib/openstack'
=== added file 'tests/charmhelpers/contrib/openstack/__init__.py'
=== added directory 'tests/charmhelpers/contrib/openstack/amulet'
=== added file 'tests/charmhelpers/contrib/openstack/amulet/__init__.py'
=== added file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	1970-01-01 00:00:00 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2014-07-17 15:16:47 +0000
@@ -0,0 +1,57 @@
+from charmhelpers.contrib.amulet.deployment import (
+    AmuletDeployment
+)
+
+
+class OpenStackAmuletDeployment(AmuletDeployment):
+    """This class inherits from AmuletDeployment and has additional support
+       that is specifically for use by OpenStack charms."""
+
+    def __init__(self, series, openstack=None, source=None):
+        """Initialize the deployment environment."""
+        super(OpenStackAmuletDeployment, self).__init__(series)
+        self.openstack = openstack
+        self.source = source
+
+    def _add_services(self, this_service, other_services):
+        """Add services to the deployment and set openstack-origin."""
+        super(OpenStackAmuletDeployment, self)._add_services(this_service,
+                                                             other_services)
+        name = 0
+        services = other_services
+        services.append(this_service)
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+
+        if self.openstack:
+            for svc in services:
+                charm_name = self._get_charm_name(svc[name])
+                if charm_name not in use_source:
+                    config = {'openstack-origin': self.openstack}
+                    self.d.configure(svc[name], config)
+
+        if self.source:
+            for svc in services:
+                charm_name = self._get_charm_name(svc[name])
+                if charm_name in use_source:
+                    config = {'source': self.source}
+                    self.d.configure(svc[name], config)
+
+    def _configure_services(self, configs):
+        """Configure all of the services."""
+        for service, config in configs.iteritems():
+            self.d.configure(service, config)
+
+    def _get_openstack_release(self):
+        """Return an integer representing the enum value of the openstack
+           release."""
+        self.precise_essex, self.precise_folsom, self.precise_grizzly, \
+            self.precise_havana, self.precise_icehouse, \
+            self.trusty_icehouse = range(6)
+        releases = {
+            ('precise', None): self.precise_essex,
+            ('precise', 'cloud:precise-folsom'): self.precise_folsom,
+            ('precise', 'cloud:precise-grizzly'): self.precise_grizzly,
+            ('precise', 'cloud:precise-havana'): self.precise_havana,
+            ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
+            ('trusty', None): self.trusty_icehouse}
+        return releases[(self.series, self.openstack)]

=== added file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	1970-01-01 00:00:00 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2014-07-17 15:16:47 +0000
@@ -0,0 +1,253 @@
+import logging
+import os
+import time
+import urllib
+
+import glanceclient.v1.client as glance_client
+import keystoneclient.v2_0 as keystone_client
+import novaclient.v1_1.client as nova_client
+
+from charmhelpers.contrib.amulet.utils import (
+    AmuletUtils
+)
+
+DEBUG = logging.DEBUG
+ERROR = logging.ERROR
+
+
+class OpenStackAmuletUtils(AmuletUtils):
+    """This class inherits from AmuletUtils and has additional support
+       that is specifically for use by OpenStack charms."""
+
+    def __init__(self, log_level=ERROR):
+        """Initialize the deployment environment."""
+        super(OpenStackAmuletUtils, self).__init__(log_level)
+
+    def validate_endpoint_data(self, endpoints, admin_port, internal_port,
+                               public_port, expected):
+        """Validate actual endpoint data vs expected endpoint data. The ports
+           are used to find the matching endpoint."""
+        found = False
+        for ep in endpoints:
+            self.log.debug('endpoint: {}'.format(repr(ep)))
+            if admin_port in ep.adminurl and internal_port in ep.internalurl \
+               and public_port in ep.publicurl:
+                found = True
+                actual = {'id': ep.id,
+                          'region': ep.region,
+                          'adminurl': ep.adminurl,
+                          'internalurl': ep.internalurl,
+                          'publicurl': ep.publicurl,
+                          'service_id': ep.service_id}
+                ret = self._validate_dict_data(expected, actual)
+                if ret:
+                    return 'unexpected endpoint data - {}'.format(ret)
+
+        if not found:
+            return 'endpoint not found'
+
+    def validate_svc_catalog_endpoint_data(self, expected, actual):
+        """Validate a list of actual service catalog endpoints vs a list of
+           expected service catalog endpoints."""
+        self.log.debug('actual: {}'.format(repr(actual)))
+        for k, v in expected.iteritems():
+            if k in actual:
+                ret = self._validate_dict_data(expected[k][0], actual[k][0])
+                if ret:
+                    return self.endpoint_error(k, ret)
+            else:
+                return "endpoint {} does not exist".format(k)
+        return ret
+
+    def validate_tenant_data(self, expected, actual):
+        """Validate a list of actual tenant data vs list of expected tenant
+           data."""
+        self.log.debug('actual: {}'.format(repr(actual)))
+        for e in expected:
+            found = False
+            for act in actual:
+                a = {'enabled': act.enabled, 'description': act.description,
+                     'name': act.name, 'id': act.id}
+                if e['name'] == a['name']:
+                    found = True
+                    ret = self._validate_dict_data(e, a)
+                    if ret:
+                        return "unexpected tenant data - {}".format(ret)
+            if not found:
+                return "tenant {} does not exist".format(e['name'])
+        return ret
+
+    def validate_role_data(self, expected, actual):
+        """Validate a list of actual role data vs a list of expected role
+           data."""
+        self.log.debug('actual: {}'.format(repr(actual)))
+        for e in expected:
+            found = False
+            for act in actual:
+                a = {'name': act.name, 'id': act.id}
+                if e['name'] == a['name']:
+                    found = True
+                    ret = self._validate_dict_data(e, a)
+                    if ret:
+                        return "unexpected role data - {}".format(ret)
+            if not found:
+                return "role {} does not exist".format(e['name'])
+        return ret
+
+    def validate_user_data(self, expected, actual):
+        """Validate a list of actual user data vs a list of expected user
+           data."""
+        self.log.debug('actual: {}'.format(repr(actual)))
+        for e in expected:
+            found = False
+            for act in actual:
+                a = {'enabled': act.enabled, 'name': act.name,
+                     'email': act.email, 'tenantId': act.tenantId,
+                     'id': act.id}
+                if e['name'] == a['name']:
+                    found = True
+                    ret = self._validate_dict_data(e, a)
+                    if ret:
+                        return "unexpected user data - {}".format(ret)
+            if not found:
+                return "user {} does not exist".format(e['name'])
+        return ret
+
+    def validate_flavor_data(self, expected, actual):
+        """Validate a list of actual flavors vs a list of expected flavors."""
+        self.log.debug('actual: {}'.format(repr(actual)))
+        act = [a.name for a in actual]
+        return self._validate_list_data(expected, act)
+
+    def tenant_exists(self, keystone, tenant):
+        """Return True if tenant exists"""
+        return tenant in [t.name for t in keystone.tenants.list()]
+
+    def authenticate_keystone_admin(self, keystone_sentry, user, password,
+                                    tenant):
+        """Authenticates admin user with the keystone admin endpoint."""
+        service_ip = \
+            keystone_sentry.relation('shared-db',
+                                     'mysql:shared-db')['private-address']
+        ep = "http://{}:35357/v2.0".format(service_ip.strip().decode('utf-8'))
+        return keystone_client.Client(username=user, password=password,
+                                      tenant_name=tenant, auth_url=ep)
+
+    def authenticate_keystone_user(self, keystone, user, password, tenant):
+        """Authenticates a regular user with the keystone public endpoint."""
+        ep = keystone.service_catalog.url_for(service_type='identity',
+                                              endpoint_type='publicURL')
+        return keystone_client.Client(username=user, password=password,
+                                      tenant_name=tenant, auth_url=ep)
+
+    def authenticate_glance_admin(self, keystone):
+        """Authenticates admin user with glance."""
+        ep = keystone.service_catalog.url_for(service_type='image',
+                                              endpoint_type='adminURL')
+        return glance_client.Client(ep, token=keystone.auth_token)
+
+    def authenticate_nova_user(self, keystone, user, password, tenant):
+        """Authenticates a regular user with nova-api."""
+        ep = keystone.service_catalog.url_for(service_type='identity',
+                                              endpoint_type='publicURL')
+        return nova_client.Client(username=user, api_key=password,
+                                  project_id=tenant, auth_url=ep)
+
+    def create_cirros_image(self, glance, image_name):
+        """Download the latest cirros image and upload it to glance."""
+        http_proxy = os.getenv('AMULET_HTTP_PROXY')
+        self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
+        if http_proxy:
+            proxies = {'http': http_proxy}
+            opener = urllib.FancyURLopener(proxies)
+        else:
+            opener = urllib.FancyURLopener()
+
+        f = opener.open("http://download.cirros-cloud.net/version/released")
+        version = f.read().strip()
+        cirros_img = "tests/cirros-{}-x86_64-disk.img".format(version)
+
+        if not os.path.exists(cirros_img):
+            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
+                                                  version, cirros_img)
+            opener.retrieve(cirros_url, cirros_img)
+        f.close()
+
+        with open(cirros_img) as f:
+            image = glance.images.create(name=image_name, is_public=True,
+                                         disk_format='qcow2',
+                                         container_format='bare', data=f)
+        count = 1
+        status = image.status
+        while status != 'active' and count < 10:
+            time.sleep(3)
+            image = glance.images.get(image.id)
+            status = image.status
+            self.log.debug('image status: {}'.format(status))
+            count += 1
+
+        if status != 'active':
+            self.log.error('image creation timed out')
+            return None
+
+        return image
+
+    def delete_image(self, glance, image):
+        """Delete the specified image."""
+        num_before = len(list(glance.images.list()))
+        glance.images.delete(image)
+
+        count = 1
+        num_after = len(list(glance.images.list()))
+        while num_after != (num_before - 1) and count < 10:
+            time.sleep(3)
+            num_after = len(list(glance.images.list()))
+            self.log.debug('number of images: {}'.format(num_after))
+            count += 1
+
+        if num_after != (num_before - 1):
+            self.log.error('image deletion timed out')
+            return False
+
+        return True
+
+    def create_instance(self, nova, image_name, instance_name, flavor):
+        """Create the specified instance."""
+        image = nova.images.find(name=image_name)
+        flavor = nova.flavors.find(name=flavor)
+        instance = nova.servers.create(name=instance_name, image=image,
+                                       flavor=flavor)
+
+        count = 1
+        status = instance.status
+        while status != 'ACTIVE' and count < 60:
+            time.sleep(3)
+            instance = nova.servers.get(instance.id)
+            status = instance.status
+            self.log.debug('instance status: {}'.format(status))
+            count += 1
+
+        if status != 'ACTIVE':
+            self.log.error('instance creation timed out')
+            return None
+
+        return instance
+
+    def delete_instance(self, nova, instance):
+        """Delete the specified instance."""
+        num_before = len(list(nova.servers.list()))
+        nova.servers.delete(instance)
+
+        count = 1
+        num_after = len(list(nova.servers.list()))
+        while num_after != (num_before - 1) and count < 10:
+            time.sleep(3)
+            num_after = len(list(nova.servers.list()))
+            self.log.debug('number of instances: {}'.format(num_after))
+            count += 1
+
+        if num_after != (num_before - 1):
+            self.log.error('instance deletion timed out')
+            return False
+
+        return True