Merge ~alexsander-souza/maas:lp2025468_fix_dhcp_helper into maas:master

[Alexsander de Souza]

fix DHCP notification handler

normalise MAC addresses before searching the database

fixes LP#2025468

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp2025468_fix_dhcp_helper lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f81cb5dd42aa24786e1161bada6035e9bec9ef82

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/rpc/leases.py b/src/maasserver/rpc/leases.py
index b999fc1..2614fcb 100644
--- a/src/maasserver/rpc/leases.py
+++ b/src/maasserver/rpc/leases.py
@@ -9,6 +9,7 @@ from datetime import datetime
 from netaddr import IPAddress
 
 from maasserver.enum import IPADDRESS_FAMILY, IPADDRESS_TYPE
+from maasserver.fields import normalise_macaddress
 from maasserver.models import (
     DNSResource,
     Interface,
@@ -91,6 +92,7 @@ def update_lease(
             "Family for the subnet does not match. Expected: %s" % ip_family
         )
 
+    mac = normalise_macaddress(mac)
     created = datetime.fromtimestamp(timestamp)
     log.msg(
         "Lease update: %s for %s on %s at %s%s%s"
diff --git a/src/maasserver/rpc/tests/test_leases.py b/src/maasserver/rpc/tests/test_leases.py
index 03399bf..8361d96 100644
--- a/src/maasserver/rpc/tests/test_leases.py
+++ b/src/maasserver/rpc/tests/test_leases.py
@@ -13,6 +13,7 @@ from netaddr import IPAddress
 from testtools.matchers import MatchesStructure
 
 from maasserver.enum import INTERFACE_TYPE, IPADDRESS_FAMILY, IPADDRESS_TYPE
+from maasserver.fields import normalise_macaddress
 from maasserver.models import DNSResource
 from maasserver.models.interface import UnknownInterface
 from maasserver.models.staticipaddress import StaticIPAddress
@@ -258,12 +259,18 @@ class TestUpdateLease(MAASServerTestCase):
         subnet = factory.make_ipv4_Subnet_with_IPRanges(
             with_static_range=False, dhcp_on=True
         )
-        node = factory.make_Node_with_Interface_on_Subnet(subnet=subnet)
+        mac = factory.make_mac_address(padding=False)
+        norm_mac = normalise_macaddress(mac)
+        node = factory.make_Node_with_Interface_on_Subnet(
+            subnet=subnet, address=norm_mac
+        )
         boot_interface = node.get_boot_interface()
         dynamic_range = subnet.get_dynamic_ranges()[0]
         ip = factory.pick_ip_in_IPRange(dynamic_range)
         kwargs = self.make_kwargs(
-            action="commit", mac=boot_interface.mac_address, ip=ip
+            action="commit",
+            mac=mac,
+            ip=ip,
         )
         update_lease(**kwargs)
 
diff --git a/src/maastesting/factory.py b/src/maastesting/factory.py
index 39e5d62..f808f6c 100644
--- a/src/maastesting/factory.py
+++ b/src/maastesting/factory.py
@@ -509,10 +509,12 @@ class Factory:
             network = self.make_ipv6_network()
         return self.make_ip_range(network=network)
 
-    def make_mac_address(self, delimiter=":"):
+    def make_mac_address(self, delimiter=":", padding=True):
         assert isinstance(delimiter, str)
         octets = islice(self.random_octets, 6)
-        return delimiter.join(format(octet, "02x") for octet in octets)
+        return delimiter.join(
+            format(octet, "02x" if padding else "x") for octet in octets
+        )
 
     def make_random_leases(self, num_leases=1):
         """Create a dict of arbitrary ip-to-mac address mappings."""
diff --git a/src/provisioningserver/rackdservices/lease_socket_service.py b/src/provisioningserver/rackdservices/lease_socket_service.py
index 24c768b..ece8bb7 100644
--- a/src/provisioningserver/rackdservices/lease_socket_service.py
+++ b/src/provisioningserver/rackdservices/lease_socket_service.py
@@ -118,7 +118,7 @@ class LeaseSocketService(Service, DatagramProtocol):
                 client = yield self.client_service.getClientNow()
                 break
             except NoConnectionsAvailable:
-                yield pause(wait, self.clock)
+                yield pause(wait, clock)
         else:
             maaslog.error(
                 "Can't send DHCP lease information, no RPC "