Merge ~dnegreira/charm-sysconfig:1873028 into charm-sysconfig:master

[David Negreira]

Disable ondemand for all series

Disable ondemand systemd unit when a different governor is configured
for the current LTS releases as well as future ones as the ondemand
systemd unit is still included by default.

Closes-Bug: #1873028

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Xav Paice (xavpaice)]

LGTM.

I tested also on a system without the ondemand.service, and it didn't produce any errors - though it might be cleaner to ensure the service exists before masking it. Can consider that for a second change in the future if we decide it's valuable.

review: Approve

[David Negreira (dnegreira)]

Hi,

When can this fix land?

Thanks,
David Negreira.

[Alvaro Uria (aluria)]

lgtm +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 671c8a0ce47a39ba97968d0868db02f463402bfc

diff --git a/src/lib/lib_sysconfig.py b/src/lib/lib_sysconfig.py
index 7d4513d..0acf239 100644
--- a/src/lib/lib_sysconfig.py
+++ b/src/lib/lib_sysconfig.py
@@ -367,7 +367,7 @@ class SysConfigHelper:
         self._render_boot_resource(CPUFREQUTILS_TMPL, CPUFREQUTILS, context)
         # Ensure the ondemand service is disabled if governor is set, lp#1822774, lp#1863659, lp#740127
         # Ondemand service is not updated during test if host is container.
-        if host.get_distrib_codename() == 'xenial' and not host.is_container():
+        if not host.is_container():
             hookenv.log('disabling the ondemand services for lp#1822774, lp#1863659,'
                         ' and lp#740127 if a governor is specified', hookenv.DEBUG)
             if self.governor:
@@ -431,7 +431,7 @@ class SysConfigHelper:
         Will render cpufrequtils config with empty context.
         """
         context = {}
-        if host.get_distrib_codename() == 'xenial' and not host.is_container():
+        if not host.is_container():
             hookenv.log('Enabling the ondemand initscript for lp#1822774'
                         ' and lp#740127', 'DEBUG')
             subprocess.call(
diff --git a/src/tests/unit/test_lib.py b/src/tests/unit/test_lib.py
index 455018b..b3e5fd1 100644
--- a/src/tests/unit/test_lib.py
+++ b/src/tests/unit/test_lib.py
@@ -118,17 +118,15 @@ class TestLib:
         assert isinstance(sysconfig.charm_config, dict)
 
     @mock.patch("lib_sysconfig.subprocess.call")
-    @mock.patch("lib_sysconfig.host.get_distrib_codename")
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.render")
-    def test_update_cpufreq(self, render, restart, config, codename, check_call):
+    def test_update_cpufreq(self, render, restart, config, check_call):
         """Set config governor=performance.
 
         Expect /etc/default/cpufrequtils is rendered
         and ondemand init script removed
         """
-        codename.return_value = "xenial"
         expected = {"governor": "performance"}
         config.return_value = expected
         sysh = lib_sysconfig.SysConfigHelper()
@@ -144,17 +142,15 @@ class TestLib:
             stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     @mock.patch("lib_sysconfig.subprocess.call")
-    @mock.patch("lib_sysconfig.host.get_distrib_codename")
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.render")
-    def test_update_cpufreq_governor_default(self, render, restart, config, codename, check_call):
+    def test_update_cpufreq_governor_default(self, render, restart, config, check_call):
         """Set config governor=''.
 
         Expect /etc/default/cpufrequtils is rendered with no governor
         and ondemand init script is installed
         """
-        codename.return_value = "xenial"
         expected = {"governor": ""}
         config.return_value = expected
         sysh = lib_sysconfig.SysConfigHelper()
@@ -171,16 +167,14 @@ class TestLib:
             stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     @mock.patch("lib_sysconfig.subprocess.call")
-    @mock.patch("lib_sysconfig.host.get_distrib_codename")
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.render")
-    def test_update_cpufreq_governor_not_available(self, render, restart, config, codename, check_call):
+    def test_update_cpufreq_governor_not_available(self, render, restart, config, check_call):
         """Set wrong governor.
 
         Expect /etc/default/cpufrequtils is not rendered
         """
-        codename.return_value = "xenial"
         expected = {"governor": "wrong"}
         config.return_value = expected
         sysh = lib_sysconfig.SysConfigHelper()
@@ -497,14 +491,12 @@ class TestLib:
     @mock.patch("lib_sysconfig.render")
     @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.subprocess.call")
-    @mock.patch("lib_sysconfig.host.get_distrib_codename")
     @mock.patch("lib_sysconfig.hookenv.log")
-    def test_remove_cpufreq_configuration_xenial(self, log, distrib_codename, check_call, restart, render, config):
+    def test_remove_cpufreq_configuration_xenial(self, log, check_call, restart, render, config):
         """Test remove cpufrequtlis configuration.
 
         Expect config is rendered with empty context.
         """
-        distrib_codename.return_value = "xenial"
         sysh = lib_sysconfig.SysConfigHelper()
         sysh.remove_cpufreq_configuration()