Merge ~cgrabowski/maas:fix_lp1982866 into maas:master

[Christian Grabowski]

use BootResource's method for splitting base image to get a default value in get_boot_config_for_machine()

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_lp1982866 lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/708/consoleText
COMMIT: 5a38df19d47f7cb1a9a0c43c37b0f48f3d5d61f8

review: Needs Fixing

[Christian Grabowski (cgrabowski)]

jenkins: !test

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_lp1982866 lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/709/consoleText
COMMIT: 5a38df19d47f7cb1a9a0c43c37b0f48f3d5d61f8

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_lp1982866 lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 74db2bc212cdca3913eed598be4ebe2d00d709ed

review: Approve

diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 2eae1db..0f2636c 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -232,10 +232,7 @@ def get_boot_config_for_machine(machine, configs, purpose):
             install_image = None
             if osystem == "custom":
                 install_image = BootResource.objects.get(name=series)
-                if install_image.base_image is not None:
-                    # if the operating system is a custom ubuntu image,
-                    # use the base image to install
-                    osystem, series = install_image.base_image.split("/")
+                osystem, series = install_image.split_base_image()
 
             if install_image is None or osystem != "ubuntu":
                 # Use only the commissioning osystem and series, for operating
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 835777e..858d7bd 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -24,7 +24,11 @@ from maasserver.models.timestampedmodel import now
 from maasserver.node_status import get_node_timeout, MONITORED_STATUSES
 from maasserver.preseed import compose_enlistment_preseed_url
 from maasserver.rpc import boot as boot_module
-from maasserver.rpc.boot import event_log_pxe_request, get_boot_filenames
+from maasserver.rpc.boot import (
+    event_log_pxe_request,
+    get_boot_config_for_machine,
+    get_boot_filenames,
+)
 from maasserver.rpc.boot import get_config as orig_get_config
 from maasserver.rpc.boot import merge_kparams_with_extra
 from maasserver.testing.architecture import make_usable_architecture
@@ -1519,3 +1523,104 @@ class TestGetBootFilenames(MAASServerTestCase):
             initrd,
         )
         self.assertIsNone(boot_dbt)
+
+
+class TestGetBootConfigForMachine(MAASServerTestCase):
+    def test_get_boot_config_for_machine_builtin_image(self):
+        machine = factory.make_Machine(
+            status=NODE_STATUS.DEPLOYING,
+            osystem="ubuntu",
+            distro_series="focal",
+        )
+        configs = Config.objects.get_configs(
+            [
+                "commissioning_osystem",
+                "commissioning_distro_series",
+                "enable_third_party_drivers",
+                "default_min_hwe_kernel",
+                "default_osystem",
+                "default_distro_series",
+                "kernel_opts",
+                "use_rack_proxy",
+                "maas_internal_domain",
+                "remote_syslog",
+                "maas_syslog_port",
+            ]
+        )
+
+        osystem, series, config_arch = get_boot_config_for_machine(
+            machine, configs, "xinstall"
+        )
+
+        self.assertEqual(osystem, "ubuntu")
+        self.assertEqual(series, "focal")
+        self.assertEqual(config_arch, "generic")
+
+    def test_get_boot_config_for_machine_new_custom_image(self):
+        arch = make_usable_architecture(self)
+        boot_resource = factory.make_BootResource(
+            base_image="ubuntu/jammy", architecture=arch
+        )
+        machine = factory.make_Machine(
+            status=NODE_STATUS.DEPLOYING,
+            osystem="custom",
+            distro_series=boot_resource.name,
+        )
+        configs = Config.objects.get_configs(
+            [
+                "commissioning_osystem",
+                "commissioning_distro_series",
+                "enable_third_party_drivers",
+                "default_min_hwe_kernel",
+                "default_osystem",
+                "default_distro_series",
+                "kernel_opts",
+                "use_rack_proxy",
+                "maas_internal_domain",
+                "remote_syslog",
+                "maas_syslog_port",
+            ]
+        )
+
+        osystem, series, config_arch = get_boot_config_for_machine(
+            machine, configs, "xinstall"
+        )
+
+        self.assertEqual(osystem, "ubuntu")
+        self.assertEqual(series, "jammy")
+        self.assertEqual(config_arch, "generic")
+
+    def test_get_boot_config_for_machine_legacy_custom_image(self):
+        arch = make_usable_architecture(self)
+        boot_resource = factory.make_BootResource(
+            base_image="", architecture=arch
+        )
+        machine = factory.make_Machine(
+            status=NODE_STATUS.DEPLOYING,
+            osystem="custom",
+            distro_series=boot_resource.name,
+        )
+        configs = Config.objects.get_configs(
+            [
+                "commissioning_osystem",
+                "commissioning_distro_series",
+                "enable_third_party_drivers",
+                "default_min_hwe_kernel",
+                "default_osystem",
+                "default_distro_series",
+                "kernel_opts",
+                "use_rack_proxy",
+                "maas_internal_domain",
+                "remote_syslog",
+                "maas_syslog_port",
+            ]
+        )
+
+        osystem, series, config_arch = get_boot_config_for_machine(
+            machine, configs, "xinstall"
+        )
+
+        # legacy custom images should use the default commissioning image as a base image
+        self.assertEqual(osystem, configs["commissioning_osystem"])
+        self.assertEqual(series, configs["commissioning_distro_series"])
+        self.assertEqual(config_arch, "generic")