Add functional tests

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

src/lib/charm/openstack/designate_bind.py

@@ -1,3 +1,18 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 import glob
 import os
 import time
@@ -125,6 +140,15 @@ def render_all_configs(interfaces_list):
     DesignateBindCharm.singleton.render_with_interfaces(interfaces_list)
 
 
+def assess_status():
+    """Just call the DesignateBindCharm.singleton.assess_status() command
+    to update status on the unit.
+
+    @returns: None
+    """
+    DesignateBindCharm.singleton.assess_status()
+
+
 class DNSAdapter(adapters.OpenStackRelationAdapter):
 
     def __init__(self, relation):
@@ -194,6 +218,7 @@ class DesignateBindCharm(openstack_charm.OpenStackCharm):
     default_service = 'bind9'
     adapters_class = BindAdapters
     release = 'icehouse'
+    required_relations = []
 
     def __init__(self, release=None, **kwargs):
         super(DesignateBindCharm, self).__init__(release='icehouse', **kwargs)

src/metadata.yaml

@@ -8,6 +8,8 @@ description: |
  .
  This charm provides BIND9 as a backend for integration with OpenStack
  Designate, providing DNSaaS in an OpenStack cloud.
+tags:
+  - openstack
 series:
   - trusty
   - wily

src/reactive/designate_bind_handlers.py

@@ -1,3 +1,18 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 import charms.reactive as reactive
 import charmhelpers.core.hookenv as hookenv
 import charm.openstack.designate_bind as designate_bind
@@ -92,3 +107,8 @@ def process_sync_requests(hacluster):
     '''If this unit is the leader process and new sync requests'''
     if hookenv.is_leader():
         designate_bind.process_requests(hacluster)
+
+
+@reactive.when('zones.initialised')
+def assess_status():
+    designate_bind.assess_status()

src/requirements.txt

@@ -0,0 +1,2 @@
+flake8
+pytest

src/test-requirements.txt

@@ -0,0 +1,20 @@
+# charm-proof
+charm-tools>=2.0.0
+# amulet deployment helpers
+bzr+lp:charm-helpers#egg=charmhelpers
+# BEGIN: Amulet OpenStack Charm Helper Requirements
+# Liberty client lower constraints
+amulet>=1.14.3,<2.0
+bundletester>=0.6.1,<1.0
+python-keystoneclient>=1.7.1,<2.0
+python-designateclient>=1.5,<2.0
+python-cinderclient>=1.4.0,<2.0
+python-glanceclient>=1.1.0,<2.0
+python-heatclient>=0.8.0,<1.0
+python-neutronclient>=3.1.0,<4.0
+python-novaclient>=2.30.1,<3.0
+python-openstackclient>=1.7.0,<2.0
+python-swiftclient>=2.6.0,<3.0
+pika>=0.10.0,<1.0
+distro-info
+# END: Amulet OpenStack Charm Helper Requirements

src/tests/basic_deployment.py

@@ -0,0 +1,276 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import amulet
+import json
+import subprocess
+import time
+
+
+import designateclient.client as designate_client
+import designateclient.v1.domains as domains
+import designateclient.v1.records as records
+
+import charmhelpers.contrib.openstack.amulet.deployment as amulet_deployment
+import charmhelpers.contrib.openstack.amulet.utils as os_amulet_utils
+
+# Use DEBUG to turn on debug logging
+u = os_amulet_utils.OpenStackAmuletUtils(os_amulet_utils.DEBUG)
+
+
+class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
+    """Amulet tests on a basic designate deployment."""
+
+    TEST_DOMAIN = 'amuletexample.com.'
+    TEST_WWW_RECORD = "www.{}".format(TEST_DOMAIN)
+    TEST_RECORD = {TEST_WWW_RECORD: '10.0.0.23'}
+
+    def __init__(self, series, openstack=None, source=None, stable=False):
+        """Deploy the entire test environment."""
+        super(DesignateBindDeployment, self).__init__(series, openstack,
+                                                       source, stable)
+        self._add_services()
+        self._add_relations()
+        self._configure_services()
+        self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql', 'mongodb']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
+        self._initialize_tests()
+
+    def _add_services(self):
+        """Add services
+
+           Add the services that we're testing, where designate is local,
+           and the rest of the service are from lp branches that are
+           compatible with the local charm (e.g. stable or next).
+           """
+        this_service = {'name': 'designate-bind'}
+        other_services = [{'name': 'mysql'},
+                          {'name': 'rabbitmq-server'},
+                          {'name': 'keystone'},
+                          {'name': 'designate',
+                           'location': 'cs:~gnuoy/trusty/designate-0'}]
+        super(DesignateBindDeployment, self)._add_services(this_service,
+                                                            other_services)
+
+    def _add_relations(self):
+        """Add all of the relations for the services."""
+        relations = {
+            'designate:shared-db': 'mysql:shared-db',
+            'designate:amqp': 'rabbitmq-server:amqp',
+            'designate:identity-service': 'keystone:identity-service',
+            'keystone:shared-db': 'mysql:shared-db',
+            'designate:dns-backend': 'designate-bind:dns-backend',
+        }
+        super(DesignateBindDeployment, self)._add_relations(relations)
+
+    def _configure_services(self):
+        """Configure all of the services."""
+        if self.series == 'trusty':
+            keystone_config = {'admin-password': 'openstack',
+                               'admin-token': 'ubuntutesting',
+                               'openstack-origin': 'cloud:trusty-mitaka'}
+            designate_config = {'openstack-origin': 'cloud:trusty-mitaka'}
+            configs = {
+                'keystone': keystone_config,
+                'designate': designate_config}
+        else:
+            keystone_config = {'admin-password': 'openstack',
+                               'admin-token': 'ubuntutesting'}
+            configs = {'keystone': keystone_config}
+        super(DesignateBindDeployment, self)._configure_services(configs)
+
+    def _get_token(self):
+        return self.keystone.service_catalog.catalog['token']['id']
+
+    def _initialize_tests(self):
+        """Perform final initialization before tests get run."""
+        # Access the sentries for inspecting service units
+        self.designate_sentry = self.d.sentry['designate'][0]
+        self.designate_bind_sentry = self.d.sentry['designate-bind'][0]
+        self.mysql_sentry = self.d.sentry['mysql'][0]
+        self.keystone_sentry = self.d.sentry['keystone'][0]
+        self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0]
+        u.log.debug('openstack release val: {}'.format(
+            self._get_openstack_release()))
+        u.log.debug('openstack release str: {}'.format(
+            self._get_openstack_release_string()))
+        self.dns_slave_ip = self.designate_bind_sentry.relation(
+            'dns-backend',
+            'designate:dns-backend')['private-address']
+        self.designate_svcs = [
+            'designate-agent', 'designate-api', 'designate-central',
+            'designate-mdns', 'designate-pool-manager', 'designate-sink',
+            'designate-zone-manager',
+        ]
+
+        # Authenticate admin with keystone endpoint
+        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
+                                                      user='admin',
+                                                      password='openstack',
+                                                      tenant='admin')
+
+        # Authenticate admin with designate endpoint
+        designate_ep = self.keystone.service_catalog.url_for(
+            service_type='dns',
+            endpoint_type='publicURL')
+        keystone_ep = self.keystone.service_catalog.url_for(
+            service_type='identity',
+            endpoint_type='publicURL')
+        self.designate = designate_client.Client(
+            version='1',
+            auth_url=keystone_ep,
+            username="admin",
+            password="openstack",
+            tenant_name="admin",
+            endpoint=designate_ep)
+
+    def check_and_wait(self, check_command, interval=2, max_wait=200,
+                       desc=None):
+        waited = 0
+        while not check_command() or waited > max_wait:
+            if desc:
+                u.log.debug(desc)
+            time.sleep(interval)
+            waited = waited + interval
+        if waited > max_wait:
+            raise Exception('cmd failed {}'.format(check_command))
+
+    def _run_action(self, unit_id, action, *args):
+        command = ["juju", "action", "do", "--format=json", unit_id, action]
+        command.extend(args)
+        print("Running command: %s\n" % " ".join(command))
+        output = subprocess.check_output(command)
+        output_json = output.decode(encoding="UTF-8")
+        data = json.loads(output_json)
+        action_id = data[u'Action queued with id']
+        return action_id
+
+    def _wait_on_action(self, action_id):
+        command = ["juju", "action", "fetch", "--format=json", action_id]
+        while True:
+            try:
+                output = subprocess.check_output(command)
+            except Exception as e:
+                print(e)
+                return False
+            output_json = output.decode(encoding="UTF-8")
+            data = json.loads(output_json)
+            if data[u"status"] == "completed":
+                return True
+            elif data[u"status"] == "failed":
+                return False
+            time.sleep(2)
+
+    def test_100_services(self):
+        """Verify the expected services are running on the corresponding
+           service units."""
+        u.log.debug('Checking system services on units...')
+
+        service_names = {
+            self.designate_sentry: self.designate_svcs,
+        }
+
+        ret = u.validate_services_by_name(service_names)
+        if ret:
+            amulet.raise_status(amulet.FAIL, msg=ret)
+
+        u.log.debug('OK')
+
+    def test_205_designate_designate_bind_relation(self):
+        """Verify the designate to designate-bind dns-backend relation data"""
+        u.log.debug('Checking designate:designate-bind dns-backend relation'
+                    'data...')
+        unit = self.designate_sentry
+        relation = ['dns-backend', 'designate-bind:dns-backend']
+        expected = {
+            'private-address': u.valid_ip,
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('designate dns-backend', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_206_designate_bind_designate_relation(self):
+        """Verify the designate_bind to designate dns-backend relation data"""
+        u.log.debug('Checking designate-bind:designate dns-backend relation'
+                    'data...')
+        unit = self.designate_bind_sentry
+        relation = ['dns-backend', 'designate:dns-backend']
+        expected = {
+            'private-address': u.valid_ip,
+            'rndckey': u.not_null,
+            'algorithm': 'hmac-md5',
+        }
+
+        ret = u.validate_relation_data(unit, relation, expected)
+        if ret:
+            message = u.relation_error('designate dns-backend', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def get_domain_id(self, domain_name):
+        domain_id = None
+        for dom in self.designate.domains.list():
+            if dom.name == domain_name:
+                domain_id = dom.id
+        return domain_id
+
+    def get_test_domain_id(self):
+        return self.get_domain_id(self.TEST_DOMAIN)
+
+    def check_test_domain_gone(self):
+        return not self.get_test_domain_id()
+
+    def check_slave_resolve_test_record(self):
+        lookup_cmd = [
+            'dig', '+short', '@{}'.format(self.dns_slave_ip),
+            self.TEST_WWW_RECORD]
+        cmd_out = subprocess.check_output(lookup_cmd).rstrip('\r\n')
+        return self.TEST_RECORD[self.TEST_WWW_RECORD] == cmd_out
+
+    def test_400_domain_creation(self):
+        """Simple api calls to create domain"""
+        u.log.debug('Checking if domain exists before trying to create it')
+        old_dom_id = self.get_test_domain_id()
+        if old_dom_id:
+            u.log.debug('Deleting old domain')
+            self.designate.domains.delete(old_dom_id)
+        self.check_and_wait(
+            self.check_test_domain_gone,
+            desc='Waiting for domain to disappear')
+        u.log.debug('Creating new domain')
+        domain = domains.Domain(
+            name=self.TEST_DOMAIN,
+            email="fred@amuletexample.com")
+        new_domain = self.designate.domains.create(domain)
+        assert(new_domain is not None)
+
+        u.log.debug('Creating new test record')
+        _record = records.Record(
+            name=self.TEST_WWW_RECORD,
+            type="A",
+            data=self.TEST_RECORD[self.TEST_WWW_RECORD])
+
+        self.designate.records.create(new_domain.id, _record)
+        self.check_and_wait(
+            self.check_slave_resolve_test_record,
+            desc='Waiting for dns record to propagate')
+        u.log.debug('Tidy up delete test record')
+        self.designate.domains.delete(new_domain.id)
+        u.log.debug('OK')

src/tests/gate-basic-trusty

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+"""Amulet tests on a basic aodh deployment on trusty-mitaka."""
+
+from basic_deployment import DesignateBindDeployment
+
+if __name__ == '__main__':
+    deployment = DesignateBindDeployment(series='trusty')
+    deployment.run_tests()

src/tests/gate-basic-xenial

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+"""Amulet tests on a basic aodh deployment on mitaka."""
+
+from basic_deployment import DesignateBindDeployment
+
+if __name__ == '__main__':
+    deployment = DesignateBindDeployment(series='xenial')
+    deployment.run_tests()

src/tests/tests.yaml

@@ -0,0 +1,17 @@
+# Bootstrap the model if necessary.
+bootstrap: True
+# Re-use bootstrap node instead of destroying/re-bootstrapping.
+reset: True
+# Use tox/requirements to drive the venv instead of bundletester's venv feature.
+virtualenv: False
+# Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.
+makefile: []
+# Do not specify juju PPA sources.  Juju is presumed to be pre-installed
+# and configured in all test runner environments.
+#sources:
+# Do not specify or rely on system packages.
+#packages:
+# Do not specify python packages here.  Use test-requirements.txt
+# and tox instead.  ie. The venv is constructed before bundletester
+# is invoked.
+#python-packages:

src/tox.ini

@@ -0,0 +1,53 @@
+[tox]
+envlist = pep8
+skipsdist = True
+
+[testenv]
+envdir = .tox/py27
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+         AMULET_SETUP_TIMEOUT=2700
+deps = -r{toxinidir}/test-requirements.txt
+install_command =
+  pip install --allow-unverified python-apt {opts} {packages}
+
+[testenv:pep8]
+basepython = python2.7
+commands = charm-proof
+
+[testenv:func27-noop]
+# DRY RUN - For Debug
+basepython = python2.7
+commands =
+    bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy
+
+[testenv:func27]
+# Charm Functional Test
+# Run all gate tests which are +x (expected to always pass)
+basepython = python2.7
+commands =
+    bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy
+
+[testenv:func27-smoke]
+# Charm Functional Test
+# Run a specific test as an Amulet smoke test (expected to always pass)
+basepython = python2.7
+commands =
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy
+
+[testenv:func27-dfs]
+# Charm Functional Test
+# Run all deploy-from-source tests which are +x (may not always pass!)
+basepython = python2.7
+commands =
+    bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy
+
+[testenv:func27-dev]
+# Charm Functional Test
+# Run all development test targets which are +x (may not always pass!)
+basepython = python2.7
+commands =
+    bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dev-*" --no-destroy
+
+[testenv:venv]
+commands = {posargs}

unit_tests/test_designate_bind_handlers.py

@@ -1,3 +1,18 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 from __future__ import absolute_import
 from __future__ import print_function
 
@@ -108,6 +123,7 @@ class TestDesignateHandlers(unittest.TestCase):
                 ('cluster.connected', ),
                 ('zones.initialised', ),
             ],
+            'assess_status': [('zones.initialised', )],
         }
         when_not_patterns = {
             'install_packages': [('installed', )],
@@ -128,6 +144,7 @@ class TestDesignateHandlers(unittest.TestCase):
                      (_when_not_args, when_not_patterns)]:
             for f, args in t.items():
                 # check that function is in patterns
+                print(f)
                 self.assertTrue(f in p.keys())
                 # check that the lists are equal
                 l = [a['args'] for a in args]