Switch tests to zaza
Change-Id: I1fe800a6805b572cbac18efff92165fd82c03223
This commit is contained in:
Liam Young
parent
e2b4b064d5
commit
9a67dc3d2d
|
|
@ -1,29 +1,18 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# TODO: Distill the func test requirements from the lint/unit test
|
||||
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||
# all of its own requirements and if it doesn't, fix it there.
|
||||
#
|
||||
charm-tools>=2.4.4
|
||||
coverage>=3.6
|
||||
requests>=2.18.4
|
||||
mock>=1.2
|
||||
flake8>=2.2.4,<=2.4.1
|
||||
stestr>=2.2.0
|
||||
requests>=2.18.4
|
||||
# BEGIN: Amulet OpenStack Charm Helper Requirements
|
||||
# Liberty client lower constraints
|
||||
amulet>=1.14.3,<2.0;python_version=='2.7'
|
||||
bundletester>=0.6.1,<1.0;python_version=='2.7'
|
||||
python-ceilometerclient>=1.5.0
|
||||
python-cinderclient>=1.4.0,<5.0.0
|
||||
python-glanceclient>=1.1.0
|
||||
python-heatclient>=0.8.0
|
||||
python-keystoneclient>=1.7.1
|
||||
python-neutronclient>=3.1.0
|
||||
python-novaclient>=2.30.1
|
||||
python-openstackclient>=1.7.0
|
||||
python-swiftclient>=2.6.0
|
||||
pika>=0.10.0,<1.0
|
||||
distro-info
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
# END: Amulet OpenStack Charm Helper Requirements
|
||||
# NOTE: workaround for 14.04 pip/tox
|
||||
pytz
|
||||
pyudev # for ceph-* charm unit tests (not mocked?)
|
||||
coverage>=4.5.2
|
||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
# Overview
|
||||
|
||||
This directory provides Amulet tests to verify basic deployment functionality
|
||||
from the perspective of this charm, its requirements and its features, as
|
||||
exercised in a subset of the full OpenStack deployment test bundle topology.
|
||||
|
||||
For full details on functional testing of OpenStack charms please refer to
|
||||
the [functional testing](http://docs.openstack.org/developer/charm-guide/testing.html#functional-testing)
|
||||
section of the OpenStack Charm Guide.
|
||||
|
|
@ -1,619 +0,0 @@
|
|||
# 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.
|
||||
|
||||
import amulet
|
||||
import swiftclient
|
||||
|
||||
import keystoneclient
|
||||
from keystoneclient.v3 import client as keystone_client_v3
|
||||
|
||||
from charmhelpers.contrib.openstack.amulet.deployment import (
|
||||
OpenStackAmuletDeployment
|
||||
)
|
||||
|
||||
from charmhelpers.contrib.openstack.amulet.utils import (
|
||||
OpenStackAmuletUtils,
|
||||
DEBUG,
|
||||
)
|
||||
|
||||
# Use DEBUG to turn on debug logging
|
||||
u = OpenStackAmuletUtils(DEBUG)
|
||||
|
||||
|
||||
class SwiftStorageBasicDeployment(OpenStackAmuletDeployment):
|
||||
"""Amulet tests on a basic swift-storage deployment."""
|
||||
|
||||
def __init__(self, series, openstack=None, source=None, stable=False):
|
||||
"""Deploy the entire test environment."""
|
||||
super(SwiftStorageBasicDeployment, self).__init__(series, openstack,
|
||||
source, stable)
|
||||
self._add_services()
|
||||
self._add_relations()
|
||||
self._configure_services()
|
||||
self._deploy()
|
||||
|
||||
u.log.info('Waiting on extended status checks...')
|
||||
exclude_services = []
|
||||
|
||||
# Wait for deployment ready msgs, except exclusions
|
||||
self._auto_wait_for_status(exclude_services=exclude_services)
|
||||
|
||||
self.d.sentry.wait()
|
||||
self._initialize_tests()
|
||||
|
||||
def _add_services(self):
|
||||
"""Add services
|
||||
|
||||
Add the services that we're testing, where swift-storage is local,
|
||||
and the rest of the service are from lp branches that are
|
||||
compatible with the local charm (e.g. stable or next).
|
||||
"""
|
||||
this_service = {'name': 'swift-storage'}
|
||||
other_services = [
|
||||
self.get_percona_service_entry(),
|
||||
{'name': 'keystone'},
|
||||
{'name': 'glance'},
|
||||
{'name': 'swift-proxy'}
|
||||
]
|
||||
super(SwiftStorageBasicDeployment, self)._add_services(this_service,
|
||||
other_services)
|
||||
|
||||
def _add_relations(self):
|
||||
"""Add all of the relations for the services."""
|
||||
relations = {
|
||||
'keystone:shared-db': 'percona-cluster:shared-db',
|
||||
'swift-proxy:identity-service': 'keystone:identity-service',
|
||||
'swift-storage:swift-storage': 'swift-proxy:swift-storage',
|
||||
'glance:identity-service': 'keystone:identity-service',
|
||||
'glance:shared-db': 'percona-cluster:shared-db',
|
||||
'glance:object-store': 'swift-proxy:object-store'
|
||||
}
|
||||
super(SwiftStorageBasicDeployment, self)._add_relations(relations)
|
||||
|
||||
def _configure_services(self):
|
||||
"""Configure all of the services."""
|
||||
keystone_config = {
|
||||
'admin-password': 'openstack',
|
||||
'admin-token': 'ubuntutesting',
|
||||
}
|
||||
swift_proxy_config = {
|
||||
'zone-assignment': 'manual',
|
||||
'replicas': '1',
|
||||
'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae',
|
||||
}
|
||||
swift_storage_config = {
|
||||
'zone': '1',
|
||||
'block-device': 'vdb',
|
||||
'overwrite': 'true',
|
||||
'ephemeral-unmount': '/mnt',
|
||||
}
|
||||
pxc_config = {
|
||||
'innodb-buffer-pool-size': '256M',
|
||||
'max-connections': 1000,
|
||||
}
|
||||
configs = {
|
||||
'keystone': keystone_config,
|
||||
'swift-proxy': swift_proxy_config,
|
||||
'swift-storage': swift_storage_config,
|
||||
'percona-cluster': pxc_config,
|
||||
}
|
||||
super(SwiftStorageBasicDeployment, self)._configure_services(configs)
|
||||
|
||||
def _initialize_tests(self):
|
||||
"""Perform final initialization before tests get run."""
|
||||
# Access the sentries for inspecting service units
|
||||
self.pxc_sentry = self.d.sentry['percona-cluster'][0]
|
||||
self.keystone_sentry = self.d.sentry['keystone'][0]
|
||||
self.glance_sentry = self.d.sentry['glance'][0]
|
||||
self.swift_proxy_sentry = self.d.sentry['swift-proxy'][0]
|
||||
self.swift_storage_sentry = self.d.sentry['swift-storage'][0]
|
||||
|
||||
u.log.debug('openstack release val: {}'.format(
|
||||
self._get_openstack_release()))
|
||||
u.log.debug('openstack release str: {}'.format(
|
||||
self._get_openstack_release_string()))
|
||||
|
||||
# Authenticate admin with keystone
|
||||
self.keystone_session, self.keystone = (
|
||||
u.get_default_keystone_session(self.keystone_sentry,
|
||||
self._get_openstack_release())
|
||||
)
|
||||
|
||||
force_v1_client = False
|
||||
if self._get_openstack_release() == self.trusty_icehouse:
|
||||
# Updating image properties (such as arch or hypervisor) using the
|
||||
# v2 api in icehouse results in:
|
||||
# https://bugs.launchpad.net/python-glanceclient/+bug/1371559
|
||||
u.log.debug('Forcing glance to use v1 api')
|
||||
force_v1_client = True
|
||||
|
||||
# Authenticate admin with glance endpoint
|
||||
self.glance = u.authenticate_glance_admin(
|
||||
self.keystone,
|
||||
force_v1_client=force_v1_client)
|
||||
|
||||
keystone_ip = self.keystone_sentry.info['public-address']
|
||||
keystone_relation = self.keystone_sentry.relation(
|
||||
'identity-service', 'swift-proxy:identity-service')
|
||||
|
||||
# Create a demo tenant/role/user
|
||||
self.demo_tenant = 'demoTenant'
|
||||
self.demo_role = 'demoRole'
|
||||
self.demo_user = 'demoUser'
|
||||
self.demo_project = 'demoProject'
|
||||
self.demo_domain = 'demoDomain'
|
||||
|
||||
if self._get_openstack_release() >= self.xenial_queens:
|
||||
self.create_users_v3()
|
||||
self.demo_user_session, _ = u.get_keystone_session(
|
||||
keystone_ip,
|
||||
self.demo_user,
|
||||
'password',
|
||||
api_version=3,
|
||||
user_domain_name=self.demo_domain,
|
||||
project_domain_name=self.demo_domain,
|
||||
project_name=self.demo_project
|
||||
)
|
||||
self.keystone_demo = keystone_client_v3.Client(
|
||||
session=self.demo_user_session)
|
||||
self.service_session, _ = u.get_keystone_session(
|
||||
keystone_ip,
|
||||
keystone_relation['service_username'],
|
||||
keystone_relation['service_password'],
|
||||
api_version=3,
|
||||
user_domain_name=keystone_relation['service_domain'],
|
||||
project_domain_name=keystone_relation['service_domain'],
|
||||
project_name=keystone_relation['service_tenant']
|
||||
)
|
||||
else:
|
||||
self.create_users_v2()
|
||||
# Authenticate demo user with keystone
|
||||
self.keystone_demo = \
|
||||
u.authenticate_keystone_user(
|
||||
self.keystone, user=self.demo_user,
|
||||
password='password',
|
||||
tenant=self.demo_tenant)
|
||||
self.service_session, _ = u.get_keystone_session(
|
||||
keystone_ip,
|
||||
keystone_relation['service_username'],
|
||||
keystone_relation['service_password'],
|
||||
api_version=2,
|
||||
project_name=keystone_relation['service_tenant']
|
||||
)
|
||||
self.swift = swiftclient.Connection(session=self.service_session)
|
||||
|
||||
def create_users_v3(self):
|
||||
try:
|
||||
self.keystone.projects.find(name=self.demo_project)
|
||||
except keystoneclient.exceptions.NotFound:
|
||||
domain = self.keystone.domains.create(
|
||||
self.demo_domain,
|
||||
description='Demo Domain',
|
||||
enabled=True
|
||||
)
|
||||
project = self.keystone.projects.create(
|
||||
self.demo_project,
|
||||
domain,
|
||||
description='Demo Project',
|
||||
enabled=True,
|
||||
)
|
||||
user = self.keystone.users.create(
|
||||
self.demo_user,
|
||||
domain=domain.id,
|
||||
project=self.demo_project,
|
||||
password='password',
|
||||
email='demov3@demo.com',
|
||||
description='Demo',
|
||||
enabled=True)
|
||||
role = self.keystone.roles.find(name='Admin')
|
||||
self.keystone.roles.grant(
|
||||
role.id,
|
||||
user=user.id,
|
||||
project=project.id)
|
||||
|
||||
def create_users_v2(self):
|
||||
if not u.tenant_exists(self.keystone, self.demo_tenant):
|
||||
tenant = self.keystone.tenants.create(tenant_name=self.demo_tenant,
|
||||
description='demo tenant',
|
||||
enabled=True)
|
||||
|
||||
self.keystone.roles.create(name=self.demo_role)
|
||||
self.keystone.users.create(name=self.demo_user,
|
||||
password='password',
|
||||
tenant_id=tenant.id,
|
||||
email='demo@demo.com')
|
||||
|
||||
def test_100_services(self):
|
||||
"""Verify the expected services are running on the corresponding
|
||||
service units."""
|
||||
u.log.debug('Checking system services...')
|
||||
swift_storage_services = ['swift-account',
|
||||
'swift-account-auditor',
|
||||
'swift-account-reaper',
|
||||
'swift-account-replicator',
|
||||
'swift-container',
|
||||
'swift-container-auditor',
|
||||
'swift-container-replicator',
|
||||
'swift-container-sync',
|
||||
'swift-container-updater',
|
||||
'swift-object',
|
||||
'swift-object-auditor',
|
||||
'swift-object-replicator',
|
||||
'swift-object-updater']
|
||||
service_names = {
|
||||
self.keystone_sentry: ['keystone'],
|
||||
self.glance_sentry: ['glance-api'],
|
||||
self.swift_proxy_sentry: ['swift-proxy'],
|
||||
self.swift_storage_sentry: swift_storage_services
|
||||
}
|
||||
|
||||
if self._get_openstack_release() >= self.trusty_liberty:
|
||||
service_names[self.keystone_sentry] = ['apache2']
|
||||
|
||||
ret = u.validate_services_by_name(service_names)
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL, msg=ret)
|
||||
|
||||
def test_104_keystone_service_catalog(self):
|
||||
"""Verify that the service catalog endpoint data is valid."""
|
||||
u.log.debug('Checking keystone service catalog...')
|
||||
endpoint_id = {'adminURL': u.valid_url,
|
||||
'region': 'RegionOne',
|
||||
'publicURL': u.valid_url,
|
||||
'internalURL': u.valid_url,
|
||||
'id': u.not_null}
|
||||
|
||||
expected = {'image': [endpoint_id], 'object-store': [endpoint_id],
|
||||
'identity': [endpoint_id], 's3': [endpoint_id]}
|
||||
actual = self.keystone.service_catalog.get_endpoints()
|
||||
|
||||
ret = u.validate_svc_catalog_endpoint_data(
|
||||
expected, actual,
|
||||
openstack_release=self._get_openstack_release()
|
||||
)
|
||||
if ret:
|
||||
amulet.raise_status(amulet.FAIL, msg=ret)
|
||||
|
||||
def test_200_swift_storage_swift_storage_relation(self):
|
||||
"""Verify the swift-storage to swift-proxy swift-storage relation
|
||||
data."""
|
||||
u.log.debug('Checking swift:swift-proxy swift-storage relation...')
|
||||
unit = self.swift_storage_sentry
|
||||
relation = ['swift-storage', 'swift-proxy:swift-storage']
|
||||
expected = {
|
||||
'account_port': '6002',
|
||||
'zone': '1',
|
||||
'object_port': '6000',
|
||||
'container_port': '6001',
|
||||
'private-address': u.valid_ip,
|
||||
'device': 'vdb'
|
||||
}
|
||||
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('swift-storage swift-storage', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_202_swift_proxy_swift_storage_relation(self):
|
||||
"""Verify the swift-proxy to swift-storage swift-storage relation
|
||||
data."""
|
||||
u.log.debug('Checking swift-proxy:swift swift-storage relation...')
|
||||
unit = self.swift_proxy_sentry
|
||||
relation = ['swift-storage', 'swift-storage:swift-storage']
|
||||
expected = {
|
||||
'private-address': u.valid_ip,
|
||||
'trigger': u.not_null,
|
||||
'rings_url': u.valid_url,
|
||||
'swift_hash': u.not_null
|
||||
}
|
||||
|
||||
ret = u.validate_relation_data(unit, relation, expected)
|
||||
if ret:
|
||||
message = u.relation_error('swift-proxy swift-storage', ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_300_swift_config(self):
|
||||
"""Verify the data in the swift-hash section of the swift config
|
||||
file."""
|
||||
u.log.debug('Checking swift config...')
|
||||
unit = self.swift_storage_sentry
|
||||
conf = '/etc/swift/swift.conf'
|
||||
swift_proxy_relation = self.swift_proxy_sentry.relation(
|
||||
'swift-storage', 'swift-storage:swift-storage')
|
||||
expected = {
|
||||
'swift_hash_path_suffix': swift_proxy_relation['swift_hash']
|
||||
}
|
||||
|
||||
ret = u.validate_config_data(unit, conf, 'swift-hash', expected)
|
||||
if ret:
|
||||
message = "swift config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_302_account_server_config(self):
|
||||
"""Verify the data in the account server config file."""
|
||||
u.log.debug('Checking swift account-server config...')
|
||||
unit = self.swift_storage_sentry
|
||||
conf = '/etc/swift/account-server.conf'
|
||||
expected = {
|
||||
'DEFAULT': {
|
||||
'bind_ip': '0.0.0.0',
|
||||
'bind_port': '6002',
|
||||
'workers': u.not_null,
|
||||
},
|
||||
'pipeline:main': {
|
||||
'pipeline': 'recon account-server'
|
||||
},
|
||||
'filter:recon': {
|
||||
'use': 'egg:swift#recon',
|
||||
'recon_cache_path': '/var/cache/swift'
|
||||
},
|
||||
'app:account-server': {
|
||||
'use': 'egg:swift#account'
|
||||
}
|
||||
}
|
||||
|
||||
for section, pairs in expected.iteritems():
|
||||
ret = u.validate_config_data(unit, conf, section, pairs)
|
||||
if ret:
|
||||
message = "account server config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_304_container_server_config(self):
|
||||
"""Verify the data in the container server config file."""
|
||||
u.log.debug('Checking swift container-server config...')
|
||||
unit = self.swift_storage_sentry
|
||||
conf = '/etc/swift/container-server.conf'
|
||||
expected = {
|
||||
'DEFAULT': {
|
||||
'bind_ip': '0.0.0.0',
|
||||
'bind_port': '6001',
|
||||
'workers': u.not_null,
|
||||
},
|
||||
'pipeline:main': {
|
||||
'pipeline': 'recon container-server'
|
||||
},
|
||||
'filter:recon': {
|
||||
'use': 'egg:swift#recon',
|
||||
'recon_cache_path': '/var/cache/swift'
|
||||
},
|
||||
'app:container-server': {
|
||||
'use': 'egg:swift#container',
|
||||
'allow_versions': 'true'
|
||||
}
|
||||
}
|
||||
|
||||
for section, pairs in expected.iteritems():
|
||||
ret = u.validate_config_data(unit, conf, section, pairs)
|
||||
if ret:
|
||||
message = "container server config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_306_object_server_config(self):
|
||||
"""Verify the data in the object server config file."""
|
||||
u.log.debug('Checking swift object-server config...')
|
||||
unit = self.swift_storage_sentry
|
||||
conf = '/etc/swift/object-server.conf'
|
||||
expected = {
|
||||
'DEFAULT': {
|
||||
'bind_ip': '0.0.0.0',
|
||||
'bind_port': '6000',
|
||||
'workers': u.not_null,
|
||||
},
|
||||
'pipeline:main': {
|
||||
'pipeline': 'recon object-server'
|
||||
},
|
||||
'filter:recon': {
|
||||
'use': 'egg:swift#recon',
|
||||
'recon_cache_path': '/var/cache/swift'
|
||||
},
|
||||
'app:object-server': {
|
||||
'use': 'egg:swift#object',
|
||||
'threads_per_disk': '4'
|
||||
},
|
||||
'object-replicator': {
|
||||
'concurrency': '1'
|
||||
}
|
||||
}
|
||||
|
||||
for section, pairs in expected.iteritems():
|
||||
ret = u.validate_config_data(unit, conf, section, pairs)
|
||||
if ret:
|
||||
message = "object server config error: {}".format(ret)
|
||||
amulet.raise_status(amulet.FAIL, msg=message)
|
||||
|
||||
def test_400_swift_backed_image_create(self):
|
||||
"""Create an instance in glance, which is backed by swift, and validate
|
||||
that some of the metadata for the image match in glance and swift."""
|
||||
u.log.debug('Checking swift objects and containers with a '
|
||||
'swift-backed glance image...')
|
||||
|
||||
# Create swift-backed glance image
|
||||
img_id = u.create_cirros_image(self.glance, "cirros-image-1").id
|
||||
|
||||
# Get the image from glance by ID
|
||||
img_md5 = self.glance.images.get(img_id).checksum
|
||||
img_size = self.glance.images.get(img_id).size
|
||||
|
||||
# Validate that swift object's checksum/size match that from glance
|
||||
headers, containers = self.swift.get_account()
|
||||
if len(containers) != 1:
|
||||
msg = "Expected 1 swift container, found {}".format(
|
||||
len(containers))
|
||||
amulet.raise_status(amulet.FAIL, msg=msg)
|
||||
|
||||
container_name = containers[0].get('name')
|
||||
|
||||
# Until glance v2 and swift bug is resolved
|
||||
# https://bugs.launchpad.net/glance/+bug/1789748
|
||||
read_headers = {'X-Container-Read': ".r:*,.rlistings"}
|
||||
self.swift.post_container(container_name, headers=read_headers)
|
||||
|
||||
headers, objects = self.swift.get_container(container_name)
|
||||
|
||||
if float(self.glance.version) < 2.0:
|
||||
object_count = 1
|
||||
else:
|
||||
object_count = 2
|
||||
|
||||
if len(objects) != object_count:
|
||||
msg = "Expected 2 swift object, found {}".format(len(objects))
|
||||
amulet.raise_status(amulet.FAIL, msg=msg)
|
||||
|
||||
swift_object_size = objects[object_count - 1].get('bytes')
|
||||
swift_object_md5 = objects[object_count - 1].get('hash')
|
||||
|
||||
if img_size != swift_object_size:
|
||||
msg = "Glance image size {} != swift object size {}".format(
|
||||
img_size, swift_object_size)
|
||||
amulet.raise_status(amulet.FAIL, msg=msg)
|
||||
|
||||
if img_md5 != swift_object_md5:
|
||||
msg = "Glance image hash {} != swift object hash {}".format(
|
||||
img_md5, swift_object_md5)
|
||||
amulet.raise_status(amulet.FAIL, msg=msg)
|
||||
|
||||
# Cleanup
|
||||
u.delete_resource(self.glance.images, img_id, msg="glance image")
|
||||
u.log.info('OK')
|
||||
|
||||
def test_900_restart_on_config_change(self):
|
||||
"""Verify that the specified services are restarted when the config
|
||||
is changed."""
|
||||
u.log.info('Checking that conf files and system services respond '
|
||||
'to a charm config change...')
|
||||
sentry = self.swift_storage_sentry
|
||||
juju_service = 'swift-storage'
|
||||
|
||||
# Expected default and alternate values
|
||||
set_default = {'object-server-threads-per-disk': '4'}
|
||||
set_alternate = {'object-server-threads-per-disk': '2'}
|
||||
|
||||
# Config file affected by juju set config change, and
|
||||
# services which are expected to restart upon config change
|
||||
services = {'swift-object-server': 'object-server.conf',
|
||||
'swift-object-auditor': 'object-server.conf',
|
||||
'swift-object-replicator': 'object-server.conf',
|
||||
'swift-object-updater': 'object-server.conf'}
|
||||
|
||||
# Make config change, check for service restarts
|
||||
u.log.debug('Making config change on {}...'.format(juju_service))
|
||||
mtime = u.get_sentry_time(sentry)
|
||||
self.d.configure(juju_service, set_alternate)
|
||||
|
||||
sleep_time = 40
|
||||
for s, conf_file in services.iteritems():
|
||||
u.log.debug("Checking that service restarted: {}".format(s))
|
||||
conf_file_abs = '/etc/swift/{}'.format(conf_file)
|
||||
if not u.validate_service_config_changed(sentry, mtime, s,
|
||||
conf_file_abs,
|
||||
sleep_time=sleep_time,
|
||||
pgrep_full=True):
|
||||
self.d.configure(juju_service, set_default)
|
||||
msg = "service {} didn't restart after config change".format(s)
|
||||
amulet.raise_status(amulet.FAIL, msg=msg)
|
||||
sleep_time = 0
|
||||
|
||||
self.d.configure(juju_service, set_default)
|
||||
|
||||
def _assert_services(self, should_run):
|
||||
swift_storage_services = ['swift-account-auditor',
|
||||
'swift-account-reaper',
|
||||
'swift-account-replicator',
|
||||
'swift-account-server',
|
||||
'swift-container-auditor',
|
||||
'swift-container-replicator',
|
||||
'swift-container-server',
|
||||
'swift-container-sync',
|
||||
'swift-container-updater',
|
||||
'swift-object-auditor',
|
||||
'swift-object-replicator',
|
||||
'swift-object-server',
|
||||
'swift-object-updater']
|
||||
|
||||
u.get_unit_process_ids(
|
||||
{self.swift_storage_sentry: swift_storage_services},
|
||||
expect_success=should_run)
|
||||
# No point using validate_unit_process_ids, since we don't
|
||||
# care about how many PIDs, merely that they're running, so
|
||||
# would populate expected with either True or False. This
|
||||
# validation is already performed in get_process_id_list
|
||||
|
||||
def _test_pause(self):
|
||||
u.log.info("Testing pause action")
|
||||
self._assert_services(should_run=True)
|
||||
pause_action_id = u.run_action(self.swift_storage_sentry, "pause")
|
||||
assert u.wait_on_action(pause_action_id), "Pause action failed."
|
||||
|
||||
self._assert_services(should_run=False)
|
||||
|
||||
def _test_resume(self):
|
||||
u.log.info("Testing resume action")
|
||||
# service is left paused by _test_pause
|
||||
self._assert_services(should_run=False)
|
||||
resume_action_id = u.run_action(self.swift_storage_sentry, "resume")
|
||||
assert u.wait_on_action(resume_action_id), "Resume action failed."
|
||||
|
||||
self._assert_services(should_run=True)
|
||||
|
||||
def test_910_pause_resume_actions(self):
|
||||
"""Pause and then resume swift-storage."""
|
||||
u.log.debug('Checking pause/resume actions...')
|
||||
self._test_pause()
|
||||
self._test_resume()
|
||||
|
||||
def test_920_no_restart_on_config_change_when_paused(self):
|
||||
"""Verify that the specified services are not restarted when the config
|
||||
is changed and the unit is paused."""
|
||||
u.log.info('Checking that system services do not get restarted '
|
||||
'when charm config changes but unit is paused...')
|
||||
sentry = self.swift_storage_sentry
|
||||
juju_service = 'swift-storage'
|
||||
|
||||
# Expected default and alternate values
|
||||
set_default = {'object-server-threads-per-disk': '4'}
|
||||
set_alternate = {'object-server-threads-per-disk': '2'}
|
||||
|
||||
services = ['swift-account-server',
|
||||
'swift-account-auditor',
|
||||
'swift-account-reaper',
|
||||
'swift-account-replicator',
|
||||
'swift-container-server',
|
||||
'swift-container-auditor',
|
||||
'swift-container-replicator',
|
||||
'swift-container-updater',
|
||||
'swift-object-server',
|
||||
'swift-object-auditor',
|
||||
'swift-object-replicator',
|
||||
'swift-object-updater',
|
||||
'swift-container-sync']
|
||||
|
||||
# Pause the unit
|
||||
u.log.debug('Pausing the unit...')
|
||||
pause_action_id = u.run_action(sentry, "pause")
|
||||
assert u.wait_on_action(pause_action_id), "Pause action failed."
|
||||
|
||||
# Make config change, check for service restarts
|
||||
u.log.debug('Making config change on {}...'.format(juju_service))
|
||||
self.d.configure(juju_service, set_alternate)
|
||||
|
||||
for service in services:
|
||||
u.log.debug("Checking that service didn't start while "
|
||||
"paused: {}".format(service))
|
||||
# No explicit assert because get_process_id_list will do it for us
|
||||
u.get_process_id_list(
|
||||
sentry, service, expect_success=False)
|
||||
|
||||
self.d.configure(juju_service, set_default)
|
||||
resume_action_id = u.run_action(sentry, "resume")
|
||||
assert u.wait_on_action(resume_action_id), "Resume action failed."
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:bionic-rocky
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-stein
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:bionic-stein
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-train
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:bionic-train
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
series: disco
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: disco
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: trusty
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: trusty
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:trusty/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:trusty-mitaka
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:xenial-ocata
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:xenial-pike
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:xenial-queens
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
zone: 1
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - glance:object-store
|
||||
- swift-proxy:object-store
|
||||
|
|
@ -1,23 +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 swift-storage deployment on cosmic-rocky."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='cosmic')
|
||||
deployment.run_tests()
|
||||
|
|
@ -1,23 +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 swift-storage deployment on disco-stein."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='disco')
|
||||
deployment.run_tests()
|
||||
|
|
@ -1,23 +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 swift-storage deployment on bionic-queens."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='bionic')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on bionic-rocky."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='bionic',
|
||||
openstack='cloud:bionic-rocky',
|
||||
source='cloud:bionic-updates/rocky')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on bionic-stein."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='bionic',
|
||||
openstack='cloud:bionic-stein',
|
||||
source='cloud:bionic-stein')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on bionic-train."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='bionic',
|
||||
openstack='cloud:bionic-train',
|
||||
source='cloud:bionic-train')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on trusty-mitaka."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='trusty',
|
||||
openstack='cloud:trusty-mitaka',
|
||||
source='cloud:trusty-updates/mitaka')
|
||||
deployment.run_tests()
|
||||
|
|
@ -1,23 +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 swift-storage deployment on xenial-mitaka."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='xenial')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on xenial-ocata."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='xenial',
|
||||
openstack='cloud:xenial-ocata',
|
||||
source='cloud:xenial-updates/ocata')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on xenial-pike."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='xenial',
|
||||
openstack='cloud:xenial-pike',
|
||||
source='cloud:xenial-updates/pike')
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 swift-storage deployment on xenial-queens."""
|
||||
|
||||
from basic_deployment import SwiftStorageBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = SwiftStorageBasicDeployment(series='xenial',
|
||||
openstack='cloud:xenial-queens',
|
||||
source='cloud:xenial-updates/queens')
|
||||
deployment.run_tests()
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
sudo add-apt-repository --yes ppa:juju/stable
|
||||
sudo apt-get update --yes
|
||||
sudo apt-get install --yes amulet \
|
||||
distro-info-data \
|
||||
python-cinderclient \
|
||||
python-distro-info \
|
||||
python-glanceclient \
|
||||
python-heatclient \
|
||||
python-keystoneclient \
|
||||
python-neutronclient \
|
||||
python-novaclient \
|
||||
python-pika \
|
||||
python-swiftclient
|
||||
|
|
@ -1,18 +1,19 @@
|
|||
# Bootstrap the model if necessary.
|
||||
bootstrap: True
|
||||
# Re-use bootstrap node.
|
||||
reset: True
|
||||
# Use tox/requirements to drive the venv instead of bundletester's venv feature.
|
||||
virtualenv: False
|
||||
# Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.
|
||||
makefile: []
|
||||
# Do not specify juju PPA sources. Juju is presumed to be pre-installed
|
||||
# and configured in all test runner environments.
|
||||
#sources:
|
||||
# Do not specify or rely on system packages.
|
||||
#packages:
|
||||
# Do not specify python packages here. Use test-requirements.txt
|
||||
# and tox instead. ie. The venv is constructed before bundletester
|
||||
# is invoked.
|
||||
#python-packages:
|
||||
reset_timeout: 600
|
||||
charm_name: swift-storage
|
||||
gate_bundles:
|
||||
- bionic-train
|
||||
- bionic-stein
|
||||
- bionic-rocky
|
||||
- bionic-queens
|
||||
- xenial-queens
|
||||
- xenial-pike
|
||||
- xenial-ocata
|
||||
- xenial-mitaka
|
||||
- trusty-mitaka
|
||||
- disco-stein
|
||||
smoke_bundles:
|
||||
- bionic-train
|
||||
dev_bundles:
|
||||
- disco-stein
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.swift.tests.SwiftImageCreateTest
|
||||
- zaza.openstack.charm_tests.swift.tests.SwiftStorageTests
|
||||
|
|
|
|||
57
tox.ini
57
tox.ini
|
|
@ -1,8 +1,12 @@
|
|||
# Classic charm (with amulet): ./tox.ini
|
||||
# Classic charm (with zaza): ./tox.ini
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of tox.ini for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# TODO: Distill the func test requirements from the lint/unit test
|
||||
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||
# all of its own requirements and if it doesn't, fix it there.
|
||||
[tox]
|
||||
envlist = pep8,py3
|
||||
skipsdist = True
|
||||
|
|
@ -15,16 +19,12 @@ skip_missing_interpreters = False
|
|||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
CHARM_DIR={envdir}
|
||||
AMULET_SETUP_TIMEOUT=5400
|
||||
install_command =
|
||||
pip install {opts} {packages}
|
||||
commands = stestr run --slowest {posargs}
|
||||
passenv = HOME TERM AMULET_* CS_API_* OS_* TEST_*
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
whitelist_externals = juju
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
|
|
@ -41,6 +41,11 @@ basepython = python3.7
|
|||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
|
|
@ -81,39 +86,29 @@ basepython = python3
|
|||
commands = {posargs}
|
||||
|
||||
[testenv:func-noop]
|
||||
# DRY RUN - For Debug
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
basepython = python3
|
||||
commands =
|
||||
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy
|
||||
functest-run-suite --help
|
||||
|
||||
[testenv:func]
|
||||
# Charm Functional Test
|
||||
# Run all gate tests which are +x (expected to always pass)
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
basepython = python3
|
||||
commands =
|
||||
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy
|
||||
functest-run-suite --keep-model
|
||||
|
||||
[testenv:func-smoke]
|
||||
# Charm Functional Test
|
||||
# Run a specific test as an Amulet smoke test (expected to always pass)
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
basepython = python3
|
||||
commands =
|
||||
bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-train --no-destroy
|
||||
functest-run-suite --keep-model --smoke
|
||||
|
||||
[testenv:func-dev]
|
||||
# Charm Functional Test
|
||||
# Run all development test targets which are +x (may not always pass!)
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
basepython = python3
|
||||
commands =
|
||||
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dev-*" --no-destroy
|
||||
functest-run-suite --keep-model --dev
|
||||
|
||||
[testenv:func-target]
|
||||
basepython = python3
|
||||
commands =
|
||||
functest-run-suite --keep-model --bundle {posargs}
|
||||
|
||||
[flake8]
|
||||
ignore = E402,E226
|
||||
|
|
|
|||
Loading…
Reference in New Issue