diff --git a/ops-sunbeam/advanced_sunbeam_openstack/charm.py b/ops-sunbeam/advanced_sunbeam_openstack/charm.py index 036418f1..4aa3d055 100644 --- a/ops-sunbeam/advanced_sunbeam_openstack/charm.py +++ b/ops-sunbeam/advanced_sunbeam_openstack/charm.py @@ -47,9 +47,7 @@ import advanced_sunbeam_openstack.container_handlers as sunbeam_chandlers import advanced_sunbeam_openstack.core as sunbeam_core import advanced_sunbeam_openstack.relation_handlers as sunbeam_rhandlers -from charms.observability_libs.v0.kubernetes_service_patch import ( - KubernetesServicePatch, -) +import charms.observability_libs.v0.kubernetes_service_patch as kube_svc_patch logger = logging.getLogger(__name__) @@ -362,7 +360,7 @@ class OSBaseOperatorAPICharm(OSBaseOperatorCharm): """Run constructor.""" super().__init__(framework) self._state.set_default(db_ready=False) - self.service_patcher = KubernetesServicePatch( + self.service_patcher = kube_svc_patch.KubernetesServicePatch( self, service_type="LoadBalancer", ports=[(f"{self.app.name}", self.default_public_ingress_port)], diff --git a/ops-sunbeam/unit_tests/test_core.py b/ops-sunbeam/unit_tests/test_core.py index ae8e2355..e2ac9aba 100644 --- a/ops-sunbeam/unit_tests/test_core.py +++ b/ops-sunbeam/unit_tests/test_core.py @@ -14,6 +14,7 @@ """Test aso.""" +import mock import json import sys @@ -82,11 +83,12 @@ class TestOSBaseOperatorCharm(test_utils.CharmTestCase): class TestOSBaseOperatorAPICharm(test_utils.CharmTestCase): """Test for the OSBaseOperatorAPICharm class.""" - PATCHES = [ - 'KubernetesServicePatch', - ] + PATCHES = [] - def setUp(self) -> None: + @mock.patch( + 'charms.observability_libs.v0.kubernetes_service_patch.' + 'KubernetesServicePatch') + def setUp(self, mock_svc_patch: mock.patch) -> None: """Charm test class setup.""" self.container_calls = { 'push': {},