Update func tests and sync charm-helpers

dev-basic-cosmic-rocky stays due to:
https://bugs.launchpad.net/charm-lxd/+bug/1801349<Paste>

Change-Id: I4d00957e8092b1fefc71e337237aefb38b292914
Related-Bug: #1801349
This commit is contained in:
Ryan Beisner 2018-10-09 09:46:54 -05:00 committed by Alex Kavanagh
parent e7b36212fd
commit ff0ee580b8
13 changed files with 214 additions and 63 deletions

View File

@ -14,12 +14,7 @@ bin/charm_helpers_sync.py:
sync: bin/charm_helpers_sync.py sync: bin/charm_helpers_sync.py
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
functional_test: functional_test:
@echo Starting Amulet tests... @echo Starting Amulet tests...
tox -e func27 tox -e func27
publish: lint unit_test
bzr push lp:charms/lxd
bzr push lp:charms/trusty/lxd

View File

@ -1,7 +0,0 @@
repo: https://github.com/juju/charm-helpers
destination: tests/charmhelpers
include:
- contrib.amulet
- contrib.openstack.amulet
- core
- osplatform

View File

@ -23,8 +23,8 @@
# #
import os import os
import subprocess
from charmhelpers.core import host
from charmhelpers.core.hookenv import ( from charmhelpers.core.hookenv import (
config as config_get, config as config_get,
relation_get, relation_get,
@ -83,14 +83,4 @@ def retrieve_ca_cert(cert_file):
def install_ca_cert(ca_cert): def install_ca_cert(ca_cert):
if ca_cert: host.install_ca_cert(ca_cert, 'keystone_juju_ca_cert')
cert_file = ('/usr/local/share/ca-certificates/'
'keystone_juju_ca_cert.crt')
old_cert = retrieve_ca_cert(cert_file)
if old_cert and old_cert == ca_cert:
log("CA cert is the same as installed version", level=INFO)
else:
log("Installing new CA cert", level=INFO)
with open(cert_file, 'wb') as crt:
crt.write(ca_cert)
subprocess.check_call(['update-ca-certificates', '--fresh'])

View File

@ -24,7 +24,8 @@ import urlparse
import cinderclient.v1.client as cinder_client import cinderclient.v1.client as cinder_client
import cinderclient.v2.client as cinder_clientv2 import cinderclient.v2.client as cinder_clientv2
import glanceclient.v1.client as glance_client import glanceclient.v1 as glance_client
import glanceclient.v2 as glance_clientv2
import heatclient.v1.client as heat_client import heatclient.v1.client as heat_client
from keystoneclient.v2_0 import client as keystone_client from keystoneclient.v2_0 import client as keystone_client
from keystoneauth1.identity import ( from keystoneauth1.identity import (
@ -617,13 +618,13 @@ class OpenStackAmuletUtils(AmuletUtils):
return self.authenticate_keystone(keystone_ip, user, password, return self.authenticate_keystone(keystone_ip, user, password,
project_name=tenant) project_name=tenant)
def authenticate_glance_admin(self, keystone): def authenticate_glance_admin(self, keystone, force_v1_client=False):
"""Authenticates admin user with glance.""" """Authenticates admin user with glance."""
self.log.debug('Authenticating glance admin...') self.log.debug('Authenticating glance admin...')
ep = keystone.service_catalog.url_for(service_type='image', ep = keystone.service_catalog.url_for(service_type='image',
interface='adminURL') interface='adminURL')
if keystone.session: if not force_v1_client and keystone.session:
return glance_client.Client(ep, session=keystone.session) return glance_clientv2.Client("2", session=keystone.session)
else: else:
return glance_client.Client(ep, token=keystone.auth_token) return glance_client.Client(ep, token=keystone.auth_token)
@ -679,18 +680,30 @@ class OpenStackAmuletUtils(AmuletUtils):
nova.flavors.create(name, ram, vcpus, disk, flavorid, nova.flavors.create(name, ram, vcpus, disk, flavorid,
ephemeral, swap, rxtx_factor, is_public) ephemeral, swap, rxtx_factor, is_public)
def create_cirros_image(self, glance, image_name): def glance_create_image(self, glance, image_name, image_url,
"""Download the latest cirros image and upload it to glance, download_dir='tests',
validate and return a resource pointer. hypervisor_type=None,
disk_format='qcow2',
architecture='x86_64',
container_format='bare'):
"""Download an image and upload it to glance, validate its status
and return an image object pointer. KVM defaults, can override for
LXD.
:param glance: pointer to authenticated glance connection :param glance: pointer to authenticated glance api connection
:param image_name: display name for new image :param image_name: display name for new image
:param image_url: url to retrieve
:param download_dir: directory to store downloaded image file
:param hypervisor_type: glance image hypervisor property
:param disk_format: glance image disk format
:param architecture: glance image architecture property
:param container_format: glance image container format
:returns: glance image pointer :returns: glance image pointer
""" """
self.log.debug('Creating glance cirros image ' self.log.debug('Creating glance image ({}) from '
'({})...'.format(image_name)) '{}...'.format(image_name, image_url))
# Download cirros image # Download image
http_proxy = os.getenv('AMULET_HTTP_PROXY') http_proxy = os.getenv('AMULET_HTTP_PROXY')
self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy)) self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
if http_proxy: if http_proxy:
@ -699,22 +712,34 @@ class OpenStackAmuletUtils(AmuletUtils):
else: else:
opener = urllib.FancyURLopener() opener = urllib.FancyURLopener()
f = opener.open('http://download.cirros-cloud.net/version/released') abs_file_name = os.path.join(download_dir, image_name)
version = f.read().strip() if not os.path.exists(abs_file_name):
cirros_img = 'cirros-{}-x86_64-disk.img'.format(version) opener.retrieve(image_url, abs_file_name)
local_path = os.path.join('tests', cirros_img)
if not os.path.exists(local_path):
cirros_url = 'http://{}/{}/{}'.format('download.cirros-cloud.net',
version, cirros_img)
opener.retrieve(cirros_url, local_path)
f.close()
# Create glance image # Create glance image
with open(local_path) as f: glance_properties = {
image = glance.images.create(name=image_name, is_public=True, 'architecture': architecture,
disk_format='qcow2', }
container_format='bare', data=f) if hypervisor_type:
glance_properties['hypervisor_type'] = hypervisor_type
# Create glance image
if float(glance.version) < 2.0:
with open(abs_file_name) as f:
image = glance.images.create(
name=image_name,
is_public=True,
disk_format=disk_format,
container_format=container_format,
properties=glance_properties,
data=f)
else:
image = glance.images.create(
name=image_name,
visibility="public",
disk_format=disk_format,
container_format=container_format)
glance.images.upload(image.id, open(abs_file_name, 'rb'))
glance.images.update(image.id, **glance_properties)
# Wait for image to reach active status # Wait for image to reach active status
img_id = image.id img_id = image.id
@ -729,24 +754,68 @@ class OpenStackAmuletUtils(AmuletUtils):
self.log.debug('Validating image attributes...') self.log.debug('Validating image attributes...')
val_img_name = glance.images.get(img_id).name val_img_name = glance.images.get(img_id).name
val_img_stat = glance.images.get(img_id).status val_img_stat = glance.images.get(img_id).status
val_img_pub = glance.images.get(img_id).is_public
val_img_cfmt = glance.images.get(img_id).container_format val_img_cfmt = glance.images.get(img_id).container_format
val_img_dfmt = glance.images.get(img_id).disk_format val_img_dfmt = glance.images.get(img_id).disk_format
if float(glance.version) < 2.0:
val_img_pub = glance.images.get(img_id).is_public
else:
val_img_pub = glance.images.get(img_id).visibility == "public"
msg_attr = ('Image attributes - name:{} public:{} id:{} stat:{} ' msg_attr = ('Image attributes - name:{} public:{} id:{} stat:{} '
'container fmt:{} disk fmt:{}'.format( 'container fmt:{} disk fmt:{}'.format(
val_img_name, val_img_pub, img_id, val_img_name, val_img_pub, img_id,
val_img_stat, val_img_cfmt, val_img_dfmt)) val_img_stat, val_img_cfmt, val_img_dfmt))
if val_img_name == image_name and val_img_stat == 'active' \ if val_img_name == image_name and val_img_stat == 'active' \
and val_img_pub is True and val_img_cfmt == 'bare' \ and val_img_pub is True and val_img_cfmt == container_format \
and val_img_dfmt == 'qcow2': and val_img_dfmt == disk_format:
self.log.debug(msg_attr) self.log.debug(msg_attr)
else: else:
msg = ('Volume validation failed, {}'.format(msg_attr)) msg = ('Image validation failed, {}'.format(msg_attr))
amulet.raise_status(amulet.FAIL, msg=msg) amulet.raise_status(amulet.FAIL, msg=msg)
return image return image
def create_cirros_image(self, glance, image_name, hypervisor_type=None):
"""Download the latest cirros image and upload it to glance,
validate and return a resource pointer.
:param glance: pointer to authenticated glance connection
:param image_name: display name for new image
:param hypervisor_type: glance image hypervisor property
:returns: glance image pointer
"""
# /!\ DEPRECATION WARNING
self.log.warn('/!\\ DEPRECATION WARNING: use '
'glance_create_image instead of '
'create_cirros_image.')
self.log.debug('Creating glance cirros image '
'({})...'.format(image_name))
# Get cirros image URL
http_proxy = os.getenv('AMULET_HTTP_PROXY')
self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
if http_proxy:
proxies = {'http': http_proxy}
opener = urllib.FancyURLopener(proxies)
else:
opener = urllib.FancyURLopener()
f = opener.open('http://download.cirros-cloud.net/version/released')
version = f.read().strip()
cirros_img = 'cirros-{}-x86_64-disk.img'.format(version)
cirros_url = 'http://{}/{}/{}'.format('download.cirros-cloud.net',
version, cirros_img)
f.close()
return self.glance_create_image(
glance,
image_name,
cirros_url,
hypervisor_type=hypervisor_type)
def delete_image(self, glance, image): def delete_image(self, glance, image):
"""Delete the specified image.""" """Delete the specified image."""
@ -998,6 +1067,9 @@ class OpenStackAmuletUtils(AmuletUtils):
cmd, code, output)) cmd, code, output))
amulet.raise_status(amulet.FAIL, msg=msg) amulet.raise_status(amulet.FAIL, msg=msg)
# For mimic ceph osd lspools output
output = output.replace("\n", ",")
# Example output: 0 data,1 metadata,2 rbd,3 cinder,4 glance, # Example output: 0 data,1 metadata,2 rbd,3 cinder,4 glance,
for pool in str(output).split(','): for pool in str(output).split(','):
pool_id_name = pool.split(' ') pool_id_name = pool.split(' ')

View File

@ -1519,6 +1519,10 @@ class NeutronAPIContext(OSContextGenerator):
'rel_key': 'enable-qos', 'rel_key': 'enable-qos',
'default': False, 'default': False,
}, },
'enable_nsg_logging': {
'rel_key': 'enable-nsg-logging',
'default': False,
},
} }
ctxt = self.get_neutron_options({}) ctxt = self.get_neutron_options({})
for rid in relation_ids('neutron-plugin-api'): for rid in relation_ids('neutron-plugin-api'):
@ -1903,3 +1907,23 @@ class EnsureDirContext(OSContextGenerator):
def __call__(self): def __call__(self):
mkdir(self.dirname, **self.kwargs) mkdir(self.dirname, **self.kwargs)
return {} return {}
class VersionsContext(OSContextGenerator):
"""Context to return the openstack and operating system versions.
"""
def __init__(self, pkg='python-keystone'):
"""Initialise context.
:param pkg: Package to extrapolate openstack version from.
:type pkg: str
"""
self.pkg = pkg
def __call__(self):
ostack = os_release(self.pkg, base='icehouse')
osystem = lsb_release()['DISTRIB_CODENAME'].lower()
return {
'openstack_release': ostack,
'operating_system_release': osystem}

View File

@ -1,12 +1,14 @@
{% if auth_host -%} {% if auth_host -%}
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
auth_type = password auth_type = password
{% if api_version == "3" -%} {% if api_version == "3" -%}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v3
project_domain_name = {{ admin_domain_name }} project_domain_name = {{ admin_domain_name }}
user_domain_name = {{ admin_domain_name }} user_domain_name = {{ admin_domain_name }}
{% else -%} {% else -%}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
project_domain_name = default project_domain_name = default
user_domain_name = default user_domain_name = default
{% endif -%} {% endif -%}

View File

@ -186,7 +186,7 @@ SWIFT_CODENAMES = OrderedDict([
('queens', ('queens',
['2.16.0', '2.17.0']), ['2.16.0', '2.17.0']),
('rocky', ('rocky',
['2.18.0']), ['2.18.0', '2.19.0']),
]) ])
# >= Liberty version->codename mapping # >= Liberty version->codename mapping
@ -1733,3 +1733,31 @@ def is_unit_upgrading_set():
return not(not(kv.get('unit-upgrading'))) return not(not(kv.get('unit-upgrading')))
except Exception: except Exception:
return False return False
def series_upgrade_prepare(pause_unit_helper=None, configs=None):
""" Run common series upgrade prepare tasks.
:param pause_unit_helper: function: Function to pause unit
:param configs: OSConfigRenderer object: Configurations
:returns None:
"""
set_unit_upgrading()
if pause_unit_helper and configs:
if not is_unit_paused_set():
pause_unit_helper(configs)
def series_upgrade_complete(resume_unit_helper=None, configs=None):
""" Run common series upgrade complete tasks.
:param resume_unit_helper: function: Function to resume unit
:param configs: OSConfigRenderer object: Configurations
:returns None:
"""
clear_unit_paused()
clear_unit_upgrading()
if configs:
configs.write_all()
if resume_unit_helper:
resume_unit_helper(configs)

View File

@ -48,6 +48,7 @@ INFO = "INFO"
DEBUG = "DEBUG" DEBUG = "DEBUG"
TRACE = "TRACE" TRACE = "TRACE"
MARKER = object() MARKER = object()
SH_MAX_ARG = 131071
cache = {} cache = {}
@ -98,7 +99,7 @@ def log(message, level=None):
command += ['-l', level] command += ['-l', level]
if not isinstance(message, six.string_types): if not isinstance(message, six.string_types):
message = repr(message) message = repr(message)
command += [message] command += [message[:SH_MAX_ARG]]
# Missing juju-log should not cause failures in unit tests # Missing juju-log should not cause failures in unit tests
# Send log output to stderr # Send log output to stderr
try: try:

View File

@ -34,7 +34,7 @@ import six
from contextlib import contextmanager from contextlib import contextmanager
from collections import OrderedDict from collections import OrderedDict
from .hookenv import log, DEBUG, local_unit from .hookenv import log, INFO, DEBUG, local_unit, charm_name
from .fstab import Fstab from .fstab import Fstab
from charmhelpers.osplatform import get_platform from charmhelpers.osplatform import get_platform
@ -1040,3 +1040,27 @@ def modulo_distribution(modulo=3, wait=30, non_zero_wait=False):
return modulo * wait return modulo * wait
else: else:
return calculated_wait_time return calculated_wait_time
def install_ca_cert(ca_cert, name=None):
"""
Install the given cert as a trusted CA.
The ``name`` is the stem of the filename where the cert is written, and if
not provided, it will default to ``juju-{charm_name}``.
If the cert is empty or None, or is unchanged, nothing is done.
"""
if not ca_cert:
return
if not isinstance(ca_cert, bytes):
ca_cert = ca_cert.encode('utf8')
if not name:
name = 'juju-{}'.format(charm_name())
cert_file = '/usr/local/share/ca-certificates/{}.crt'.format(name)
new_hash = hashlib.md5(ca_cert).hexdigest()
if file_hash(cert_file) == new_hash:
return
log("Installing new CA cert at: {}".format(cert_file), level=INFO)
write_file(cert_file, ca_cert)
subprocess.check_call(['update-ca-certificates', '--fresh'])

View File

@ -84,6 +84,7 @@ module = "charmhelpers.fetch.%s" % __platform__
fetch = importlib.import_module(module) fetch = importlib.import_module(module)
filter_installed_packages = fetch.filter_installed_packages filter_installed_packages = fetch.filter_installed_packages
filter_missing_packages = fetch.filter_missing_packages
install = fetch.apt_install install = fetch.apt_install
upgrade = fetch.apt_upgrade upgrade = fetch.apt_upgrade
update = _fetch_update = fetch.apt_update update = _fetch_update = fetch.apt_update
@ -96,6 +97,7 @@ if __platform__ == "ubuntu":
apt_update = fetch.apt_update apt_update = fetch.apt_update
apt_upgrade = fetch.apt_upgrade apt_upgrade = fetch.apt_upgrade
apt_purge = fetch.apt_purge apt_purge = fetch.apt_purge
apt_autoremove = fetch.apt_autoremove
apt_mark = fetch.apt_mark apt_mark = fetch.apt_mark
apt_hold = fetch.apt_hold apt_hold = fetch.apt_hold
apt_unhold = fetch.apt_unhold apt_unhold = fetch.apt_unhold

View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
import os import os
from subprocess import check_call from subprocess import STDOUT, check_output
from charmhelpers.fetch import ( from charmhelpers.fetch import (
BaseFetchHandler, BaseFetchHandler,
UnhandledSource, UnhandledSource,
@ -55,7 +55,7 @@ class BzrUrlFetchHandler(BaseFetchHandler):
cmd = ['bzr', 'branch'] cmd = ['bzr', 'branch']
cmd += cmd_opts cmd += cmd_opts
cmd += [source, dest] cmd += [source, dest]
check_call(cmd) check_output(cmd, stderr=STDOUT)
def install(self, source, dest=None, revno=None): def install(self, source, dest=None, revno=None):
url_parts = self.parse_url(source) url_parts = self.parse_url(source)

View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
import os import os
from subprocess import check_call, CalledProcessError from subprocess import check_output, CalledProcessError, STDOUT
from charmhelpers.fetch import ( from charmhelpers.fetch import (
BaseFetchHandler, BaseFetchHandler,
UnhandledSource, UnhandledSource,
@ -50,7 +50,7 @@ class GitUrlFetchHandler(BaseFetchHandler):
cmd = ['git', 'clone', source, dest, '--branch', branch] cmd = ['git', 'clone', source, dest, '--branch', branch]
if depth: if depth:
cmd.extend(['--depth', depth]) cmd.extend(['--depth', depth])
check_call(cmd) check_output(cmd, stderr=STDOUT)
def install(self, source, branch="master", dest=None, depth=None): def install(self, source, branch="master", dest=None, depth=None):
url_parts = self.parse_url(source) url_parts = self.parse_url(source)

View File

@ -189,6 +189,18 @@ def filter_installed_packages(packages):
return _pkgs return _pkgs
def filter_missing_packages(packages):
"""Return a list of packages that are installed.
:param packages: list of packages to evaluate.
:returns list: Packages that are installed.
"""
return list(
set(packages) -
set(filter_installed_packages(packages))
)
def apt_cache(in_memory=True, progress=None): def apt_cache(in_memory=True, progress=None):
"""Build and return an apt cache.""" """Build and return an apt cache."""
from apt import apt_pkg from apt import apt_pkg
@ -248,6 +260,14 @@ def apt_purge(packages, fatal=False):
_run_apt_command(cmd, fatal) _run_apt_command(cmd, fatal)
def apt_autoremove(purge=True, fatal=False):
"""Purge one or more packages."""
cmd = ['apt-get', '--assume-yes', 'autoremove']
if purge:
cmd.append('--purge')
_run_apt_command(cmd, fatal)
def apt_mark(packages, mark, fatal=False): def apt_mark(packages, mark, fatal=False):
"""Flag one or more packages using apt-mark.""" """Flag one or more packages using apt-mark."""
log("Marking {} as {}".format(packages, mark)) log("Marking {} as {}".format(packages, mark))