Merge lp:~julian-edwards/maas/better-ip-exhaustion-error-bug-1388033 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Return an error message along with a SERVICE_UNAVAILABLE code when trying to allocate a static IP when they are all in use.

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2014-11-05 03:41:22 +0000
+++ src/maasserver/models/staticipaddress.py	2014-11-07 05:31:52 +0000
@@ -195,7 +195,9 @@
                         # this critical section is in a lock...
                         continue
             else:
-                raise StaticIPAddressExhaustion()
+                raise StaticIPAddressExhaustion(
+                    "No more IPs available in range %s-%s" % (
+                        range_low.format(), range_high.format()))
 
     def _deallocate(self, filter):
         """Helper func to deallocate the records in the supplied queryset

=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2014-11-05 03:55:10 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2014-11-07 05:31:52 +0000
@@ -56,9 +56,12 @@
     def test_allocate_new_raises_when_addresses_exhausted(self):
         low = high = "192.168.230.1"
         StaticIPAddress.objects.allocate_new(low, high)
-        self.assertRaises(
+        e = self.assertRaises(
             StaticIPAddressExhaustion,
             StaticIPAddress.objects.allocate_new, low, high)
+        self.assertEqual(
+            "No more IPs available in range %s-%s" % (low, high),
+            unicode(e))
 
     def test_allocate_new_sets_user(self):
         low, high = factory.make_ip_range()