Merge lp:~julian-edwards/maas/dup-static-ip-bug-1338452 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Ensure that the same static IP address cannot be re-issued. A bug in Django that forces a HOST cast around IP addresses in SQL queries was causing alphabetical comparison instead of IP comparison.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2014-07-04 07:27:05 +0000
+++ src/maasserver/models/staticipaddress.py	2014-07-07 07:53:06 +0000
@@ -81,7 +81,15 @@
         static_range = IPRange(range_low, range_high)
         # When we do ipv6, this needs changing.
         range_list = [ip.ipv4().format() for ip in static_range]
-        existing = self.filter(ip__gte=range_low, ip__lte=range_high)
+
+        # We're using a raw query to bypass a bug in Django that inserts
+        # a HOST() cast on the IP, causing the wrong comparison on the
+        # IP field.
+        # https://code.djangoproject.com/ticket/11442 
+        existing = StaticIPAddress.objects.raw("""
+            SELECT * FROM maasserver_staticipaddress
+            WHERE IP >= %s AND IP <= %s""",
+            [range_low, range_high])
 
         # Calculate the set of available IPs.  This will be inefficient
         # with large sets, but it will do for now.

=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2014-07-02 10:18:34 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2014-07-07 07:53:06 +0000
@@ -66,6 +66,16 @@
             AssertionError, StaticIPAddress.objects.allocate_new, low, high,
             alloc_type=IPADDRESS_TYPE.USER_RESERVED)
 
+    def test_allocate_new_compares_by_IP_not_alphabetically(self):
+        # Django has a bug that casts IP addresses with HOST(), which
+        # results in alphabetical comparisons of strings instead of IP
+        # addresses.  See https://bugs.launchpad.net/maas/+bug/1338452
+        low = "10.0.0.98"
+        high = "10.0.0.100"
+        factory.make_staticipaddress("10.0.0.99")
+        ipaddress = StaticIPAddress.objects.allocate_new(low, high)
+        self.assertEqual(ipaddress.ip, "10.0.0.98")
+
     def test_deallocate_by_node_removes_addresses(self):
         node = factory.make_node()
         [mac1, mac2] = [