Merge ~cgrabowski/maas:fix_boot_params_on_deployment into maas:master

[Christian Grabowski]

add units for get_node_from_mac_or_hardware_uuid

ensure MAC is properly formatted for boot config query

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 350887a8d9a6dfd659041a47b75bad330ce1a721

review: Approve

[Alberto Donato (ack)]

+1

A couple of suggestions inline

review: Approve

e89a5c2... by Christian Grabowski on 2023-03-15

use field function to format mac

3e640b3... by Christian Grabowski on 2023-03-15

simplify if-else by appending existing query

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 3e640b3eccb5e0185de52e54020e0d36b48e5e5b

review: Approve

diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 0f2636c..f489eaf 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -13,6 +13,7 @@ from django.db.models import Q
 from maasserver.compose_preseed import RSYSLOG_PORT
 from maasserver.dns.config import get_resource_name_for_subnet
 from maasserver.enum import BOOT_RESOURCE_FILE_TYPE, INTERFACE_TYPE
+from maasserver.fields import normalise_macaddress
 from maasserver.models import (
     BootResource,
     Config,
@@ -49,19 +50,19 @@ def get_node_from_mac_or_hardware_uuid(mac=None, hardware_uuid=None):
     Returns a Node object or None if no node with the given MAC address or
     hardware UUID exists.
     """
-    if mac and hardware_uuid:
-        node = Node.objects.filter(
-            Q(
-                current_config__interface__type=INTERFACE_TYPE.PHYSICAL,
-                current_config__interface__mac_address=mac,
-            )
-            | Q(hardware_uuid__iexact=hardware_uuid)
-        )
-    elif mac:
-        node = Node.objects.filter(
+    if mac:
+        if "-" in mac:
+            mac = normalise_macaddress(mac)
+
+        q = Q(
             current_config__interface__type=INTERFACE_TYPE.PHYSICAL,
             current_config__interface__mac_address=mac,
         )
+
+        if hardware_uuid:
+            q |= Q(hardware_uuid__iexact=hardware_uuid)
+
+        node = Node.objects.filter(q)
     elif hardware_uuid:
         node = Node.objects.filter(hardware_uuid__iexact=hardware_uuid)
     else:
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 858d7bd..7dddaca 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -29,8 +29,11 @@ from maasserver.rpc.boot import (
     get_boot_config_for_machine,
     get_boot_filenames,
 )
+from maasserver.rpc.boot import (
+    get_node_from_mac_or_hardware_uuid,
+    merge_kparams_with_extra,
+)
 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
 from maasserver.testing.config import RegionConfigurationFixture
 from maasserver.testing.factory import factory
@@ -1624,3 +1627,36 @@ class TestGetBootConfigForMachine(MAASServerTestCase):
         self.assertEqual(osystem, configs["commissioning_osystem"])
         self.assertEqual(series, configs["commissioning_distro_series"])
         self.assertEqual(config_arch, "generic")
+
+
+class TestGetNodeFromMacOrHardwareUUID(MAASServerTestCase):
+    def test_get_node_from_mac_or_hardware_uuid_with_regular_mac(self):
+        node = factory.make_Node_with_Interface_on_Subnet()
+        iface = node.current_config.interface_set.first()
+        result = get_node_from_mac_or_hardware_uuid(mac=iface.mac_address)
+        self.assertEqual(node, result)
+
+    def test_get_node_from_mac_or_hardware_uuid_with_dash_mac(self):
+        node = factory.make_Node_with_Interface_on_Subnet()
+        iface = node.current_config.interface_set.first()
+        result = get_node_from_mac_or_hardware_uuid(
+            mac=iface.mac_address.replace(":", "-")
+        )
+        self.assertEqual(node, result)
+
+    def test_get_node_from_mac_or_hardware_uuid_with_mac_and_hardware_uuid(
+        self,
+    ):
+        node = factory.make_Node_with_Interface_on_Subnet()
+        iface = node.current_config.interface_set.first()
+        result = get_node_from_mac_or_hardware_uuid(
+            mac=iface.mac_address, hardware_uuid=node.hardware_uuid
+        )
+        self.assertEqual(node, result)
+
+    def test_get_node_from_mac_or_hardware_uuid_with_hardware_uuid(self):
+        node = factory.make_Node_with_Interface_on_Subnet()
+        result = get_node_from_mac_or_hardware_uuid(
+            hardware_uuid=node.hardware_uuid
+        )
+        self.assertEqual(node, result)