From 55b80cd75c22e82ad87c1d3f0ae786b34dafb390 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Fri, 4 Feb 2022 09:44:30 +0000 Subject: [PATCH] Fixes to OSBaseOVNOperatorCharm --- ops-sunbeam/advanced_sunbeam_openstack/ovn/charm.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ops-sunbeam/advanced_sunbeam_openstack/ovn/charm.py b/ops-sunbeam/advanced_sunbeam_openstack/ovn/charm.py index 34af3f3d..f566938b 100644 --- a/ops-sunbeam/advanced_sunbeam_openstack/ovn/charm.py +++ b/ops-sunbeam/advanced_sunbeam_openstack/ovn/charm.py @@ -14,13 +14,14 @@ """Base classes for defining an OVN charm using the Operator framework.""" -import ops.charm from typing import List +from . import relation_handlers as ovn_relation_handlers from .. import relation_handlers as sunbeam_rhandlers +from .. import charm as sunbeam_charm -class OSBaseOVNOperatorCharm(ops.charm.CharmBase): +class OSBaseOVNOperatorCharm(sunbeam_charm.OSBaseOperatorCharm): """Base charms for OpenStack operators.""" def get_relation_handlers( @@ -29,8 +30,9 @@ class OSBaseOVNOperatorCharm(ops.charm.CharmBase): """Relation handlers for the service.""" handlers = handlers or [] if self.can_add_handler("ovsdb-cms", handlers): - self.ovsdb_cms = sunbeam_rhandlers.OVSDBCMSRequiresHandler( + self.ovsdb_cms = ovn_relation_handlers.OVSDBCMSRequiresHandler( self, "ovsdb-cms", self.configure_charm, ) handlers.append(self.ovsdb_cms) + handlers = super().get_relation_handlers(handlers) return handlers