Merge ~cgrabowski/maas:windows_and_esxi_do_not_require_base_image into maas:master

[Christian Grabowski]

exclude windows and esxi images from base_image form validation

[MAAS Lander (maas-lander)]

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

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11109/console
COMMIT: 1ead2ebf29ca85a0e69162f1c90e88a09ff0be56

review: Needs Fixing

[Alexsander de Souza (alexsander-souza)]

won't this conflict with centOS and RHEL images ?

review: Needs Information

[Christian Grabowski (cgrabowski)]

> won't this conflict with centOS and RHEL images ?
CentOS requires base_image, as it is one of the builtin reserved OS's, but I do think RHEL needs to be excluded as well.

111f880... by Christian Grabowski on 2021-09-28

just check if boot resource is not custom

[Alexsander de Souza (alexsander-souza)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 55c6174cbcd2babac1001c351e70ed30a4efac5f

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11112/console
COMMIT: 473f301e9b4b65ce704e858ca2a0a2c4c4daa02b

review: Needs Fixing

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 111f8801ed829d40237ed577b4bcf05e8cc1ef5d

review: Approve

diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index ae43336..d88c443 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -2515,6 +2515,10 @@ class BootResourceForm(MAASModelForm):
         in order to minimize possible incompatibilities during install and post-deployment
         """
 
+        split_name = self.data.get("name", "").split("/")
+        if len(split_name) > 1 and split_name[0] != "custom":
+            return ""
+
         try:
             base_osystem, base_version = self._get_base_image_info()
         except ValueError:
diff --git a/src/maasserver/forms/tests/test_bootresource.py b/src/maasserver/forms/tests/test_bootresource.py
index 7e321b5..e8aaeec 100644
--- a/src/maasserver/forms/tests/test_bootresource.py
+++ b/src/maasserver/forms/tests/test_bootresource.py
@@ -183,6 +183,54 @@ class TestBootResourceForm(MAASServerTestCase):
         form = BootResourceForm(data=data, files={"content": uploaded_file})
         self.assertFalse(form.is_valid())
 
+    def test_windows_does_not_require_base_image(self):
+        name = "windows/%s" % factory.make_name("name")
+        upload_type, filetype = self.pick_filetype()
+        size = random.randint(1024, 2048)
+        content = factory.make_string(size).encode("utf-8")
+        upload_name = factory.make_name("filename")
+        uploaded_file = SimpleUploadedFile(content=content, name=upload_name)
+        data = {
+            "name": name,
+            "title": factory.make_name("title"),
+            "architecture": make_usable_architecture(self),
+            "filetype": upload_type,
+        }
+        form = BootResourceForm(data=data, files={"content": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+    def test_esxi_does_not_require_base_image(self):
+        name = "esxi/%s" % factory.make_name("name")
+        upload_type, filetype = self.pick_filetype()
+        size = random.randint(1024, 2048)
+        content = factory.make_string(size).encode("utf-8")
+        upload_name = factory.make_name("filename")
+        uploaded_file = SimpleUploadedFile(content=content, name=upload_name)
+        data = {
+            "name": name,
+            "title": factory.make_name("title"),
+            "architecture": make_usable_architecture(self),
+            "filetype": upload_type,
+        }
+        form = BootResourceForm(data=data, files={"content": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+    def test_rhel_does_not_require_base_image(self):
+        name = "rhel/%s" % factory.make_name("name")
+        upload_type, filetype = self.pick_filetype()
+        size = random.randint(1024, 2048)
+        content = factory.make_string(size).encode("utf-8")
+        upload_name = factory.make_name("filename")
+        uploaded_file = SimpleUploadedFile(content=content, name=upload_name)
+        data = {
+            "name": name,
+            "title": factory.make_name("title"),
+            "architecture": make_usable_architecture(self),
+            "filetype": upload_type,
+        }
+        form = BootResourceForm(data=data, files={"content": uploaded_file})
+        self.assertTrue(form.is_valid())
+
     def test_validates_custom_image_base_os(self):
         name = "custom/%s" % factory.make_name("name")
         upload_type, filetype = self.pick_filetype()