← Back to branch summary

~astara-drivers/charms/trusty/keystone/astara-rebase

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: David Ames
  • Date: 2016-01-21 19:51:44 UTC
  • mfrom: (200.2.5 keystone)
  • Revision ID: david.ames@canonical.com-20160121195144-5z7lunvufeb7x7q3
Tags: 16.01
[1chb1n, r=thedac] wait for unit status and turn on releases for amulet tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
6
6
 
7
7
import amulet
8
8
import os
9
 
import time
10
9
import yaml
11
10
 
12
11
from charmhelpers.contrib.openstack.amulet.deployment import (
36
35
        self._add_relations()
37
36
        self._configure_services()
38
37
        self._deploy()
 
38
 
 
39
        u.log.info('Waiting on extended status checks...')
 
40
        exclude_services = ['mysql']
 
41
        self._auto_wait_for_status(exclude_services=exclude_services)
 
42
 
39
43
        self._initialize_tests()
40
44
 
41
45
    def _assert_services(self, should_run):
52
56
           """
53
57
        this_service = {'name': 'keystone'}
54
58
        other_services = [{'name': 'mysql'},
 
59
                          {'name': 'rabbitmq-server'},  # satisfy wrkload stat
55
60
                          {'name': 'cinder'}]
56
61
        super(KeystoneBasicDeployment, self)._add_services(this_service,
57
62
                                                           other_services)
59
64
    def _add_relations(self):
60
65
        """Add all of the relations for the services."""
61
66
        relations = {'keystone:shared-db': 'mysql:shared-db',
 
67
                     'cinder:shared-db': 'mysql:shared-db',
 
68
                     'cinder:amqp': 'rabbitmq-server:amqp',
62
69
                     'cinder:identity-service': 'keystone:identity-service'}
63
70
        super(KeystoneBasicDeployment, self)._add_relations(relations)
64
71
 
113
120
        u.log.debug('openstack release str: {}'.format(
114
121
            self._get_openstack_release_string()))
115
122
 
116
 
        # Let things settle a bit before moving forward
117
 
        time.sleep(30)
118
 
 
119
123
        # Authenticate keystone admin
120
124
        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
121
125
                                                      user='admin',