Update functional test suite
The premise of this functional test is to be a black-box functional check: can the charm sync an image? If so, job-done, move along. Other explicit checks which came along with legacy charm tests have proven to be brittle and of little value in catching actual, meaningful issues. As such, remove those introspections.
This commit is contained in:
Ryan Beisner
parent
266a7abaf8
commit
ad18257148
|
|
@ -202,20 +202,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
|
|||
u.log.debug('Permissions on {}: {}'.format(
|
||||
_check['file_path'], output))
|
||||
|
||||
def test_100_services(self):
|
||||
"""Verify that the expected services are running on the
|
||||
corresponding service units."""
|
||||
services = {
|
||||
self.keystone_sentry: ['keystone'],
|
||||
self.glance_sentry: ['glance-api', 'glance-registry'],
|
||||
self.rabbitmq_sentry: ['rabbitmq-server']
|
||||
}
|
||||
if self._get_openstack_release() >= self.trusty_liberty:
|
||||
services[self.keystone_sentry] = ['apache2']
|
||||
ret = u.validate_services_by_name(services)
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL, msg=ret)
|
||||
|
||||
def test_102_service_catalog(self):
|
||||
"""Verify that the service catalog endpoint data is valid."""
|
||||
u.log.debug('Checking keystone service catalog...')
|
||||
|
|
@ -227,6 +213,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
|
|||
'internalURL': u.valid_url
|
||||
}
|
||||
expected = {
|
||||
'product-streams': [endpoint_check],
|
||||
'image': [endpoint_check],
|
||||
'identity': [endpoint_check]
|
||||
}
|
||||
|
|
@ -239,88 +226,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
|
|||
if ret:
|
||||
amulet.raise_status(amulet.FAIL, msg=ret)
|
||||
|
||||
def test_104_glance_endpoint(self):
|
||||
"""Verify the glance endpoint data."""
|
||||
u.log.debug('Checking glance api endpoint data...')
|
||||
endpoints = self.keystone.endpoints.list()
|
||||
admin_port = internal_port = public_port = '9292'
|
||||
expected = {
|
||||
'id': u.not_null,
|
||||
'region': 'RegionOne',
|
||||
'adminurl': u.valid_url,
|
||||
'internalurl': u.valid_url,
|
||||
'publicurl': u.valid_url,
|
||||
'service_id': u.not_null
|
||||
}
|
||||
ret = u.validate_endpoint_data(
|
||||
endpoints,
|
||||
admin_port,
|
||||
internal_port,
|
||||
public_port,
|
||||
expected,
|
||||
openstack_release=self._get_openstack_release())
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL,
|
||||
msg='glance endpoint: {}'.format(ret))
|
||||
|
||||
def test_106_keystone_endpoint(self):
|
||||
"""Verify the keystone endpoint data."""
|
||||
u.log.debug('Checking keystone api endpoint data...')
|
||||
endpoints = self.keystone.endpoints.list()
|
||||
admin_port = '35357'
|
||||
internal_port = public_port = '5000'
|
||||
expected = {
|
||||
'id': u.not_null,
|
||||
'region': 'RegionOne',
|
||||
'adminurl': u.valid_url,
|
||||
'internalurl': u.valid_url,
|
||||
'publicurl': u.valid_url,
|
||||
'service_id': u.not_null
|
||||
}
|
||||
ret = u.validate_endpoint_data(
|
||||
endpoints,
|
||||
admin_port,
|
||||
internal_port,
|
||||
public_port,
|
||||
expected,
|
||||
openstack_release=self._get_openstack_release())
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL,
|
||||
msg='keystone endpoint: {}'.format(ret))
|
||||
|
||||
def test_110_users(self):
|
||||
"""Verify expected users."""
|
||||
u.log.debug('Checking keystone users...')
|
||||
if self._get_openstack_release() >= self.xenial_queens:
|
||||
expected = [
|
||||
{'name': 'glance',
|
||||
'enabled': True,
|
||||
'default_project_id': u.not_null,
|
||||
'id': u.not_null,
|
||||
'email': 'juju@localhost'}
|
||||
]
|
||||
domain = self.keystone.domains.find(name='service_domain')
|
||||
actual = self.keystone.users.list(domain=domain)
|
||||
api_version = 3
|
||||
else:
|
||||
expected = [
|
||||
{'name': 'glance',
|
||||
'enabled': True,
|
||||
'tenantId': u.not_null,
|
||||
'id': u.not_null,
|
||||
'email': 'juju@localhost'},
|
||||
{'name': 'admin',
|
||||
'enabled': True,
|
||||
'tenantId': u.not_null,
|
||||
'id': u.not_null,
|
||||
'email': 'juju@localhost'}
|
||||
]
|
||||
actual = self.keystone.users.list()
|
||||
api_version = 2
|
||||
ret = u.validate_user_data(expected, actual, api_version)
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL, msg=ret)
|
||||
|
||||
def test_115_memcache(self):
|
||||
u.validate_memcache(self.glance_sentry,
|
||||
'/etc/glance/glance-api.conf',
|
||||
|
|
@ -330,315 +235,3 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
|
|||
'/etc/glance/glance-registry.conf',
|
||||
self._get_openstack_release(),
|
||||
earliest_release=self.trusty_mitaka)
|
||||
|
||||
def test_200_mysql_glance_db_relation(self):
|
||||
"""Verify the mysql:glance shared-db relation data"""
|
||||
u.log.debug('Checking mysql to glance shared-db relation data...')
|
||||
unit = self.pxc_sentry
|
||||
relation = ['shared-db', 'glance:shared-db']
|
||||
expected = {
|
||||
'private-address': u.valid_ip,
|
||||
'db_host': u.valid_ip
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('mysql shared-db', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_201_glance_mysql_db_relation(self):
|
||||
"""Verify the glance:mysql shared-db relation data"""
|
||||
u.log.debug('Checking glance to mysql shared-db relation data...')
|
||||
unit = self.glance_sentry
|
||||
relation = ['shared-db', 'percona-cluster:shared-db']
|
||||
expected = {
|
||||
'private-address': u.valid_ip,
|
||||
'hostname': u.valid_ip,
|
||||
'username': 'glance',
|
||||
'database': 'glance'
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('glance shared-db', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_202_keystone_glance_id_relation(self):
|
||||
"""Verify the keystone:glance identity-service relation data"""
|
||||
u.log.debug('Checking keystone to glance id relation data...')
|
||||
unit = self.keystone_sentry
|
||||
relation = ['identity-service',
|
||||
'glance:identity-service']
|
||||
expected = {
|
||||
'service_protocol': 'http',
|
||||
'service_tenant': 'services',
|
||||
'admin_token': 'ubuntutesting',
|
||||
'service_password': u.not_null,
|
||||
'service_port': '5000',
|
||||
'auth_port': '35357',
|
||||
'auth_protocol': 'http',
|
||||
'private-address': u.valid_ip,
|
||||
'auth_host': u.valid_ip,
|
||||
'service_username': 'glance',
|
||||
'service_tenant_id': u.not_null,
|
||||
'service_host': u.valid_ip
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('keystone identity-service', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_203_glance_keystone_id_relation(self):
|
||||
"""Verify the glance:keystone identity-service relation data"""
|
||||
u.log.debug('Checking glance to keystone relation data...')
|
||||
unit = self.glance_sentry
|
||||
relation = ['identity-service',
|
||||
'keystone:identity-service']
|
||||
expected = {
|
||||
'service': 'glance',
|
||||
'region': 'RegionOne',
|
||||
'public_url': u.valid_url,
|
||||
'internal_url': u.valid_url,
|
||||
'admin_url': u.valid_url,
|
||||
'private-address': u.valid_ip
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('glance identity-service', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_204_rabbitmq_glance_amqp_relation(self):
|
||||
"""Verify the rabbitmq-server:glance amqp relation data"""
|
||||
u.log.debug('Checking rmq to glance amqp relation data...')
|
||||
unit = self.rabbitmq_sentry
|
||||
relation = ['amqp', 'glance:amqp']
|
||||
expected = {
|
||||
'private-address': u.valid_ip,
|
||||
'password': u.not_null,
|
||||
'hostname': u.valid_ip
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('rabbitmq amqp', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_205_glance_rabbitmq_amqp_relation(self):
|
||||
"""Verify the glance:rabbitmq-server amqp relation data"""
|
||||
u.log.debug('Checking glance to rmq amqp relation data...')
|
||||
unit = self.glance_sentry
|
||||
relation = ['amqp', 'rabbitmq-server:amqp']
|
||||
expected = {
|
||||
'private-address': u.valid_ip,
|
||||
'vhost': 'openstack',
|
||||
'username': u.not_null
|
||||
}
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('glance amqp', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def _get_keystone_authtoken_expected_dict(self, rel_ks_gl):
|
||||
"""Return expected authtoken dict for OS release"""
|
||||
auth_uri = ('http://%s:%s/' %
|
||||
(rel_ks_gl['auth_host'], rel_ks_gl['service_port']))
|
||||
auth_url = ('http://%s:%s/' %
|
||||
(rel_ks_gl['auth_host'], rel_ks_gl['auth_port']))
|
||||
if self._get_openstack_release() >= self.xenial_queens:
|
||||
expected = {
|
||||
'keystone_authtoken': {
|
||||
'auth_uri': auth_uri.rstrip('/'),
|
||||
'auth_url': auth_url.rstrip('/'),
|
||||
'auth_type': 'password',
|
||||
'project_domain_name': 'service_domain',
|
||||
'user_domain_name': 'service_domain',
|
||||
'project_name': 'services',
|
||||
'username': rel_ks_gl['service_username'],
|
||||
'password': rel_ks_gl['service_password'],
|
||||
'signing_dir': '/var/cache/glance'
|
||||
}
|
||||
}
|
||||
elif self._get_openstack_release() >= self.trusty_mitaka:
|
||||
expected = {
|
||||
'keystone_authtoken': {
|
||||
'auth_uri': auth_uri.rstrip('/'),
|
||||
'auth_url': auth_url.rstrip('/'),
|
||||
'auth_type': 'password',
|
||||
'project_domain_name': 'default',
|
||||
'user_domain_name': 'default',
|
||||
'project_name': 'services',
|
||||
'username': rel_ks_gl['service_username'],
|
||||
'password': rel_ks_gl['service_password'],
|
||||
'signing_dir': '/var/cache/glance'
|
||||
}
|
||||
}
|
||||
elif self._get_openstack_release() >= self.trusty_liberty:
|
||||
expected = {
|
||||
'keystone_authtoken': {
|
||||
'auth_uri': auth_uri.rstrip('/'),
|
||||
'auth_url': auth_url.rstrip('/'),
|
||||
'auth_plugin': 'password',
|
||||
'project_domain_id': 'default',
|
||||
'user_domain_id': 'default',
|
||||
'project_name': 'services',
|
||||
'username': rel_ks_gl['service_username'],
|
||||
'password': rel_ks_gl['service_password'],
|
||||
'signing_dir': '/var/cache/glance'
|
||||
}
|
||||
}
|
||||
elif self._get_openstack_release() >= self.trusty_kilo:
|
||||
expected = {
|
||||
'keystone_authtoken': {
|
||||
'project_name': 'services',
|
||||
'username': 'glance',
|
||||
'password': rel_ks_gl['service_password'],
|
||||
'auth_uri': u.valid_url,
|
||||
'auth_url': u.valid_url,
|
||||
'signing_dir': '/var/cache/glance',
|
||||
}
|
||||
}
|
||||
else:
|
||||
expected = {
|
||||
'keystone_authtoken': {
|
||||
'auth_uri': u.valid_url,
|
||||
'auth_host': rel_ks_gl['auth_host'],
|
||||
'auth_port': rel_ks_gl['auth_port'],
|
||||
'auth_protocol': rel_ks_gl['auth_protocol'],
|
||||
'admin_tenant_name': 'services',
|
||||
'admin_user': 'glance',
|
||||
'admin_password': rel_ks_gl['service_password'],
|
||||
'signing_dir': '/var/cache/glance',
|
||||
}
|
||||
}
|
||||
|
||||
return expected
|
||||
|
||||
def test_300_glance_api_default_config(self):
|
||||
"""Verify default section configs in glance-api.conf and
|
||||
compare some of the parameters to relation data."""
|
||||
u.log.debug('Checking glance api config file...')
|
||||
unit = self.glance_sentry
|
||||
unit_ks = self.keystone_sentry
|
||||
rel_mq_gl = self.rabbitmq_sentry.relation('amqp', 'glance:amqp')
|
||||
rel_ks_gl = unit_ks.relation('identity-service',
|
||||
'glance:identity-service')
|
||||
rel_my_gl = self.pxc_sentry.relation('shared-db', 'glance:shared-db')
|
||||
db_uri = "mysql://{}:{}@{}/{}".format('glance', rel_my_gl['password'],
|
||||
rel_my_gl['db_host'], 'glance')
|
||||
conf = '/etc/glance/glance-api.conf'
|
||||
expected = {
|
||||
'DEFAULT': {
|
||||
'debug': 'False',
|
||||
'verbose': 'False',
|
||||
'use_syslog': 'False',
|
||||
'log_file': '/var/log/glance/api.log',
|
||||
'bind_host': '0.0.0.0',
|
||||
'bind_port': '9282',
|
||||
'registry_host': '0.0.0.0',
|
||||
'registry_port': '9191',
|
||||
'registry_client_protocol': 'http',
|
||||
'delayed_delete': 'False',
|
||||
'scrub_time': '43200',
|
||||
'notification_driver': 'rabbit',
|
||||
'scrubber_datadir': '/var/lib/glance/scrubber',
|
||||
'image_cache_dir': '/var/lib/glance/image-cache/',
|
||||
'db_enforce_mysql_charset': 'False'
|
||||
},
|
||||
}
|
||||
|
||||
expected.update(self._get_keystone_authtoken_expected_dict(rel_ks_gl))
|
||||
|
||||
if self._get_openstack_release() >= self.trusty_kilo:
|
||||
# Kilo or later
|
||||
expected['oslo_messaging_rabbit'] = {
|
||||
'rabbit_userid': 'glance',
|
||||
'rabbit_virtual_host': 'openstack',
|
||||
'rabbit_password': rel_mq_gl['password'],
|
||||
'rabbit_host': rel_mq_gl['hostname']
|
||||
}
|
||||
expected['glance_store'] = {
|
||||
'filesystem_store_datadir': '/var/lib/glance/images/',
|
||||
'stores': 'glance.store.filesystem.'
|
||||
'Store,glance.store.http.Store',
|
||||
'default_store': 'file'
|
||||
}
|
||||
expected['database'] = {
|
||||
'idle_timeout': '3600',
|
||||
'connection': db_uri
|
||||
}
|
||||
|
||||
if self._get_openstack_release() >= self.trusty_mitaka:
|
||||
del expected['DEFAULT']['notification_driver']
|
||||
connection_uri = (
|
||||
"rabbit://glance:{}@{}:5672/"
|
||||
"openstack".format(rel_mq_gl['password'],
|
||||
rel_mq_gl['hostname'])
|
||||
)
|
||||
expected['oslo_messaging_notifications'] = {
|
||||
'driver': 'messagingv2',
|
||||
'transport_url': connection_uri
|
||||
}
|
||||
else:
|
||||
expected['DEFAULT']['notification_driver'] = 'messagingv2'
|
||||
|
||||
else:
|
||||
# Juno or earlier
|
||||
expected['DEFAULT'].update({
|
||||
'rabbit_userid': 'glance',
|
||||
'rabbit_virtual_host': 'openstack',
|
||||
'rabbit_password': rel_mq_gl['password'],
|
||||
'rabbit_host': rel_mq_gl['hostname'],
|
||||
'filesystem_store_datadir': '/var/lib/glance/images/',
|
||||
'default_store': 'file',
|
||||
})
|
||||
expected['database'] = {
|
||||
'sql_idle_timeout': '3600',
|
||||
'connection': db_uri
|
||||
}
|
||||
|
||||
for section, pairs in expected.iteritems():
|
||||
ret = u.validate_config_data(unit, conf, section, pairs)
|
||||
if ret:
|
||||
message = "glance api config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_302_glance_registry_default_config(self):
|
||||
"""Verify configs in glance-registry.conf"""
|
||||
u.log.debug('Checking glance registry config file...')
|
||||
unit = self.glance_sentry
|
||||
unit_ks = self.keystone_sentry
|
||||
rel_ks_gl = unit_ks.relation('identity-service',
|
||||
'glance:identity-service')
|
||||
rel_my_gl = self.pxc_sentry.relation('shared-db', 'glance:shared-db')
|
||||
db_uri = "mysql://{}:{}@{}/{}".format('glance', rel_my_gl['password'],
|
||||
rel_my_gl['db_host'], 'glance')
|
||||
conf = '/etc/glance/glance-registry.conf'
|
||||
|
||||
expected = {
|
||||
'DEFAULT': {
|
||||
'use_syslog': 'False',
|
||||
'log_file': '/var/log/glance/registry.log',
|
||||
'debug': 'False',
|
||||
'verbose': 'False',
|
||||
'bind_host': '0.0.0.0',
|
||||
'bind_port': '9191'
|
||||
},
|
||||
}
|
||||
|
||||
if self._get_openstack_release() >= self.trusty_kilo:
|
||||
# Kilo or later
|
||||
expected['database'] = {
|
||||
'idle_timeout': '3600',
|
||||
'connection': db_uri
|
||||
}
|
||||
else:
|
||||
# Juno or earlier
|
||||
expected['database'] = {
|
||||
'idle_timeout': '3600',
|
||||
'connection': db_uri
|
||||
}
|
||||
|
||||
expected.update(self._get_keystone_authtoken_expected_dict(rel_ks_gl))
|
||||
|
||||
for section, pairs in expected.iteritems():
|
||||
ret = u.validate_config_data(unit, conf, section, pairs)
|
||||
if ret:
|
||||
message = "glance registry paste config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
|
|
|||
Loading…
Reference in New Issue