openstack
/
charm-layer-openstack
Code Issues Proposed changes

Rework the default handlers into layer-openstack-* 

Due to commit 95493a4 in charms.reactive, the default handlers in
charms.openstack broke.  This is because charms.reactive no longer will
run handlers that are not in the hooks/ or reactive/ directory tree; the
default handlers in charms.openstack are in the library code, which is
pip installed into the module packages.

This patch, and related patches in charms.openstack and
layer-openstack-api enable the default handlers to function again.  Note
that from a charm author perspective, the API to default handlers is
identical.  This is merely an implementation change.

Change-Id: I7feb7aed219728efd57b5878bb6a5ff9e204c52a
Partial-Bug: #1707685
This commit is contained in:
Alex Kavanagh 2017-08-01 11:51:59 +01:00
parent fe81a38382
commit 4f8408e47d
1 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
reactive/layer_openstack.py Normal file
View File

@ -0,0 +1,68 @@
import charmhelpers.core.hookenv as hookenv
import charmhelpers.core.unitdata as unitdata
import charms_openstack.charm as charm
import charms_openstack.charm.defaults as defaults
import charms.reactive as reactive
@reactive.when_not('charm.installed')
@reactive.when('charms.openstack.do-default-charm.installed')
def default_install():
"""Provide a default install handler
The instance automagically becomes the derived OpenStackCharm instance.
The kv() key charmers.openstack-release-version' is used to cache the
release being used for this charm. It is determined by the
default_select_release() function below, unless this is overriden by
the charm author
"""
unitdata.kv().unset(defaults.OPENSTACK_RELEASE_KEY)
with charm.provide_charm_instance() as instance:
instance.install()
reactive.set_state('charm.installed')
@reactive.when('config.changed',
'charms.openstack.do-default-config.changed')
def default_config_changed():
"""Default handler for config.changed state from reactive. Just see if
our status has changed. This is just to clear any errors that may have
got stuck due to missing async handlers, etc.
"""
with charm.provide_charm_instance() as instance:
instance.config_changed()
instance.assess_status()
@reactive.hook('upgrade-charm')
def default_upgrade_charm():
"""Default handler for the 'upgrade-charm' hook.
This calls the charm.singleton.upgrade_charm() function as a default.
"""
reactive.set_state('run-default-upgrade-charm')
@reactive.when('charms.openstack.do-default-upgrade-charm',
'run-default-upgrade-charm')
def run_default_upgrade_charm():
with charm.provide_charm_instance() as instance:
instance.upgrade_charm()
reactive.remove_state('run-default-upgrade-charm')
@reactive.hook('update-status')
def default_update_status():
"""Default handler for update-status state.
Just call update status.
"""
reactive.set_state('run-default-update-status')
@reactive.when('charms.openstack.do-default-update-status',
'run-default-update-status')
def run_default_update_status():
with charm.provide_charm_instance() as instance:
hookenv.application_version_set(instance.application_version)
instance.assess_status()
reactive.remove_state('run-default-update-status')