From 0042bc36de0a0f43be498a9b10d3bb017c1e78a0 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Tue, 9 Jan 2024 14:59:58 +0800 Subject: [PATCH] Replace deprecated _ows_check_services_running _ows_check_services_running was made public without the underscore and it's private function name was made an alias and marked deprecated by: https://github.com/juju/charm-helpers/pull/658 Switch to the new name to avoid many deprecation warnings being printed by dependant charms every time update-status hooks run: DEPRECATION WARNING: Function _ows_check_services_running is being removed on/around 2022-05 : use ows_check_services_running() instead Change-Id: I4758330db81a95ac2aa17f9bc316afdc2eab2d44 --- charms_openstack/charm/core.py | 2 +- unit_tests/charms_openstack/charm/test_core.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charms_openstack/charm/core.py b/charms_openstack/charm/core.py index f646227..d849dff 100644 --- a/charms_openstack/charm/core.py +++ b/charms_openstack/charm/core.py @@ -1551,6 +1551,6 @@ class BaseOpenStackCharmAssessStatus(object): _services, _ports = ch_cluster.get_managed_services_and_ports( self.services, self.ports_to_check(self.active_api_ports)) - return os_utils._ows_check_services_running( + return os_utils.ows_check_services_running( services=_services, ports=_ports) diff --git a/unit_tests/charms_openstack/charm/test_core.py b/unit_tests/charms_openstack/charm/test_core.py index 25b281b..a72e56d 100644 --- a/unit_tests/charms_openstack/charm/test_core.py +++ b/unit_tests/charms_openstack/charm/test_core.py @@ -399,13 +399,13 @@ class TestBaseOpenStackCharmAssessStatus(BaseOpenStackCharmTest): chm_core.ch_cluster, 'get_managed_services_and_ports', side_effect=_svc_and_ports) - # verify that the function calls _ows_check_services_running() with the + # verify that the function calls ows_check_services_running() with the # valid information - self.patch_object(chm_core.os_utils, '_ows_check_services_running', + self.patch_object(chm_core.os_utils, 'ows_check_services_running', return_value=('active', 'that')) status, message = self.target.check_services_running() self.assertEqual((status, message), ('active', 'that')) - self._ows_check_services_running.assert_called_once_with( + self.ows_check_services_running.assert_called_once_with( services=['my-default-service'], ports=[11, 12, 13, 1244, 2478, 3589])