Merge lp:~rvb/maas/ipfield into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Re-do the fix for bug 1338452 in a more consistent way: work around the Django bug (see reference in the code) by defining a custom IP field. Update all the IP fields in the codebase to use the new field.

Although this is a bit of a hack, it's much safer than having a workaround in just one place of the code.

I've tested that an upgrade to the package built from this branch works fine (objects with IP address fields look okay) and I ran a test in the lab with this branch.

[Gavin Panella (allenap)]

review: Approve

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please let's not have a repeat of the TestCase debacle, and call this
*MAAS*IPAddressField instead.

Also, surprised it needs a migration just for a field name change.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlO7RT4ACgkQWhGlTF8G/HdakQCgjBvFZWZz+LoW6eoa8NFqmDO/
bSEAnipHz21PGLPmeBy0zTqgg0eKsiFp
=E/ET
-----END PGP SIGNATURE-----

[Raphaël Badin (rvb)]

On 07/08/2014 03:12 AM, Julian Edwards wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Please let's not have a repeat of the TestCase debacle, and call this
> *MAAS*IPAddressField instead.

Fair point. Done.

=== modified file 'src/maasserver/fields.py'
--- src/maasserver/fields.py	2014-05-19 14:44:58 +0000
+++ src/maasserver/fields.py	2014-07-08 07:55:43 +0000
@@ -14,6 +14,7 @@
 __metaclass__ = type
 __all__ = [
     "EditableBinaryField",
+    "MAASIPAddressField",
     "MAC",
     "MACAddressField",
     "MACAddressFormField",
@@ -33,6 +34,7 @@
 from django.db.models import (
     BinaryField,
     Field,
+    GenericIPAddressField,
     SubfieldBase,
     )
 from django.forms import (
@@ -90,6 +92,7 @@
         "^maasserver\.fields\.JSONObjectField",
         "^maasserver\.fields\.XMLField",
         "^maasserver\.fields\.EditableBinaryField",
+        "^maasserver\.fields\.MAASIPAddressField",
     ])
 
 
@@ -385,3 +388,27 @@
     def __init__(self, *args, **kwargs):
         super(EditableBinaryField, self).__init__(*args, **kwargs)
         self.editable = True
+
+
+class MAASIPAddressField(GenericIPAddressField):
+    """A version of GenericIPAddressField with a custom get_internal_type().
+
+    This class exists to work around a bug in Django that inserts a HOST() cast
+    on the IP, causing the wrong comparison on the IP field.  See
+    https://code.djangoproject.com/ticket/11442 for details.
+    """
+
+    def get_internal_type(self):
+        """Returns a value different from 'GenericIPAddressField' and
+        'IPAddressField' to force Django not to use a HOST() case when
+        performing operation on this field.
+        """
+        return "IPField"
+
+    def db_type(self, connection):
+        """Returns the database column data type for IPAddressField.
+
+        Override the default implementation which uses get_internal_type()
+        and force a 'inet' type field.
+        """
+        return 'inet'

=== added file 'src/maasserver/migrations/0088_ip_to_custom_field.py'
--- src/maasserver/migrations/0088_ip_to_custom_field.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/0088_ip_to_custom_field.py	2014-07-08 07:55:43 +0000
@@ -0,0 +1,377 @@
+from django.db import models
+from south.db import db
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'NodeGroupInterface.ip_range_high'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip_range_high', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.static_ip_range_low'
+        db.alter_column(u'maasserver_nodegroupinterface', 'static_ip_range_low', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39))
+
+        # Changing field 'NodeGroupInterface.ip_range_low'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip_range_low', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.subnet_mask'
+        db.alter_column(u'maasserver_nodegroupinterface', 'subnet_mask', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.broadcast_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'broadcast_ip', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.router_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'router_ip', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.foreign_dhcp_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'foreign_dhcp_ip', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.static_ip_range_high'
+        db.alter_column(u'maasserver_nodegroupinterface', 'static_ip_range_high', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'StaticIPAddress.ip'
+        db.alter_column(u'maasserver_staticipaddress', 'ip', self.gf('maasserver.fields.MAASIPAddressField')(unique=True, max_length=39))
+
+        # Changing field 'DHCPLease.ip'
+        db.alter_column(u'maasserver_dhcplease', 'ip', self.gf('maasserver.fields.MAASIPAddressField')(unique=True, max_length=39))
+
+        # Changing field 'Network.ip'
+        db.alter_column(u'maasserver_network', 'ip', self.gf('maasserver.fields.MAASIPAddressField')(unique=True, max_length=39))
+
+        # Changing field 'Network.netmask'
+        db.alter_column(u'maasserver_network', 'netmask', self.gf('maasserver.fields.MAASIPAddressField')(max_length=39))
+
+    def backwards(self, orm):
+
+        # Changing field 'NodeGroupInterface.ip_range_high'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip_range_high', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.static_ip_range_low'
+        db.alter_column(u'maasserver_nodegroupinterface', 'static_ip_range_low', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39))
+
+        # Changing field 'NodeGroupInterface.ip_range_low'
+        db.alter_column(u'maasserver_nodegroupinterface', 'ip_range_low', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.subnet_mask'
+        db.alter_column(u'maasserver_nodegroupinterface', 'subnet_mask', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.broadcast_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'broadcast_ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.router_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'router_ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.foreign_dhcp_ip'
+        db.alter_column(u'maasserver_nodegroupinterface', 'foreign_dhcp_ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'NodeGroupInterface.static_ip_range_high'
+        db.alter_column(u'maasserver_nodegroupinterface', 'static_ip_range_high', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'StaticIPAddress.ip'
+        db.alter_column(u'maasserver_staticipaddress', 'ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, unique=True))
+
+        # Changing field 'DHCPLease.ip'
+        db.alter_column(u'maasserver_dhcplease', 'ip', self.gf('django.db.models.fields.IPAddressField')(max_length=15, unique=True))
+
+        # Changing field 'Network.ip'
+        db.alter_column(u'maasserver_network', 'ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, unique=True))
+
+        # Changing field 'Network.netmask'
+        db.alter_column(u'maasserver_network', 'netmask', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'maasserver.bootimage': {
+            'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'},
+            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'xinstall_path': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'xinstall_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '30', 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.bootsource': {
+            'Meta': {'object_name': 'BootSource'},
+            'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}),
+            'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        u'maasserver.bootsourceselection': {
+            'Meta': {'object_name': 'BootSourceSelection'},
+            'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.componenterror': {
+            'Meta': {'object_name': 'ComponentError'},
+            'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.config': {
+            'Meta': {'object_name': 'Config'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
+        },
+        u'maasserver.dhcplease': {
+            'Meta': {'object_name': 'DHCPLease'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'mac': ('maasserver.fields.MACAddressField', [], {}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
+        },
+        u'maasserver.downloadprogress': {
+            'Meta': {'object_name': 'DownloadProgress'},
+            'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.filestorage': {
+            'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
+            'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'default': "u'1ed17c44-0672-11e4-aedf-9c4e363b1c94'", 'unique': 'True', 'max_length': '36'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.licensekey': {
+            'Meta': {'unique_together': "((u'osystem', u'distro_series'),)", 'object_name': 'LicenseKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'distro_series': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.macaddress': {
+            'Meta': {'object_name': 'MACAddress'},
+            'cluster_interface': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['maasserver.NodeGroupInterface']", 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': 'True'}),
+            'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
+            'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.macstaticipaddresslink': {
+            'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}),
+            'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}),
+            'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.network': {
+            'Meta': {'object_name': 'Network'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'netmask': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
+            'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.node': {
+            'Meta': {'object_name': 'Node'},
+            'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
+            'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
+            'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
+            'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
+            'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-1ececdb4-0672-11e4-aedf-9c4e363b1c94'", 'unique': 'True', 'max_length': '41'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
+        },
+        u'maasserver.nodegroup': {
+            'Meta': {'object_name': 'NodeGroup'},
+            'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
+            'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
+            'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
+        },
+        u'maasserver.nodegroupinterface': {
+            'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'},
+            'broadcast_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'foreign_dhcp_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
+            'ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'router_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'static_ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'static_ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'subnet_mask': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.sshkey': {
+            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'maasserver.sslkey': {
+            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'maasserver.staticipaddress': {
+            'Meta': {'object_name': 'StaticIPAddress'},
+            'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.tag': {
+            'Meta': {'object_name': 'Tag'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
+        },
+        u'maasserver.zone': {
+            'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'piston.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
+        },
+        u'piston.token': {
+            'Meta': {'object_name': 'Token'},
+            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1404804793L'}),
+            'token_type': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        }
+    }
+
+    complete_apps = ['maasserver']
\ No newline at end of file

=== modified file 'src/maasserver/models/dhcplease.py'
--- src/maasserver/models/dhcplease.py	2014-07-03 12:29:46 +0000
+++ src/maasserver/models/dhcplease.py	2014-07-08 07:55:43 +0000
@@ -20,7 +20,6 @@
 from django.db import connection
 from django.db.models import (
     ForeignKey,
-    IPAddressField,
     Manager,
     Model,
     )
@@ -28,7 +27,10 @@
 from django.dispatch import receiver
 from maasserver import DefaultMeta
 from maasserver.enum import NODE_STATUS
-from maasserver.fields import MACAddressField
+from maasserver.fields import (
+    MAASIPAddressField,
+    MACAddressField,
+    )
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.macaddress import MACAddress
 from maasserver.utils import strip_domain
@@ -159,7 +161,7 @@
     objects = DHCPLeaseManager()
 
     nodegroup = ForeignKey('maasserver.NodeGroup', null=False, editable=False)
-    ip = IPAddressField(null=False, editable=False, unique=True)
+    ip = MAASIPAddressField(null=False, editable=False, unique=True)
     mac = MACAddressField(null=False, editable=False, unique=False)
 
     def __unicode__(self):

=== modified file 'src/maasserver/models/network.py'
--- src/maasserver/models/network.py	2014-06-30 14:46:10 +0000
+++ src/maasserver/models/network.py	2014-07-08 07:55:43 +0000
@@ -27,13 +27,13 @@
 from django.core.validators import RegexValidator
 from django.db.models import (
     CharField,
-    GenericIPAddressField,
     Manager,
     Model,
     PositiveSmallIntegerField,
     TextField,
     )
 from maasserver import DefaultMeta
+from maasserver.fields import MAASIPAddressField
 from maasserver.models.cleansave import CleanSave
 from netaddr import IPAddress
 from netaddr.core import AddrFormatError
@@ -220,11 +220,11 @@
         validators=[NETWORK_NAME_VALIDATOR],
         help_text="Identifying name for this network.")
 
-    ip = GenericIPAddressField(
+    ip = MAASIPAddressField(
         blank=False, editable=True, unique=True, null=False,
         help_text="Network address (e.g. 192.168.1.0).")
 
-    netmask = GenericIPAddressField(
+    netmask = MAASIPAddressField(
         blank=False, editable=True, null=False,
         help_text="Network mask (e.g. 255.255.255.0).")
 

=== modified file 'src/maasserver/models/nodegroupinterface.py'
--- src/maasserver/models/nodegroupinterface.py	2014-07-07 09:31:31 +0000
+++ src/maasserver/models/nodegroupinterface.py	2014-07-08 07:55:43 +0000
@@ -23,7 +23,6 @@
 from django.db.models import (
     CharField,
     ForeignKey,
-    GenericIPAddressField,
     IntegerField,
     )
 from maasserver import DefaultMeta
@@ -32,6 +31,7 @@
     NODEGROUPINTERFACE_MANAGEMENT_CHOICES,
     NODEGROUPINTERFACE_MANAGEMENT_CHOICES_DICT,
     )
+from maasserver.fields import MAASIPAddressField
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.timestampedmodel import TimestampedModel
 from netaddr import (
@@ -55,7 +55,7 @@
         unique_together = ('nodegroup', 'interface')
 
     # Static IP of the interface.
-    ip = GenericIPAddressField(
+    ip = MAASIPAddressField(
         null=False, editable=True,
         help_text="Static IP Address of the interface",
         verbose_name="IP")
@@ -72,33 +72,33 @@
     interface = CharField(
         blank=True, editable=True, max_length=255, default='',
         help_text="Name of this interface (e.g. 'em1').")
-    subnet_mask = GenericIPAddressField(
+    subnet_mask = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         help_text="e.g. 255.255.255.0")
-    broadcast_ip = GenericIPAddressField(
+    broadcast_ip = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="Broadcast IP",
         help_text="e.g. 192.168.1.255")
-    router_ip = GenericIPAddressField(
+    router_ip = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="Router IP",
         help_text="IP of this network's router given to DHCP clients")
-    ip_range_low = GenericIPAddressField(
+    ip_range_low = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="DHCP dynamic IP range low value",
         help_text="Lowest IP number of the range for dynamic IPs, used for "
                   "enlistment, commissioning and unknown devices.")
-    ip_range_high = GenericIPAddressField(
+    ip_range_high = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="DHCP dynamic IP range high value",
         help_text="Highest IP number of the range for dynamic IPs, used for "
                   "enlistment, commissioning and unknown devices.")
-    static_ip_range_low = GenericIPAddressField(
+    static_ip_range_low = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="Static IP range low value",
         help_text="Lowest IP number of the range for IPs given to allocated "
                   "nodes, must be in same network as dynamic range.")
-    static_ip_range_high = GenericIPAddressField(
+    static_ip_range_high = MAASIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
         verbose_name="Static IP range high value",
         help_text="Highest IP number of the range for IPs given to allocated "
@@ -106,7 +106,7 @@
 
     # Foreign DHCP server address, if any, that was detected on this
     # interface.
-    foreign_dhcp_ip = GenericIPAddressField(
+    foreign_dhcp_ip = MAASIPAddressField(
         null=True, default=None, editable=True, blank=True, unique=False)
 
     @property
@@ -120,7 +120,7 @@
         ip = self.ip
         netmask = self.subnet_mask
         # Nullness check for GenericIPAddress fields is deliberately kept
-        # vague: GenericIPAddressField seems to represent nulls as empty
+        # vague: MAASIPAddressField seems to represent nulls as empty
         # strings.
         if netmask:
             return make_network(ip, netmask).cidr

=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2014-07-07 10:14:12 +0000
+++ src/maasserver/models/staticipaddress.py	2014-07-08 07:55:43 +0000
@@ -28,13 +28,13 @@
 from django.db import connection
 from django.db.models import (
     ForeignKey,
-    GenericIPAddressField,
     IntegerField,
     Manager,
     )
 from maasserver import DefaultMeta
 from maasserver.enum import IPADDRESS_TYPE
 from maasserver.exceptions import StaticIPAddressExhaustion
+from maasserver.fields import MAASIPAddressField
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.timestampedmodel import TimestampedModel
 from maasserver.utils import strip_domain
@@ -82,16 +82,7 @@
         # When we do ipv6, this needs changing.
         range_list = [ip.ipv4().format() for ip in static_range]
 
-        # 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])
+        existing = self.filter(ip__gte=range_low, ip__lte=range_high)
 
         # Calculate the set of available IPs.  This will be inefficient
         # with large sets, but it will do for now.
@@ -169,7 +160,7 @@
         verbose_name = "Static IP Address"
         verbose_name_plural = "Static IP Addresses"
 
-    ip = GenericIPAddressField(
+    ip = MAASIPAddressField(
         unique=True, null=False, editable=False, blank=False,
         verbose_name='IP')
 

=== modified file 'src/maasserver/tests/models.py'
--- src/maasserver/tests/models.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/tests/models.py	2014-07-08 07:55:43 +0000
@@ -13,6 +13,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'MAASIPAddressFieldModel',
     'JSONFieldModel',
     'FieldChangeTestModel',
     ]
@@ -24,6 +25,7 @@
     )
 from maasserver.fields import (
     JSONObjectField,
+    MAASIPAddressField,
     XMLField,
     )
 from maasserver.models.managers import BulkManager
@@ -67,3 +69,7 @@
     parent = ForeignKey('BulkManagerParentTestModel', editable=False)
 
     objects = BulkManager()
+
+
+class MAASIPAddressFieldModel(Model):
+    ip_address = MAASIPAddressField()

=== modified file 'src/maasserver/tests/test_fields.py'
--- src/maasserver/tests/test_fields.py	2014-07-02 07:05:24 +0000
+++ src/maasserver/tests/test_fields.py	2014-07-08 07:55:43 +0000
@@ -42,6 +42,7 @@
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.tests.models import (
     JSONFieldModel,
+    MAASIPAddressFieldModel,
     XMLFieldModel,
     )
 from maastesting.djangotestcase import TestModelMixin
@@ -388,3 +389,15 @@
 
     def test_is_editable(self):
         self.assertTrue(EditableBinaryField().editable)
+
+
+class TestMAASIPAddressField(TestModelMixin, MAASServerTestCase):
+
+    app = 'maasserver.tests'
+
+    def test_uses_ip_comparison(self):
+        ip_object = MAASIPAddressFieldModel.objects.create(
+            ip_address='192.0.2.99')
+        results = MAASIPAddressFieldModel.objects.filter(
+            ip_address__lte='192.0.2.100')
+        self.assertItemsEqual([ip_object], results)