openstack
/
charm-ceilometer-agent
Code Issues Proposed changes

Update amulet test definitions for Newton 

- Remove Precise-Icehouse Amulet test definitions if they exist.

- Add Xenial-Newton Amulet test definitions.

- Add Yakkety-Newton Amulet test definitions.

- Use the percona-cluster charm in tests instead of the mysql charm.

Change-Id: I66b28b21fa366ef75ec3c623b8f356dfd1408aec
This commit is contained in:
Ryan Beisner 2016-09-22 17:56:30 +00:00 committed by Liam Young
parent 4d0af8bbf7
commit 3816a26e1f
9 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/charmhelpers/contrib/openstack/amulet/utils.py
View File

@ -315,7 +315,6 @@ class OpenStackAmuletUtils(AmuletUtils):
keystone_ip=None):
"""Authenticates admin user with the keystone admin endpoint."""
self.log.debug('Authenticating keystone admin...')
unit = keystone_sentry
if not keystone_ip:
keystone_ip = keystone_sentry.info['public-address']

5
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -229,6 +229,7 @@ GIT_DEFAULT_REPOS = {
GIT_DEFAULT_BRANCHES = {
'liberty': 'stable/liberty',
'mitaka': 'stable/mitaka',
'newton': 'stable/newton',
'master': 'master',
}
@ -735,12 +736,12 @@ def git_os_codename_install_source(projects_yaml):
if projects in GIT_DEFAULT_BRANCHES.keys():
if projects == 'master':
return 'newton'
return 'ocata'
return projects
if 'release' in projects:
if projects['release'] == 'master':
return 'newton'
return 'ocata'
return projects['release']
return None

85
tests/basic_deployment.py
View File

@ -45,9 +45,10 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
self._deploy()
u.log.info('Waiting on extended status checks...')
exclude_services = ['mysql', 'mongodb']
exclude_services = ['mongodb']
self._auto_wait_for_status(exclude_services=exclude_services)
self.d.sentry.wait()
self._initialize_tests()
def _add_services(self):
@ -59,13 +60,15 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
"""
# Note: ceilometer-agent becomes a subordinate of nova-compute
this_service = {'name': 'ceilometer-agent'}
other_services = [{'name': 'mysql'},
{'name': 'rabbitmq-server'},
{'name': 'keystone'},
{'name': 'mongodb'},
{'name': 'glance'}, # to satisfy workload status
{'name': 'ceilometer'},
{'name': 'nova-compute'}]
other_services = [
{'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
{'name': 'rabbitmq-server'},
{'name': 'keystone'},
{'name': 'mongodb'},
{'name': 'glance'}, # to satisfy workload status
{'name': 'ceilometer'},
{'name': 'nova-compute'}
]
super(CeiloAgentBasicDeployment, self)._add_services(this_service,
other_services)
@ -77,14 +80,14 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
'ceilometer:identity-service': 'keystone:identity-service',
'ceilometer:identity-notifications': 'keystone:'
'identity-notifications',
'keystone:shared-db': 'mysql:shared-db',
'keystone:shared-db': 'percona-cluster:shared-db',
'ceilometer:ceilometer-service': 'ceilometer-agent:'
'ceilometer-service',
'nova-compute:nova-ceilometer': 'ceilometer-agent:nova-ceilometer',
'nova-compute:shared-db': 'mysql:shared-db',
'nova-compute:shared-db': 'percona-cluster:shared-db',
'nova-compute:amqp': 'rabbitmq-server:amqp',
'glance:identity-service': 'keystone:identity-service',
'glance:shared-db': 'mysql:shared-db',
'glance:shared-db': 'percona-cluster:shared-db',
'glance:amqp': 'rabbitmq-server:amqp',
'nova-compute:image-service': 'glance:image-service'
}
@ -92,9 +95,20 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
def _configure_services(self):
"""Configure all of the services."""
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
configs = {'keystone': keystone_config}
keystone_config = {
'admin-password': 'openstack',
'admin-token': 'ubuntutesting'
}
pxc_config = {
'dataset-size': '25%',
'max-connections': 1000,
'root-password': 'ChangeMe123',
'sst-password': 'ChangeMe123',
}
configs = {
'keystone': keystone_config,
'percona-cluster': pxc_config,
}
super(CeiloAgentBasicDeployment, self)._configure_services(configs)
def _get_token(self):
@ -105,7 +119,7 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
# Access the sentries for inspecting service units
self.ceil_sentry = self.d.sentry['ceilometer'][0]
self.ceil_agent_sentry = self.d.sentry['ceilometer-agent'][0]
self.mysql_sentry = self.d.sentry['mysql'][0]
self.pxc_sentry = self.d.sentry['percona-cluster'][0]
self.keystone_sentry = self.d.sentry['keystone'][0]
self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0]
self.mongodb_sentry = self.d.sentry['mongodb'][0]
@ -623,23 +637,32 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
# Services which are expected to restart upon config change,
# and corresponding config files affected by the change
conf_file = '/etc/ceilometer/ceilometer.conf'
services = {
'ceilometer-collector': conf_file,
'ceilometer-api': conf_file,
'ceilometer-agent-notification': conf_file,
}
if self._get_openstack_release() < self.trusty_mitaka:
services['ceilometer-alarm-notifier'] = conf_file
services['ceilometer-alarm-evaluator'] = conf_file
if self._get_openstack_release() == self.trusty_liberty or \
self._get_openstack_release() >= self.wily_liberty:
# Liberty and later
services['ceilometer-polling'] = conf_file
if self._get_openstack_release() >= self.xenial_newton:
services = {
'ceilometer-collector - CollectorService(0)': conf_file,
'ceilometer-api': conf_file,
'ceilometer-polling - AgentManager(0)': conf_file,
'ceilometer-agent-notification - NotificationService(0)':
conf_file,
}
else:
# Juno and earlier
services['ceilometer-agent-central'] = conf_file
services = {
'ceilometer-collector': conf_file,
'ceilometer-api': conf_file,
'ceilometer-agent-notification': conf_file,
}
if self._get_openstack_release() < self.trusty_mitaka:
services['ceilometer-alarm-notifier'] = conf_file
services['ceilometer-alarm-evaluator'] = conf_file
if self._get_openstack_release() == self.trusty_liberty or \
self._get_openstack_release() >= self.wily_liberty:
# Liberty and later
services['ceilometer-polling'] = conf_file
else:
# Juno and earlier
services['ceilometer-agent-central'] = conf_file
# Make config change, check for service restarts
u.log.debug('Making config change on {}...'.format(juju_service))

2
tests/charmhelpers/contrib/amulet/utils.py
View File

@ -546,7 +546,7 @@ class AmuletUtils(object):
raise if it is present.
:returns: List of process IDs
"""
cmd = 'pidof -x {}'.format(process_name)
cmd = 'pidof -x "{}"'.format(process_name)
if not expect_success:
cmd += " || exit 0 && exit 1"
output, code = sentry_unit.run(cmd)

1
tests/charmhelpers/contrib/openstack/amulet/utils.py
View File

@ -315,7 +315,6 @@ class OpenStackAmuletUtils(AmuletUtils):
keystone_ip=None):
"""Authenticates admin user with the keystone admin endpoint."""
self.log.debug('Authenticating keystone admin...')
unit = keystone_sentry
if not keystone_ip:
keystone_ip = keystone_sentry.info['public-address']

25
tests/gate-basic-precise-icehouse
View File

@ -1,25 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Amulet tests on a basic ceilometer-agent deployment on precise-icehouse."""
from basic_deployment import CeiloAgentBasicDeployment
if __name__ == '__main__':
deployment = CeiloAgentBasicDeployment(series='precise',
openstack='cloud:precise-icehouse',
source='cloud:precise-updates/icehouse')
deployment.run_tests()

0
tests/dev-basic-xenial-newton → tests/gate-basic-xenial-newton
View File

0
tests/dev-basic-yakkety-newton → tests/gate-basic-yakkety-newton Executable file → Normal file
View File

2
tests/tests.yaml
View File

@ -1,6 +1,6 @@
# Bootstrap the model if necessary.
bootstrap: True
# Re-use bootstrap node instead of destroying/re-bootstrapping.
# Re-use bootstrap node.
reset: True
# Use tox/requirements to drive the venv instead of bundletester's venv feature.
virtualenv: False