Merge ~adam-collard/maas:3.2-backport-2020397-custom-validation into maas:3.2

[Adam Collard]

[3.2] LP:2020397: Look for executables for cloud-init and netplan

Instead of using package managers, look for executables

Backport efcd6c71914a3773fa6315133c89b9b00bdb89e4

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 3.2-backport-2020397-custom-validation lp:~adam-collard/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 307a72b30b3181d3289430c1e9309f33780d07f9

review: Approve

diff --git a/src/maasserver/preseed.py b/src/maasserver/preseed.py
index c692969..0387a99 100644
--- a/src/maasserver/preseed.py
+++ b/src/maasserver/preseed.py
@@ -7,10 +7,8 @@ from collections import namedtuple
 import json
 import os.path
 from pipes import quote
-import typing
 from urllib.parse import urlencode, urlparse
 
-import attr
 from crochet import TimeoutError
 from curtin.config import merge_config
 from curtin.pack import pack_install
@@ -605,17 +603,14 @@ def get_curtin_config(request, node, base_osystem=None, base_series=None):
     return yaml.safe_dump(config)
 
 
-@attr.s(auto_attribs=True)
-class PackageManager:
+_CLOUD_INIT = ["cloud-init", "--version"]
+_NETPLAN = ["netplan", "info"]
 
-    package_tool: str
-    deps: typing.List[str]
-
-
-PACKAGE_MANAGER_PER_OS = {
-    "ubuntu": PackageManager("dpkg-query -s", ["cloud-init", "netplan.io"]),
-    "centos": PackageManager("rpm -q", ["cloud-init"]),
-    "rhel": PackageManager("rpm -q", ["cloud-init"]),
+DEPS_PER_OS = {
+    "ubuntu": (_CLOUD_INIT, _NETPLAN),
+    "centos": (_CLOUD_INIT,),
+    "rhel": (_CLOUD_INIT,),
+    "suse": (_CLOUD_INIT,),
 }
 
 
@@ -626,11 +621,13 @@ def get_custom_image_dependency_validation(node, base_osystem):
     cmd = {}
     err_msg = "not detected, MAAS will not be able to configure this machine properly"
 
-    package_manager = PACKAGE_MANAGER_PER_OS[base_osystem]
+    deps = DEPS_PER_OS[base_osystem]
 
-    for priority, dep in enumerate(package_manager.deps, start=98):
-        in_target = f'{package_manager.package_tool} {dep} || (echo "{dep} {err_msg}" && exit 1)'
-        cmd[f"{priority}-validate-custom-image-has-{dep}"] = [
+    for priority, dep_cmds in enumerate(deps, start=98):
+        name = dep_cmds[0]
+        executable = " ".join(dep_cmds)
+        in_target = f'{executable} || (echo "{name} {err_msg}" && exit 1)'
+        cmd[f"{priority}-validate-custom-image-has-{name}"] = [
             "curtin",
             "in-target",
             "--",
diff --git a/src/maasserver/tests/test_preseed.py b/src/maasserver/tests/test_preseed.py
index 95e7a91..1d211ca 100644
--- a/src/maasserver/tests/test_preseed.py
+++ b/src/maasserver/tests/test_preseed.py
@@ -345,15 +345,15 @@ class TestGetCustomImageDependencyValidation(MAASServerTestCase):
                 "--",
                 "bash",
                 "-c",
-                'dpkg-query -s cloud-init || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'cloud-init --version || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
-            "99-validate-custom-image-has-netplan.io": [
+            "99-validate-custom-image-has-netplan": [
                 "curtin",
                 "in-target",
                 "--",
                 "bash",
                 "-c",
-                'dpkg-query -s netplan.io || (echo "netplan.io not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'netplan info || (echo "netplan not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
         }
         self.assertEqual(validation, expected)
@@ -379,7 +379,7 @@ class TestGetCustomImageDependencyValidation(MAASServerTestCase):
                 "--",
                 "bash",
                 "-c",
-                'rpm -q cloud-init || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'cloud-init --version || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
         }
         self.assertEqual(validation, expected)
@@ -405,7 +405,7 @@ class TestGetCustomImageDependencyValidation(MAASServerTestCase):
                 "--",
                 "bash",
                 "-c",
-                'rpm -q cloud-init || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'cloud-init --version || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
         }
         self.assertEqual(validation, expected)
@@ -1588,15 +1588,15 @@ class TestCurtinUtilities(
                 "--",
                 "bash",
                 "-c",
-                'dpkg-query -s cloud-init || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'cloud-init --version || (echo "cloud-init not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
-            "99-validate-custom-image-has-netplan.io": [
+            "99-validate-custom-image-has-netplan": [
                 "curtin",
                 "in-target",
                 "--",
                 "bash",
                 "-c",
-                'dpkg-query -s netplan.io || (echo "netplan.io not detected, MAAS will not be able to configure this machine properly" && exit 1)',
+                'netplan info || (echo "netplan not detected, MAAS will not be able to configure this machine properly" && exit 1)',
             ],
         }
         self.configure_get_boot_images_for_node(node, "xinstall")