Merge lp:~corey.bryant/charms/trusty/keystone/sync-charm-helpers into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Corey Bryant]

There are 3 commits to bring keystone amulet tests up to speed with the latest fixes in charm-helpers.

[lp:~corey.bryant/charms/trusty/keystone/sync-charm-helpers]

69. By James Page on 2014-07-01

[coreycb,r=james-page] Resync helpers, specify source as well.

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-06-24 17:11:12 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-07-01 14:39:58 +0000
@@ -7,19 +7,36 @@
     """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=None, 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:
+                if svc[name] not in use_source:
+                    config = {'openstack-origin': self.openstack}
+                    self.d.configure(svc[name], config)
+
+        if self.source:
+            for svc in services:
+                if svc[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 17:11:12 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2014-07-01 14:39:58 +0000
@@ -74,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):
@@ -91,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):
@@ -110,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):
@@ -192,8 +192,8 @@
 
         count = 1
         status = instance.status
-        while status == 'BUILD' and count < 10:
-            time.sleep(5)
+        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))

=== modified file 'tests/11-basic-precise-folsom'
--- tests/11-basic-precise-folsom	2014-06-24 17:11:36 +0000
+++ tests/11-basic-precise-folsom	2014-07-01 14:39:58 +0000
@@ -6,5 +6,6 @@
 
 if __name__ == '__main__':
     deployment = KeystoneBasicDeployment(series='precise',
-                                         openstack='cloud:precise-folsom')
+                                         openstack='cloud:precise-folsom',
+                                         source='cloud:precise-updates/folsom')
     deployment.run_tests()

=== modified file 'tests/12-basic-precise-grizzly'
--- tests/12-basic-precise-grizzly	2014-06-24 17:11:36 +0000
+++ tests/12-basic-precise-grizzly	2014-07-01 14:39:58 +0000
@@ -6,5 +6,6 @@
 
 if __name__ == '__main__':
     deployment = KeystoneBasicDeployment(series='precise',
-                                         openstack='cloud:precise-grizzly')
+                                         openstack='cloud:precise-grizzly',
+                                         source='cloud:precise-updates/grizzly')
     deployment.run_tests()

=== modified file 'tests/13-basic-precise-havana'
--- tests/13-basic-precise-havana	2014-06-24 17:11:36 +0000
+++ tests/13-basic-precise-havana	2014-07-01 14:39:58 +0000
@@ -6,5 +6,6 @@
 
 if __name__ == '__main__':
     deployment = KeystoneBasicDeployment(series='precise',
-                                         openstack='cloud:precise-havana')
+                                         openstack='cloud:precise-havana',
+                                         source='cloud:precise-updates/havana')
     deployment.run_tests()

=== modified file 'tests/14-basic-precise-icehouse'
--- tests/14-basic-precise-icehouse	2014-06-24 17:11:36 +0000
+++ tests/14-basic-precise-icehouse	2014-07-01 14:39:58 +0000
@@ -6,5 +6,6 @@
 
 if __name__ == '__main__':
     deployment = KeystoneBasicDeployment(series='precise',
-                                         openstack='cloud:precise-icehouse')
+                                         openstack='cloud:precise-icehouse',
+                                         source='cloud:precise-updates/icehouse')
     deployment.run_tests()

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-06-24 17:11:36 +0000
+++ tests/basic_deployment.py	2014-07-01 14:39:58 +0000
@@ -19,9 +19,9 @@
 class KeystoneBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic keystone deployment."""
 
-    def __init__(self, series=None, openstack=None):
+    def __init__(self, series=None, openstack=None, source=None):
         """Deploy the entire test environment."""
-        super(KeystoneBasicDeployment, self).__init__(series, openstack)
+        super(KeystoneBasicDeployment, self).__init__(series, openstack, source)
         self._add_services()
         self._add_relations()
         self._configure_services()
@@ -90,11 +90,10 @@
         """Verify the expected services are running on the corresponding
            service units."""
         commands = {
-            self.mysql_sentry: 'status mysql',
-            self.keystone_sentry: 'status keystone',
-            self.cinder_sentry: 'status cinder-api',
-            self.cinder_sentry: 'status cinder-scheduler',
-            self.cinder_sentry: 'status cinder-volume'
+            self.mysql_sentry: ['status mysql'],
+            self.keystone_sentry: ['status keystone'],
+            self.cinder_sentry: ['status cinder-api', 'status cinder-scheduler',
+                                 'status cinder-volume']
         }
         ret = u.validate_services(commands)
         if ret:

=== modified file 'tests/charmhelpers/contrib/amulet/utils.py'
--- tests/charmhelpers/contrib/amulet/utils.py	2014-06-24 17:11:12 +0000
+++ tests/charmhelpers/contrib/amulet/utils.py	2014-07-01 14:39:58 +0000
@@ -53,9 +53,10 @@
         """Verify the specified services are running on the corresponding
            service units."""
         for k, v in commands.iteritems():
-            output, code = k.run(v)
-            if code != 0:
-                return "command `{}` returned {}".format(v, str(code))
+            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):
@@ -126,21 +127,24 @@
         """Get last modification time of directory."""
         return sentry_unit.directory_stat(directory)['mtime']
 
-    def _get_proc_start_time(self, sentry_unit, service):
+    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.  The servie string will be matched
-           against any substring in the full command line, choosing the oldest
-           process."""
-        cmd = 'pgrep -f -o {}'.format(service)
+           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):
+    def service_restarted(self, sentry_unit, service, filename,
+                          pgrep_full=False):
         """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(10)
-        if self._get_proc_start_time(sentry_unit, service) >= \
+        if self._get_proc_start_time(sentry_unit, service, pgrep_full) >= \
            self._get_file_mtime(sentry_unit, filename):
             return True
         else:

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2014-06-24 17:11:12 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2014-07-01 14:39:58 +0000
@@ -7,19 +7,36 @@
     """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=None, 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:
+                if svc[name] not in use_source:
+                    config = {'openstack-origin': self.openstack}
+                    self.d.configure(svc[name], config)
+
+        if self.source:
+            for svc in services:
+                if svc[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 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	2014-06-24 17:11:12 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2014-07-01 14:39:58 +0000
@@ -74,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):
@@ -91,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):
@@ -110,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):
@@ -192,8 +192,8 @@
 
         count = 1
         status = instance.status
-        while status == 'BUILD' and count < 10:
-            time.sleep(5)
+        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))