openstack/sunbeam-charms
Code Issues Proposed changes

Update status on remove-relation

Browse Source 
Handle the events when relation is
removed and update the status accordingly.
In this patch Ingress, RabbitMQ,
IdentityService, CloudCredentials are handled.

Change-Id: I76a1a930a3ef4eebc8b0ffd9c154c5a6ecfb93e0
This commit is contained in:
Hemanth Nakkina 2022-11-17 15:40:43 +05:30
parent b45eb8aac4
commit cfc10f07aa
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ops-sunbeam/ops_sunbeam/relation_handlers.py
View File

@ -78,9 +78,9 @@ class RelationHandler(ops.charm.Object):
self.callback_f = callback_f self.callback_f = callback_f
self.interface = self.setup_event_handler() self.interface = self.setup_event_handler()
self.mandatory = mandatory self.mandatory = mandatory
status = compound_status.Status(self.relation_name) self.status = compound_status.Status(self.relation_name)
self.charm.status_pool.add(status) self.charm.status_pool.add(self.status)
self.set_status(status) self.set_status(self.status)
def set_status(self, status: compound_status.Status) -> None: def set_status(self, status: compound_status.Status) -> None:
"""Set the status based on current state. """Set the status based on current state.
@ -193,6 +193,8 @@ class IngressHandler(RelationHandler):
""" """
# Callback call to update keystone endpoints # Callback call to update keystone endpoints
self.callback_f(event) self.callback_f(event)
if self.mandatory:
self.status.set(BlockedStatus("integration missing"))
@property @property
def ready(self) -> bool: def ready(self) -> bool:
@ -372,6 +374,7 @@ class RabbitMQHandler(RelationHandler):
self.charm, self.relation_name, self.username, self.vhost self.charm, self.relation_name, self.username, self.vhost
) )
self.framework.observe(amqp.on.ready, self._on_amqp_ready) self.framework.observe(amqp.on.ready, self._on_amqp_ready)
self.framework.observe(amqp.on.goneaway, self._on_amqp_goneaway)
return amqp return amqp
def _on_amqp_ready(self, event: ops.framework.EventBase) -> None: def _on_amqp_ready(self, event: ops.framework.EventBase) -> None:
@ -380,6 +383,14 @@ class RabbitMQHandler(RelationHandler):
# that the relation is complete (indicated by a password) # that the relation is complete (indicated by a password)
self.callback_f(event) self.callback_f(event)
def _on_amqp_goneaway(self, event: ops.framework.EventBase) -> None:
"""Handle AMQP change events."""
# Goneaway is only emitted when the interface considers
# that the relation is broken
self.callback_f(event)
if self.mandatory:
self.status.set(BlockedStatus("integration missing"))
@property @property
def ready(self) -> bool: def ready(self) -> bool:
"""Whether handler is ready for use.""" """Whether handler is ready for use."""
@ -452,6 +463,9 @@ class IdentityServiceRequiresHandler(RelationHandler):
self.framework.observe( self.framework.observe(
id_svc.on.ready, self._on_identity_service_ready id_svc.on.ready, self._on_identity_service_ready
) )
self.framework.observe(
id_svc.on.goneaway, self._on_identity_service_goneaway
)
return id_svc return id_svc
def _on_identity_service_ready( def _on_identity_service_ready(
@ -462,6 +476,16 @@ class IdentityServiceRequiresHandler(RelationHandler):
# that the relation is complete (indicated by a password) # that the relation is complete (indicated by a password)
self.callback_f(event) self.callback_f(event)
def _on_identity_service_goneaway(
self, event: ops.framework.EventBase
) -> None:
"""Handle identity service gone away event."""
# Goneaway is only emitted when the interface considers
# that the relation is broken or departed.
self.callback_f(event)
if self.mandatory:
self.status.set(BlockedStatus("integration missing"))
def update_service_endpoints(self, service_endpoints: dict) -> None: def update_service_endpoints(self, service_endpoints: dict) -> None:
"""Update service endpoints on the relation.""" """Update service endpoints on the relation."""
self.service_endpoints = service_endpoints self.service_endpoints = service_endpoints
@ -825,12 +849,21 @@ class CloudCredentialsRequiresHandler(RelationHandler):
self.framework.observe( self.framework.observe(
credentials_service.on.ready, self._credentials_ready credentials_service.on.ready, self._credentials_ready
) )
self.framework.observe(
credentials_service.on.goneaway, self._credentials_goneaway
)
return credentials_service return credentials_service
def _credentials_ready(self, event: ops.framework.EventBase) -> None: def _credentials_ready(self, event: ops.framework.EventBase) -> None:
"""React to credential ready event.""" """React to credential ready event."""
self.callback_f(event) self.callback_f(event)
def _credentials_goneaway(self, event: ops.framework.EventBase) -> None:
"""React to credential goneaway event."""
self.callback_f(event)
if self.mandatory:
self.status.set(BlockedStatus("integration missing"))
@property @property
def ready(self) -> bool: def ready(self) -> bool:
"""Whether handler is ready for use.""" """Whether handler is ready for use."""