From b3452dc3f3c41d9efee3c3cc63f6981fc5da3f5d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 13 Feb 2024 19:12:38 -0600
Subject: [PATCH] Refactor dhcp to move all mac formatting into the client
 processor (#110509)

---
 homeassistant/components/dhcp/__init__.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/dhcp/__init__.py b/homeassistant/components/dhcp/__init__.py
index ac09c908927..ebd0629950e 100644
--- a/homeassistant/components/dhcp/__init__.py
+++ b/homeassistant/components/dhcp/__init__.py
@@ -186,7 +186,7 @@ class WatcherBase(ABC):
 
     @callback
     def async_process_client(
-        self, ip_address: str, hostname: str, mac_address: str
+        self, ip_address: str, hostname: str, unformatted_mac_address: str
     ) -> None:
         """Process a client."""
         if (made_ip_address := cached_ip_addresses(ip_address)) is None:
@@ -202,6 +202,12 @@ class WatcherBase(ABC):
             # Ignore self assigned addresses, loopback, invalid
             return
 
+        formatted_mac = format_mac(unformatted_mac_address)
+        # Historically, the MAC address was formatted without colons
+        # and since all consumers of this data are expecting it to be
+        # formatted without colons we will continue to do so
+        mac_address = formatted_mac.replace(":", "")
+
         data = self._address_data.get(ip_address)
         if (
             data
@@ -231,7 +237,7 @@ class WatcherBase(ABC):
 
         dev_reg: DeviceRegistry = async_get(self.hass)
         if device := dev_reg.async_get_device(
-            connections={(CONNECTION_NETWORK_MAC, uppercase_mac)}
+            connections={(CONNECTION_NETWORK_MAC, formatted_mac)}
         ):
             for entry_id in device.config_entries:
                 if (
@@ -319,7 +325,7 @@ class NetworkWatcher(WatcherBase):
             self.async_process_client(
                 host[DISCOVERY_IP_ADDRESS],
                 host[DISCOVERY_HOSTNAME],
-                _format_mac(host[DISCOVERY_MAC_ADDRESS]),
+                host[DISCOVERY_MAC_ADDRESS],
             )
 
 
@@ -360,7 +366,7 @@ class DeviceTrackerWatcher(WatcherBase):
         if ip_address is None or mac_address is None:
             return
 
-        self.async_process_client(ip_address, hostname, _format_mac(mac_address))
+        self.async_process_client(ip_address, hostname, mac_address)
 
 
 class DeviceTrackerRegisteredWatcher(WatcherBase):
@@ -383,7 +389,7 @@ class DeviceTrackerRegisteredWatcher(WatcherBase):
         if ip_address is None or mac_address is None:
             return
 
-        self.async_process_client(ip_address, hostname, _format_mac(mac_address))
+        self.async_process_client(ip_address, hostname, mac_address)
 
 
 class DHCPWatcher(WatcherBase):
@@ -393,7 +399,7 @@ class DHCPWatcher(WatcherBase):
     def _async_process_dhcp_request(self, response: aiodhcpwatcher.DHCPRequest) -> None:
         """Process a dhcp request."""
         self.async_process_client(
-            response.ip_address, response.hostname, _format_mac(response.mac_address)
+            response.ip_address, response.hostname, response.mac_address
         )
 
     @callback
@@ -402,11 +408,6 @@ class DHCPWatcher(WatcherBase):
         self._unsub = aiodhcpwatcher.start(self._async_process_dhcp_request)
 
 
-def _format_mac(mac_address: str) -> str:
-    """Format a mac address for matching."""
-    return format_mac(mac_address).replace(":", "")
-
-
 @lru_cache(maxsize=4096, typed=True)
 def _compile_fnmatch(pattern: str) -> re.Pattern:
     """Compile a fnmatch pattern."""