Merge lp:~1chb1n/charms/trusty/percona-cluster/next-amulet-initial into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Ryan Beisner]

Add initial openstack amulet tests; sync charmhelpers; keep existing tests disabled, pending validation (http://pad.lv/1446169).

Unmerged revisions

63. By Ryan Beisner on 2015-04-22

amulet tests - add for openstack supported releases; disable existing tests, pending validation

62. By Ryan Beisner on 2015-04-22

amulet tests - update 00-setup, remove precise definition, mark existing tests non-executable until validated.

61. By Ryan Beisner on 2015-04-22

amulet tests - separate existing tests

60. By Ryan Beisner on 2015-04-22

amulet tests - add supported series/release definitions

59. By Ryan Beisner on 2015-04-22

amulet tests - rename existing

58. By Ryan Beisner on 2015-04-22

update makefile

57. By Ryan Beisner on 2015-04-22

sync charmhelpers

=== modified file 'Makefile'
--- Makefile	2015-04-20 10:53:43 +0000
+++ Makefile	2015-04-22 21:53:21 +0000
@@ -3,18 +3,16 @@
 export PYTHONPATH := hooks
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks
+	@flake8 --exclude hooks/charmhelpers hooks unit_tests tests
 	@charm proof
 
 unit_test:
 	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
 
-test:
-	@echo Starting amulet tests...
-	#NOTE(beisner): can remove -v after bug 1320357 is fixed
-	#   https://bugs.launchpad.net/amulet/+bug/1320357
-	# @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
-	echo "Tests disables; http://pad.lv/1446169"
+functional_test:
+	@echo Starting Amulet tests...
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
+    # Previous tests disabled; http://pad.lv/1446169
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin

=== modified file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-02-20 00:30:39 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-04-22 21:53:21 +0000
@@ -247,7 +247,9 @@
 
         service('restart', 'nagios-nrpe-server')
 
-        for rid in relation_ids("local-monitors"):
+        monitor_ids = relation_ids("local-monitors") + \
+            relation_ids("nrpe-external-master")
+        for rid in monitor_ids:
             relation_set(relation_id=rid, monitors=yaml.dump(monitors))
 
 

=== modified file 'hooks/charmhelpers/contrib/database/mysql.py'
--- hooks/charmhelpers/contrib/database/mysql.py	2015-04-21 09:29:08 +0000
+++ hooks/charmhelpers/contrib/database/mysql.py	2015-04-22 21:53:21 +0000
@@ -6,7 +6,7 @@
 import os
 import glob
 
-from string import upper
+# from string import upper
 
 from charmhelpers.core.host import (
     mkdir,
@@ -348,7 +348,7 @@
                 key, mem = line.split(':', 2)
                 if key == 'MemTotal':
                     mtot, modifier = mem.strip().split(' ')
-                    return '%s%s' % (mtot, upper(modifier[0]))
+                    return '%s%s' % (mtot, modifier[0].upper())
 
     def parse_config(self):
         """Parse charm configuration and calculate values for config files."""

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2015-02-04 18:56:00 +0000
+++ hooks/charmhelpers/core/hookenv.py	2015-04-22 21:53:21 +0000
@@ -20,11 +20,13 @@
 # Authors:
 #  Charm Helpers Developers <[e-mail]>
 
+from __future__ import print_function
 import os
 import json
 import yaml
 import subprocess
 import sys
+import errno
 from subprocess import CalledProcessError
 
 import six
@@ -87,7 +89,18 @@
     if not isinstance(message, six.string_types):
         message = repr(message)
     command += [message]
-    subprocess.call(command)
+    # Missing juju-log should not cause failures in unit tests
+    # Send log output to stderr
+    try:
+        subprocess.call(command)
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            if level:
+                message = "{}: {}".format(level, message)
+            message = "juju-log: {}".format(message)
+            print(message, file=sys.stderr)
+        else:
+            raise
 
 
 class Serializable(UserDict):
@@ -566,3 +579,29 @@
 def charm_dir():
     """Return the root directory of the current charm"""
     return os.environ.get('CHARM_DIR')
+
+
+@cached
+def action_get(key=None):
+    """Gets the value of an action parameter, or all key/value param pairs"""
+    cmd = ['action-get']
+    if key is not None:
+        cmd.append(key)
+    cmd.append('--format=json')
+    action_data = json.loads(subprocess.check_output(cmd).decode('UTF-8'))
+    return action_data
+
+
+def action_set(values):
+    """Sets the values to be returned after the action finishes"""
+    cmd = ['action-set']
+    for k, v in list(values.items()):
+        cmd.append('{}={}'.format(k, v))
+    subprocess.check_call(cmd)
+
+
+def action_fail(message):
+    """Sets the action status to failed and sets the error message.
+
+    The results set by action_set are preserved."""
+    subprocess.check_call(['action-fail', message])

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2015-03-03 02:26:12 +0000
+++ hooks/charmhelpers/core/host.py	2015-04-22 21:53:21 +0000
@@ -339,12 +339,16 @@
 def pwgen(length=None):
     """Generate a random pasword."""
     if length is None:
+        # A random length is ok to use a weak PRNG
         length = random.choice(range(35, 45))
     alphanumeric_chars = [
         l for l in (string.ascii_letters + string.digits)
         if l not in 'l0QD1vAEIOUaeiou']
+    # Use a crypto-friendly PRNG (e.g. /dev/urandom) for making the
+    # actual password
+    random_generator = random.SystemRandom()
     random_chars = [
-        random.choice(alphanumeric_chars) for _ in range(length)]
+        random_generator.choice(alphanumeric_chars) for _ in range(length)]
     return(''.join(random_chars))
 
 

=== modified file 'hooks/charmhelpers/core/services/helpers.py'
--- hooks/charmhelpers/core/services/helpers.py	2015-03-03 02:26:12 +0000
+++ hooks/charmhelpers/core/services/helpers.py	2015-04-22 21:53:21 +0000
@@ -139,7 +139,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'user', 'password', 'database']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
 
 class HttpRelation(RelationContext):
@@ -154,7 +154,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'port']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
     def provide_data(self):
         return {

=== modified file 'hooks/charmhelpers/core/strutils.py'
--- hooks/charmhelpers/core/strutils.py	2015-02-25 17:29:36 +0000
+++ hooks/charmhelpers/core/strutils.py	2015-04-22 21:53:21 +0000
@@ -33,9 +33,9 @@
 
     value = value.strip().lower()
 
-    if value in ['y', 'yes', 'true', 't']:
+    if value in ['y', 'yes', 'true', 't', 'on']:
         return True
-    elif value in ['n', 'no', 'false', 'f']:
+    elif value in ['n', 'no', 'false', 'f', 'off']:
         return False
 
     msg = "Unable to interpret string value '%s' as boolean" % (value)

=== modified file 'hooks/charmhelpers/core/unitdata.py'
--- hooks/charmhelpers/core/unitdata.py	2015-02-25 17:29:36 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-04-22 21:53:21 +0000
@@ -443,7 +443,7 @@
         data = hookenv.execution_environment()
         self.conf = conf_delta = self.kv.delta(data['conf'], 'config')
         self.rels = rels_delta = self.kv.delta(data['rels'], 'rels')
-        self.kv.set('env', data['env'])
+        self.kv.set('env', dict(data['env']))
         self.kv.set('unit', data['unit'])
         self.kv.set('relid', data.get('relid'))
         return conf_delta, rels_delta

=== modified file 'tests/00-setup.sh'
--- tests/00-setup.sh	2015-04-15 12:11:46 +0000
+++ tests/00-setup.sh	2015-04-22 21:53:21 +0000
@@ -1,24 +1,26 @@
-#!/bin/bash -x
-# The script installs amulet and other tools needed for the amulet tests.
-
-# Get the status of the amulet package, this returns 0 of package is installed.
-dpkg -s amulet
-if [ $? -ne 0 ]; then
-  # Install the Amulet testing harness.
-  sudo add-apt-repository -y ppa:juju/stable
-  sudo apt-get update 
-  sudo apt-get install -y -q amulet juju-core charm-tools
-fi
-
-
-PACKAGES="python3 python3-yaml"
-for pkg in $PACKAGES; do
-  dpkg -s python3
-  if [ $? -ne 0 ]; then
-    sudo apt-get install -y -q $pkg
-  fi
-done
-
+#!/bin/bash
+
+set -ex
+
+sudo add-apt-repository --yes ppa:juju/stable
+sudo apt-get update --yes
+sudo apt-get install --yes python-amulet \
+                           python3 \
+                           python3-yaml \
+                           python3-pip \
+                           python-keystoneclient
+
+# Enable http proxy if AMULET_HTTP_PROXY is set
+#if [[ -n "$AMULET_HTTP_PROXY" ]]; then
+#  export HTTP_PROXY=$AMULET_HTTP_PROXY
+#  export HTTPS_PROXY=$(echo $AMULET_HTTP_PROXY | sed 's/http/https/g')
+#  export http_proxy=$HTTP_PROXY
+#  export https_proxy=$HTTPS_PROXY
+#  env | egrep "proxy|PROXY"
+#fi
+
+# Setup for generic mysql amulet test (Not in main < Vivid, pip it instead)
+#sudo -E pip3 install PyMySQL
 
 #if [ ! -f "$(dirname $0)/../local.yaml" ]; then
 #  echo "To run these amulet tests a vip is needed, create a file called \

=== added file 'tests/015-basic-trusty-icehouse'
--- tests/015-basic-trusty-icehouse	1970-01-01 00:00:00 +0000
+++ tests/015-basic-trusty-icehouse	2015-04-22 21:53:21 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on trusty-icehouse."""
+
+from basic_deployment import PerconaClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = PerconaClusterBasicDeployment(series='trusty')
+    deployment.run_tests()

=== added file 'tests/016-basic-trusty-juno'
--- tests/016-basic-trusty-juno	1970-01-01 00:00:00 +0000
+++ tests/016-basic-trusty-juno	2015-04-22 21:53:21 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on trusty-juno."""
+
+from basic_deployment import PerconaClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = PerconaClusterBasicDeployment(series='trusty',
+                                               openstack='cloud:trusty-juno',
+                                               source='cloud:trusty-updates/juno')
+    deployment.run_tests()

=== added file 'tests/017-basic-trusty-kilo'
--- tests/017-basic-trusty-kilo	1970-01-01 00:00:00 +0000
+++ tests/017-basic-trusty-kilo	2015-04-22 21:53:21 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on trusty-kilo."""
+
+from basic_deployment import PerconaClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = PerconaClusterBasicDeployment(series='trusty',
+                                               openstack='cloud:trusty-kilo',
+                                               source='cloud:trusty-updates/kilo')
+    deployment.run_tests()

=== added file 'tests/018-basic-utopic-juno'
--- tests/018-basic-utopic-juno	1970-01-01 00:00:00 +0000
+++ tests/018-basic-utopic-juno	2015-04-22 21:53:21 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on utopic-juno."""
+
+from basic_deployment import PerconaClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = PerconaClusterBasicDeployment(series='utopic')
+    deployment.run_tests()

=== added file 'tests/019-basic-vivid-kilo'
--- tests/019-basic-vivid-kilo	1970-01-01 00:00:00 +0000
+++ tests/019-basic-vivid-kilo	2015-04-22 21:53:21 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic mysql deployment on vivid-kilo."""
+
+from basic_deployment import PerconaClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = PerconaClusterBasicDeployment(series='vivid')
+    deployment.run_tests()

=== renamed file 'tests/10-deploy_test.py' => 'tests/100-deploy_test.py' (properties changed: +x to -x)
--- tests/10-deploy_test.py	2015-03-06 15:35:01 +0000
+++ tests/100-deploy_test.py	2015-04-22 21:53:21 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # test percona-cluster (3 nodes)
 
-import basic_deployment
+import 1xx_basic_deployment
 import time
 
 

=== renamed file 'tests/20-broken-mysqld.py' => 'tests/110-broken-mysqld.py' (properties changed: +x to -x)
--- tests/20-broken-mysqld.py	2015-03-06 15:35:01 +0000
+++ tests/110-broken-mysqld.py	2015-04-22 21:53:21 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # test percona-cluster (3 nodes)
 
-import basic_deployment
+import 1xx_basic_deployment
 import time
 
 

=== renamed file 'tests/30-kill-9-mysqld.py' => 'tests/120-kill-9-mysqld.py' (properties changed: +x to -x)
--- tests/30-kill-9-mysqld.py	2015-04-15 14:24:59 +0000
+++ tests/120-kill-9-mysqld.py	2015-04-22 21:53:21 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # test percona-cluster (3 nodes)
 
-import basic_deployment
+import 1xx_basic_deployment
 import time
 
 

=== renamed file 'tests/basic_deployment.py' => 'tests/1xx_basic_deployment.py'
=== added file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	1970-01-01 00:00:00 +0000
+++ tests/basic_deployment.py	2015-04-22 21:53:21 +0000
@@ -0,0 +1,159 @@
+#!/usr/bin/python
+
+import amulet
+
+from charmhelpers.contrib.openstack.amulet.deployment import (
+    OpenStackAmuletDeployment
+)
+
+from charmhelpers.contrib.openstack.amulet.utils import (  # noqa
+    OpenStackAmuletUtils,
+    DEBUG,
+    ERROR
+)
+
+# Use DEBUG to turn on debug logging
+u = OpenStackAmuletUtils(DEBUG)
+
+
+class PerconaClusterBasicDeployment(OpenStackAmuletDeployment):
+    """Amulet tests on a basic percona-cluster deployment."""
+
+    def __init__(self, series=None, openstack=None, source=None,
+                 git=False, stable=False):
+        """Deploy the test environment."""
+        super(PerconaClusterBasicDeployment, self).__init__(series, openstack,
+                                                   source, stable)
+        self.git = git
+        self._add_services()
+        self._add_relations()
+        self._configure_services()
+        self._deploy()
+        self._initialize_tests()
+
+    def _add_services(self):
+        """Add services
+
+           Add the services that we're testing, where MySQL 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': 'mysql'}
+        other_services = [{'name': 'keystone'}]
+        super(PerconaClusterBasicDeployment, self)._add_services(this_service,
+                                                        other_services)
+
+    def _add_relations(self):
+        """Add all of the relations for the services."""
+        relations = {'mysql:shared-db': 'keystone:shared-db'}
+        super(PerconaClusterBasicDeployment, self)._add_relations(relations)
+
+    def _configure_services(self):
+        """Configure all of the services."""
+
+        mysql_config = {}
+        keystone_config = {'admin-password': 'openstack',
+                           'admin-token': 'ubuntutesting'}
+
+        configs = {'mysql': mysql_config,
+                   'keystone': keystone_config}
+        super(PerconaClusterBasicDeployment, 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']
+
+        # Authenticate keystone admin
+        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
+                                                      user='admin',
+                                                      password='openstack',
+                                                      tenant='admin')
+
+    def test_100_services(self):
+        """Verify the expected services are running on the corresponding
+           service units."""
+        commands = {
+            self.mysql_sentry: ['status mysql'],
+            self.keystone_sentry: ['status keystone']
+        }
+        ret = u.validate_services(commands)
+        if ret:
+            amulet.raise_status(amulet.FAIL, msg=ret)
+
+    def test_120_pxc_keystone_database_query(self):
+        """Verify that the user table in the keystone mysql database
+           contains an admin user with a specific email address."""
+
+        cmd = ("export FOO=$(sudo cat /var/lib/mysql/mysql.passwd);"
+               "mysql -u root -p$FOO -e "
+               "\"SELECT extra FROM keystone.user WHERE name='admin';\"")
+
+        output, retcode = self.mysql_sentry.run(cmd)
+        u.log.debug('command: `{}` returned {}'.format(cmd, retcode))
+        u.log.debug('output:\n{}'.format(output))
+
+        if retcode:
+            msg = "command `{}` returned {}".format(cmd, str(retcode))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        if "juju@localhost" not in output:
+            msg = ("keystone mysql database query produced "
+                   "unexpected data:\n{}".format(output))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+    def test_150_pxc_shared_db_relation(self):
+        """Verify the mysql shared-db relation data"""
+        unit = self.mysql_sentry
+        relation = ['shared-db', 'keystone:shared-db']
+        expected_data = {
+            'allowed_units': 'keystone/0',
+            'private-address': u.valid_ip,
+            'password': u.not_null,
+            'db_host': u.valid_ip
+        }
+        ret = u.validate_relation_data(unit, relation, expected_data)
+        if ret:
+            message = u.relation_error('mysql shared-db', ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_200_pxc_default_config(self):
+        """Verify some important confg data in the mysql config file's
+           mysqld section."""
+        unit = self.mysql_sentry
+        conf = '/etc/mysql/my.cnf'
+        relation = unit.relation('shared-db', 'keystone:shared-db')
+        u.log.debug('relation: {}'.format(relation))
+        expected = {'user': 'mysql',
+                    'socket': '/var/run/mysqld/mysqld.sock',
+                    'port': '3306',
+                    'basedir': '/usr',
+                    'datadir': '/var/lib/mysql',
+                    'myisam-recover': 'BACKUP',
+                    'query_cache_size': '0',
+                    'query_cache_type': '0',
+                    'tmpdir': '/tmp',
+                    'bind-address': '0.0.0.0',
+                    'log_error': '/var/log/mysql/error.log',
+                    'character-set-server': 'utf8'}
+
+        ret = u.validate_config_data(unit, conf, 'mysqld', expected)
+        if ret:
+            message = "mysql config error: {}".format(ret)
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_900_restart_on_config_change(self):
+        """Verify that mysql is restarted when the config is changed."""
+
+        logging.debug("Changing config on mysql...")
+        self.d.configure('mysql', {'dataset-size': '50%'})
+
+        logging.debug("Checking that the service has restarted...")
+        if not u.service_restarted(self.mysql_sentry, 'mysql',
+                                   '/etc/mysql/my.cnf',
+                                   sleep_time=30):
+            self.d.configure('mysql', {'dataset-size': '80%'})
+            message = "mysql service didn't restart after config change"
+            amulet.raise_status(amulet.FAIL, msg=message)
+        self.d.configure('mysql', {'dataset-size': '80%'})

=== modified file 'tests/charmhelpers/contrib/amulet/utils.py'
--- tests/charmhelpers/contrib/amulet/utils.py	2015-04-15 14:23:37 +0000
+++ tests/charmhelpers/contrib/amulet/utils.py	2015-04-22 21:53:21 +0000
@@ -79,6 +79,9 @@
         for k, v in six.iteritems(commands):
             for cmd in v:
                 output, code = k.run(cmd)
+                self.log.debug('{} `{}` returned '
+                               '{}'.format(k.info['unit_name'],
+                                           cmd, code))
                 if code != 0:
                     return "command `{}` returned {}".format(cmd, str(code))
         return None
@@ -86,7 +89,11 @@
     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()
+
+        # NOTE(beisner):  by default, ConfigParser does not handle options
+        # with no value, such as the flags used in the mysql my.cnf file.
+        # https://bugs.python.org/issue7005
+        config = ConfigParser.ConfigParser(allow_no_value=True)
         config.readfp(io.StringIO(file_contents))
         return config
 

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-17 10:04:59 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-22 21:53:21 +0000
@@ -46,15 +46,22 @@
            stable or next branches for the other_services."""
         base_charms = ['mysql', 'mongodb']
 
+        if self.series in ['precise', 'trusty']:
+            base_series = self.series
+        else:
+            base_series = self.current_next
+
         if self.stable:
             for svc in other_services:
-                temp = 'lp:charms/{}'
-                svc['location'] = temp.format(svc['name'])
+                temp = 'lp:charms/{}/{}'
+                svc['location'] = temp.format(base_series,
+                                              svc['name'])
         else:
             for svc in other_services:
                 if svc['name'] in base_charms:
-                    temp = 'lp:charms/{}'
-                    svc['location'] = temp.format(svc['name'])
+                    temp = 'lp:charms/{}/{}'
+                    svc['location'] = temp.format(base_series,
+                                                  svc['name'])
                 else:
                     temp = 'lp:~openstack-charmers/charms/{}/{}/next'
                     svc['location'] = temp.format(self.current_next,
@@ -99,10 +106,12 @@
            Return an integer representing the enum value of the openstack
            release.
            """
+        # Must be ordered by OpenStack release (not by Ubuntu release):
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
-         self.utopic_juno, self.vivid_kilo) = range(10)
+         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
+         self.trusty_kilo, self.vivid_kilo) = range(10)
+
         releases = {
             ('precise', None): self.precise_essex,
             ('precise', 'cloud:precise-folsom'): self.precise_folsom,