Merge lp:~newell-jensen/maas/fix-1687487 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Change hostname uniqueness check to use Node instead of Machine so that region, racks, etc. are checked for a potential conflicting hostname when adding a Pod.

[Newell Jensen (newell-jensen)]

Unit tests for this are already checking against a Node object!

[Lee Trager (ltrager)]

LGTM!

review: Approve

=== modified file 'src/maasserver/models/bmc.py'
--- src/maasserver/models/bmc.py	2017-04-24 20:56:23 +0000
+++ src/maasserver/models/bmc.py	2017-05-04 22:05:15 +0000
@@ -46,7 +46,10 @@
     get_iscsi_target,
     ISCSIBlockDevice,
 )
-from maasserver.models.node import Machine
+from maasserver.models.node import (
+    Machine,
+    Node,
+)
 from maasserver.models.physicalblockdevice import PhysicalBlockDevice
 from maasserver.models.podhints import PodHints
 from maasserver.models.staticipaddress import StaticIPAddress
@@ -563,7 +566,7 @@
                     discovered_machine.hostname = None
                     break
         if discovered_machine.hostname:
-            if Machine.objects.filter(
+            if Node.objects.filter(
                     hostname=discovered_machine.hostname).exists():
                 discovered_machine.hostname = None