Merge lp:~allenap/maas/prepare-region--bug-1554494 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Promotion-to-region will now work when the local machine has multiple MAC addresses.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/rpc/regionservice.py'
--- src/maasserver/rpc/regionservice.py	2016-03-05 00:35:25 +0000
+++ src/maasserver/rpc/regionservice.py	2016-03-08 15:03:28 +0000
@@ -981,8 +981,8 @@
             # this node.
             hostname = gethostname()
             region_obj = get_one(Node.objects.filter(
-                Q(hostname=hostname) |
-                Q(interface__mac_address__in=mac_addresses)))
+                Q(interface__mac_address__in=mac_addresses) |
+                Q(hostname=hostname)).distinct())
             if region_obj is not None:
                 # Already a node with a MAC address that matches this machine.
                 # Convert that into a region.

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2016-03-05 01:33:15 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2016-03-08 15:03:28 +0000
@@ -2029,9 +2029,16 @@
         service = RegionAdvertisingService()
 
         node = factory.make_Node(interface=True)
-        interface = node.get_boot_interface()
+        interfaces = [
+            factory.make_Interface(node=node),
+            factory.make_Interface(node=node),
+        ]
+        mac_addresses = [
+            str(interface.mac_address)
+            for interface in interfaces
+        ]
 
-        service.prepare([str(interface.mac_address)])
+        service.prepare(mac_addresses)
 
         # Node should have been converted to a RegionController.
         node = reload_object(node)