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: I284cd94772f2e5d38342330910e835b4feef58af
This commit is contained in:
Ryan Beisner 2016-09-22 17:57:58 +00:00
parent 49b75b04bc
commit cf162a96fc
10 changed files with 30 additions and 57 deletions

View File

@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
use_source = list(set( use_source = list(set(
use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph', use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
'ceph-osd', 'ceph-radosgw', 'ceph-mon', 'ceph-osd', 'ceph-radosgw', 'ceph-mon',
'ceph-proxy'])) 'ceph-proxy', 'percona-cluster', 'lxd']))
# Charms which can not use openstack-origin, ie. many subordinates # Charms which can not use openstack-origin, ie. many subordinates
no_origin = list(set( no_origin = list(set(

View File

@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils):
password, tenant): password, tenant):
"""Authenticates admin user with cinder.""" """Authenticates admin user with cinder."""
# NOTE(beisner): cinder python client doesn't accept tokens. # NOTE(beisner): cinder python client doesn't accept tokens.
service_ip = \ keystone_ip = keystone_sentry.info['public-address']
keystone_sentry.relation('shared-db', ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
'mysql:shared-db')['private-address']
ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
return cinder_client.Client(username, password, tenant, ept) return cinder_client.Client(username, password, tenant, ept)
def authenticate_keystone_admin(self, keystone_sentry, user, password, def authenticate_keystone_admin(self, keystone_sentry, user, password,
@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils):
keystone_ip=None): keystone_ip=None):
"""Authenticates admin user with the keystone admin endpoint.""" """Authenticates admin user with the keystone admin endpoint."""
self.log.debug('Authenticating keystone admin...') self.log.debug('Authenticating keystone admin...')
unit = keystone_sentry
if not keystone_ip: if not keystone_ip:
keystone_ip = unit.relation('shared-db', keystone_ip = keystone_sentry.info['public-address']
'mysql:shared-db')['private-address']
base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8')) base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
if not api_version or api_version == 2: if not api_version or api_version == 2:
ep = base_ep + "/v2.0" ep = base_ep + "/v2.0"

View File

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

View File

@ -50,9 +50,10 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
# XXX: cinder-backup workload status ignored until it grows support # XXX: cinder-backup workload status ignored until it grows support
# https://bugs.launchpad.net/bugs/1604580 # https://bugs.launchpad.net/bugs/1604580
exclude_services = ['mysql', 'cinder-backup'] exclude_services = ['cinder-backup']
self._auto_wait_for_status(exclude_services=exclude_services) self._auto_wait_for_status(exclude_services=exclude_services)
self.d.sentry.wait()
self._initialize_tests() self._initialize_tests()
def _add_services(self): def _add_services(self):
@ -63,12 +64,12 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
# Note: cinder-backup becomes a cinder subordinate unit. # Note: cinder-backup becomes a cinder subordinate unit.
this_service = {'name': 'cinder-backup'} this_service = {'name': 'cinder-backup'}
other_services = [ other_services = [
{'name': 'mysql'}, {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
{'name': 'keystone'}, {'name': 'keystone'},
{'name': 'rabbitmq-server'}, {'name': 'rabbitmq-server'},
{'name': 'ceph', 'units': 3}, {'name': 'ceph', 'units': 3},
{'name': 'cinder'}, {'name': 'cinder'},
{'name': 'cinder-ceph'} {'name': 'cinder-ceph'},
] ]
super(CinderBackupBasicDeployment, self)._add_services(this_service, super(CinderBackupBasicDeployment, self)._add_services(this_service,
other_services) other_services)
@ -81,8 +82,8 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
'cinder-ceph:ceph': 'ceph:client', 'cinder-ceph:ceph': 'ceph:client',
'cinder:storage-backend': 'cinder-ceph:storage-backend', 'cinder:storage-backend': 'cinder-ceph:storage-backend',
'cinder:backup-backend': 'cinder-backup:backup-backend', 'cinder:backup-backend': 'cinder-backup:backup-backend',
'keystone:shared-db': 'mysql:shared-db', 'keystone:shared-db': 'percona-cluster:shared-db',
'cinder:shared-db': 'mysql:shared-db', 'cinder:shared-db': 'percona-cluster:shared-db',
'cinder:identity-service': 'keystone:identity-service', 'cinder:identity-service': 'keystone:identity-service',
'cinder:amqp': 'rabbitmq-server:amqp', 'cinder:amqp': 'rabbitmq-server:amqp',
} }
@ -94,8 +95,11 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
'admin-password': 'openstack', 'admin-password': 'openstack',
'admin-token': 'ubuntutesting' 'admin-token': 'ubuntutesting'
} }
mysql_config = { pxc_config = {
'dataset-size': '50%' 'dataset-size': '25%',
'max-connections': 1000,
'root-password': 'ChangeMe123',
'sst-password': 'ChangeMe123',
} }
cinder_config = { cinder_config = {
'block-device': 'None', 'block-device': 'None',
@ -115,18 +119,18 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
} }
configs = { configs = {
'keystone': keystone_config, 'keystone': keystone_config,
'mysql': mysql_config, 'percona-cluster': pxc_config,
'cinder': cinder_config, 'cinder': cinder_config,
'ceph': ceph_config, 'ceph': ceph_config,
'cinder-ceph': cinder_ceph_config, 'cinder-ceph': cinder_ceph_config,
'cinder-backup': cinder_ceph_config 'cinder-backup': cinder_ceph_config,
} }
super(CinderBackupBasicDeployment, self)._configure_services(configs) super(CinderBackupBasicDeployment, self)._configure_services(configs)
def _initialize_tests(self): def _initialize_tests(self):
"""Perform final initialization before tests get run.""" """Perform final initialization before tests get run."""
# Access the sentries for inspecting service units # Access the sentries for inspecting service units
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.keystone_sentry = self.d.sentry['keystone'][0]
self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0] self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0]
self.cinder_sentry = self.d.sentry['cinder'][0] self.cinder_sentry = self.d.sentry['cinder'][0]
@ -201,7 +205,6 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
def test_102_services(self): def test_102_services(self):
"""Verify the expected services are running on the service units.""" """Verify the expected services are running on the service units."""
services = { services = {
self.mysql_sentry: ['mysql'],
self.rabbitmq_sentry: ['rabbitmq-server'], self.rabbitmq_sentry: ['rabbitmq-server'],
self.keystone_sentry: ['keystone'], self.keystone_sentry: ['keystone'],
self.cinder_sentry: ['cinder-api', self.cinder_sentry: ['cinder-api',
@ -423,7 +426,7 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
def test_204_mysql_cinder_db_relation(self): def test_204_mysql_cinder_db_relation(self):
"""Verify the mysql:glance shared-db relation data""" """Verify the mysql:glance shared-db relation data"""
u.log.debug('Checking mysql:cinder db relation data...') u.log.debug('Checking mysql:cinder db relation data...')
unit = self.mysql_sentry unit = self.pxc_sentry
relation = ['shared-db', 'cinder:shared-db'] relation = ['shared-db', 'cinder:shared-db']
expected = { expected = {
'private-address': u.valid_ip, 'private-address': u.valid_ip,
@ -438,7 +441,7 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
"""Verify the cinder:mysql shared-db relation data""" """Verify the cinder:mysql shared-db relation data"""
u.log.debug('Checking cinder:mysql db relation data...') u.log.debug('Checking cinder:mysql db relation data...')
unit = self.cinder_sentry unit = self.cinder_sentry
relation = ['shared-db', 'mysql:shared-db'] relation = ['shared-db', 'percona-cluster:shared-db']
expected = { expected = {
'private-address': u.valid_ip, 'private-address': u.valid_ip,
'hostname': u.valid_ip, 'hostname': u.valid_ip,

View File

@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
use_source = list(set( use_source = list(set(
use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph', use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
'ceph-osd', 'ceph-radosgw', 'ceph-mon', 'ceph-osd', 'ceph-radosgw', 'ceph-mon',
'ceph-proxy'])) 'ceph-proxy', 'percona-cluster', 'lxd']))
# Charms which can not use openstack-origin, ie. many subordinates # Charms which can not use openstack-origin, ie. many subordinates
no_origin = list(set( no_origin = list(set(

View File

@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils):
password, tenant): password, tenant):
"""Authenticates admin user with cinder.""" """Authenticates admin user with cinder."""
# NOTE(beisner): cinder python client doesn't accept tokens. # NOTE(beisner): cinder python client doesn't accept tokens.
service_ip = \ keystone_ip = keystone_sentry.info['public-address']
keystone_sentry.relation('shared-db', ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
'mysql:shared-db')['private-address']
ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
return cinder_client.Client(username, password, tenant, ept) return cinder_client.Client(username, password, tenant, ept)
def authenticate_keystone_admin(self, keystone_sentry, user, password, def authenticate_keystone_admin(self, keystone_sentry, user, password,
@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils):
keystone_ip=None): keystone_ip=None):
"""Authenticates admin user with the keystone admin endpoint.""" """Authenticates admin user with the keystone admin endpoint."""
self.log.debug('Authenticating keystone admin...') self.log.debug('Authenticating keystone admin...')
unit = keystone_sentry
if not keystone_ip: if not keystone_ip:
keystone_ip = unit.relation('shared-db', keystone_ip = keystone_sentry.info['public-address']
'mysql:shared-db')['private-address']
base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8')) base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
if not api_version or api_version == 2: if not api_version or api_version == 2:
ep = base_ep + "/v2.0" ep = base_ep + "/v2.0"

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 cinder-backup deployment on precise-icehouse."""
from basic_deployment import CinderBackupBasicDeployment
if __name__ == '__main__':
deployment = CinderBackupBasicDeployment(series='precise',
openstack='cloud:precise-icehouse',
source='cloud:precise-updates/icehouse')
deployment.run_tests()

View File

View File

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