Enable Ocata Amulet Tests

- Add Zesty as a supported series to metadata.yaml.
- Turn on Xenial-Ocata Amulet test definitions.
- Sync charm helpers to get Juju 2.x amulet compatibility.
- Keeping Zesty-Ocata Amulet test definitions turned off until the
  metadata.yaml changes propagate to the charm store.
- Resync tox.ini to resolve amulet test failures.

Change-Id: Iab06b4418334995245b446abc68bb194dc0f6072

src/metadata.yaml

@@ -14,6 +14,7 @@ tags:
   - openstack
 series:
   - xenial
+  - zesty
   - trusty
   - yakkety
 subordinate: false

src/tests/basic_deployment.py

@@ -48,7 +48,7 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
            """
         this_service = {'name': 'aodh'}
         other_services = [
-            {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
+            {'name': 'percona-cluster'},
             {'name': 'rabbitmq-server'},
             {'name': 'keystone'},
             {'name': 'mongodb'},
@@ -77,10 +77,7 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
             'admin-token': 'ubuntutesting'
         }
         pxc_config = {
-            'dataset-size': '25%',
             'max-connections': 1000,
-            'root-password': 'ChangeMe123',
-            'sst-password': 'ChangeMe123',
         }
         configs = {
             'keystone': keystone_config,
@@ -336,9 +333,10 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
         if self._get_openstack_release() >= self.xenial_ocata:
             services = {
                 'apache2': conf_file,
-                'aodh-evaluator - AlarmEvaluationService(0)': conf_file,
-                'aodh-notifier - AlarmNotifierService(0)': conf_file,
-                'aodh-listener - EventAlarmEvaluationService(0)': conf_file,
+                'aodh-evaluator: AlarmEvaluationService worker(0)': conf_file,
+                'aodh-notifier: AlarmNotifierService worker(0)': conf_file,
+                'aodh-listener: EventAlarmEvaluationService'
+                ' worker(0)': conf_file,
             }
         elif self._get_openstack_release() >= self.xenial_newton:
             services = {

src/tests/gate-basic-xenial-ocata

@@ -6,6 +6,5 @@ from basic_deployment import AodhBasicDeployment
 
 if __name__ == '__main__':
     deployment = AodhBasicDeployment(series='xenial',
-                                     openstack='cloud:xenial-ocata',
-                                     source='cloud:xenial-updates/ocata')
+                                     openstack='cloud:xenial-ocata')
     deployment.run_tests()

src/tox.ini

@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_API_URL
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}