Merge lp:~julian-edwards/maas/tech-debt-bug-1379370 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Remove the transaction.atomic() (essentially a savepoint in Django) in claim_static_ip_addresses(), since it only claims a single IP now.

[Newell Jensen (newell-jensen)]

review: Approve

[Graham Binns (gmb)]

Winner winner chicken dinner.

review: Approve

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-11-05 06:09:28 +0000
+++ src/maasserver/models/node.py	2014-11-05 06:19:39 +0000
@@ -1378,21 +1378,15 @@
         if mac is None:
             return []
 
-        # XXX 2014-10-09 jhobbs bug=1379370
-        # It's not clear to me that this transaction needs to be here
-        # since this doesn't allocate IP addresses across multiple
-        # interfaces. This needs to be looked at some more when there is
-        # more time.
-        with transaction.atomic():
-            try:
-                static_ips = mac.claim_static_ips()
-            except StaticIPAddressTypeClash:
-                # There's already a non-AUTO IP.
-                return []
+        try:
+            static_ips = mac.claim_static_ips()
+        except StaticIPAddressTypeClash:
+            # There's already a non-AUTO IP.
+            return []
 
-            # Return a list instead of yielding mappings as they're ready
-            # because it's all-or-nothing (hence the atomic context).
-            return [(static_ip.ip, unicode(mac)) for static_ip in static_ips]
+        # Return a list instead of yielding mappings as they're ready
+        # because it's all-or-nothing (hence the atomic context).
+        return [(static_ip.ip, unicode(mac)) for static_ip in static_ips]
 
     def get_boot_purpose(self):
         """