remove underscore prefix from kernel helper methods

rename to match codebase convention: get_deb_kernel_flavour,
get_running_kernel_flavour, find_rpm_kernel_updates,
find_deb_kernel_updates, find_arch_kernel_updates,
deb_kernel_prefixes.

Author: furlongm

hosts/models.py

@@ -309,7 +309,7 @@ def check_if_reboot_required(self, host_highest):
         else:
             self.reboot_required = False
 
-    def _get_deb_kernel_flavour(self, pkg_name):
+    def get_deb_kernel_flavour(self, pkg_name):
         """Extract the flavour suffix from a DEB kernel package name.
 
         e.g. 'linux-image-6.8.0-51-generic' → 'generic'
@@ -318,7 +318,7 @@ def _get_deb_kernel_flavour(self, pkg_name):
              'linux-modules-extra-6.8.0-51-generic' → 'generic'
         Returns None if the flavour cannot be determined.
         """
-        for prefix in self._deb_kernel_prefixes:
+        for prefix in self.deb_kernel_prefixes:
             if pkg_name.startswith(prefix):
                 # strip prefix, then split version from flavour
                 # e.g. '6.8.0-51-generic' or '6.1.0-28-cloud-amd64'
@@ -333,7 +333,7 @@ def _get_deb_kernel_flavour(self, pkg_name):
                 return None
         return None
 
-    def _get_running_kernel_flavour(self):
+    def get_running_kernel_flavour(self):
         """Extract the flavour from the running kernel string.
 
         e.g. '6.8.0-51-generic' → 'generic'
@@ -350,7 +350,7 @@ def _get_running_kernel_flavour(self):
         return None
 
     # longest prefixes first to avoid linux-modules- matching linux-modules-extra-
-    _deb_kernel_prefixes = [
+    deb_kernel_prefixes = [
         'linux-image-unsigned-',
         'linux-modules-extra-',
         'linux-cloud-tools-',
@@ -382,14 +382,14 @@ def find_kernel_updates(self, kernel_packages, repo_packages):
         rpm_kernels = kernel_packages.filter(packagetype='R')
         arch_kernels = kernel_packages.filter(packagetype='A')
 
-        update_ids.update(self._find_rpm_kernel_updates(rpm_kernels, repo_packages, hostrepos))
-        update_ids.update(self._find_deb_kernel_updates(deb_kernels, repo_packages, hostrepos))
-        update_ids.update(self._find_arch_kernel_updates(arch_kernels, repo_packages, hostrepos))
+        update_ids.update(self.find_rpm_kernel_updates(rpm_kernels, repo_packages, hostrepos))
+        update_ids.update(self.find_deb_kernel_updates(deb_kernels, repo_packages, hostrepos))
+        update_ids.update(self.find_arch_kernel_updates(arch_kernels, repo_packages, hostrepos))
 
         self.save(update_fields=['reboot_required'])
         return update_ids
 
-    def _find_rpm_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
+    def find_rpm_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
         update_ids = set()
 
@@ -470,7 +470,7 @@ def _find_rpm_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
         return update_ids
 
-    def _find_arch_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
+    def find_arch_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
         update_ids = set()
 
@@ -521,10 +521,10 @@ def _find_arch_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
         return update_ids
 
-    def _find_deb_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
+    def find_deb_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
         update_ids = set()
-        running_flavour = self._get_running_kernel_flavour()
+        running_flavour = self.get_running_kernel_flavour()
 
         # find the linux-image package matching the running kernel
         running_kernel_pkg = None
@@ -544,7 +544,7 @@ def _find_deb_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
         processed_prefixes = set()
         for package in kernel_packages:
             pkg_name = package.name.name
-            flavour = self._get_deb_kernel_flavour(pkg_name)
+            flavour = self.get_deb_kernel_flavour(pkg_name)
 
             # if we know the running flavour, only process matching packages
             # if we don't (unflavoured kernel), process all kernel packages
@@ -553,7 +553,7 @@ def _find_deb_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
 
             # determine the prefix (e.g. 'linux-image-')
             prefix = None
-            for p in self._deb_kernel_prefixes:
+            for p in self.deb_kernel_prefixes:
                 if pkg_name.startswith(p):
                     prefix = p
                     break
@@ -604,7 +604,7 @@ def _find_deb_kernel_updates(self, kernel_packages, repo_packages, hostrepos):
         if running_kernel_pkg:
             for package in kernel_packages:
                 if package.name.name.startswith('linux-image-'):
-                    flavour = self._get_deb_kernel_flavour(package.name.name)
+                    flavour = self.get_deb_kernel_flavour(package.name.name)
                     if running_flavour is None or flavour == running_flavour:
                         if running_kernel_pkg.compare_version(package) == -1:
                             self.reboot_required = True

hosts/tests/test_models.py

@@ -544,35 +544,35 @@ def test_deb_latest_not_installed(self):
         self.assertEqual(update.newpackage, self.img_53)
 
     def test_deb_flavour_extraction(self):
-        """Test _get_deb_kernel_flavour helper."""
+        """Test get_deb_kernel_flavour helper."""
         host = self._create_host('6.8.0-51-generic', [self.img_51])
         self.assertEqual(
-            host._get_deb_kernel_flavour('linux-image-6.8.0-51-generic'),
+            host.get_deb_kernel_flavour('linux-image-6.8.0-51-generic'),
             'generic'
         )
         self.assertEqual(
-            host._get_deb_kernel_flavour('linux-modules-extra-6.8.0-51-lowlatency'),
+            host.get_deb_kernel_flavour('linux-modules-extra-6.8.0-51-lowlatency'),
             'lowlatency'
         )
         self.assertEqual(
-            host._get_deb_kernel_flavour('linux-image-6.1.0-28-cloud-amd64'),
+            host.get_deb_kernel_flavour('linux-image-6.1.0-28-cloud-amd64'),
             'cloud-amd64'
         )
         self.assertEqual(
-            host._get_deb_kernel_flavour('linux-image-unsigned-6.8.0-51-generic'),
+            host.get_deb_kernel_flavour('linux-image-unsigned-6.8.0-51-generic'),
             'generic'
         )
 
     def test_deb_running_kernel_flavour(self):
-        """Test _get_running_kernel_flavour helper."""
+        """Test get_running_kernel_flavour helper."""
         host = self._create_host('6.8.0-51-generic', [self.img_51])
-        self.assertEqual(host._get_running_kernel_flavour(), 'generic')
+        self.assertEqual(host.get_running_kernel_flavour(), 'generic')
 
         host.kernel = '6.1.0-28-cloud-amd64'
-        self.assertEqual(host._get_running_kernel_flavour(), 'cloud-amd64')
+        self.assertEqual(host.get_running_kernel_flavour(), 'cloud-amd64')
 
         host.kernel = '5.14.0-503.el9'
-        self.assertIsNone(host._get_running_kernel_flavour())
+        self.assertIsNone(host.get_running_kernel_flavour())
 
 
 @override_settings(