Correct state for odl-controller relation
Drop the use of 'access' from the odl-controller relation; the interface only sets connected and available. Also assess status after the neutron-api-plugin-subordinate is connected, as it does not provide any state. Change-Id: I7b1793779a516c963f7459749aa02dc9ecef603d
This commit is contained in:
parent
6154ecaa72
commit
f5a375e9bc
|
@ -27,7 +27,7 @@ charm.use_defaults(
|
|||
'update-status')
|
||||
|
||||
|
||||
@reactive.when('odl-controller.access.available')
|
||||
@reactive.when('odl-controller.available')
|
||||
def render_config(*args):
|
||||
with charm.provide_charm_instance() as neutron_api_odl_charm:
|
||||
neutron_api_odl_charm.render_with_interfaces(args)
|
||||
|
@ -38,6 +38,7 @@ def render_config(*args):
|
|||
def configure_plugin(api_principle):
|
||||
with charm.provide_charm_instance() as neutron_api_odl_charm:
|
||||
neutron_api_odl_charm.configure_plugin(api_principle)
|
||||
neutron_api_odl_charm.assess_status()
|
||||
|
||||
|
||||
@reactive.when_file_changed(neutron_api_odl.ML2_CONF)
|
||||
|
|
|
@ -32,7 +32,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
|
|||
hook_set = {
|
||||
'when': {
|
||||
'render_config': (
|
||||
'odl-controller.access.available',),
|
||||
'odl-controller.available',),
|
||||
'configure_plugin': (
|
||||
'neutron-plugin-api-subordinate.connected',),
|
||||
'remote_restart': (
|
||||
|
|
Loading…
Reference in New Issue