Merge lp:~julian-edwards/maas/api-reserved-ip into lp:~maas-committers/maas/trunk
- api-reserved-ip
- Merge into trunk
Proposed by
Julian Edwards
| Status: | Merged |
|---|---|
| Approved by: | Julian Edwards |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2452 |
| Proposed branch: | lp:~julian-edwards/maas/api-reserved-ip |
| Merge into: | lp:~maas-committers/maas/trunk |
| Diff against target: |
337 lines (+304/-0) 3 files modified
src/maasserver/enum.py (+3/-0) src/maasserver/migrations/0085_add_user_to_staticipaddress.py (+296/-0) src/maasserver/models/staticipaddress.py (+5/-0) |
| To merge this branch: | bzr merge lp:~julian-edwards/maas/api-reserved-ip |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeroen T. Vermeulen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Model changes: Add User FK to StaticIPAddress and add a new enum type for it, USER_RESERVED which is for reserved IPs in MAAS that do not require a DHCP map.
Description of the change
To post a comment you must log in.
Revision history for this message
| Julian Edwards (julian-edwards) wrote : | # |
On 21/06/14 00:31, Jeroen T. Vermeulen wrote:
> Review: Approve
>
> Is this really different from UNMANAGED, perhaps without a MAC?
>
Yes it's different. UNMANAGED requires a DHCP mapping, USER_RESERVED
does not. I was hoping I'd made that clear in the docstrings, is there
something I can change that would make it clearer?
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/maasserver/enum.py' | |||
| 2 | --- src/maasserver/enum.py 2014-06-12 15:48:32 +0000 | |||
| 3 | +++ src/maasserver/enum.py 2014-06-20 06:14:25 +0000 | |||
| 4 | @@ -166,3 +166,6 @@ | |||
| 5 | 166 | 166 | ||
| 6 | 167 | # Additional IP requested by a user for a node. | 167 | # Additional IP requested by a user for a node. |
| 7 | 168 | EXTRA = 3 | 168 | EXTRA = 3 |
| 8 | 169 | |||
| 9 | 170 | # Reserved by a user, no DHCP map required in MAAS. | ||
| 10 | 171 | USER_RESERVED = 4 | ||
| 11 | 169 | 172 | ||
| 12 | === added file 'src/maasserver/migrations/0085_add_user_to_staticipaddress.py' | |||
| 13 | --- src/maasserver/migrations/0085_add_user_to_staticipaddress.py 1970-01-01 00:00:00 +0000 | |||
| 14 | +++ src/maasserver/migrations/0085_add_user_to_staticipaddress.py 2014-06-20 06:14:25 +0000 | |||
| 15 | @@ -0,0 +1,296 @@ | |||
| 16 | 1 | # -*- coding: utf-8 -*- | ||
| 17 | 2 | from south.utils import datetime_utils as datetime | ||
| 18 | 3 | from south.db import db | ||
| 19 | 4 | from south.v2 import SchemaMigration | ||
| 20 | 5 | from django.db import models | ||
| 21 | 6 | |||
| 22 | 7 | |||
| 23 | 8 | class Migration(SchemaMigration): | ||
| 24 | 9 | |||
| 25 | 10 | def forwards(self, orm): | ||
| 26 | 11 | # Adding field 'StaticIPAddress.user' | ||
| 27 | 12 | db.add_column(u'maasserver_staticipaddress', 'user', | ||
| 28 | 13 | self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['auth.User'], null=True, blank=True), | ||
| 29 | 14 | keep_default=False) | ||
| 30 | 15 | |||
| 31 | 16 | |||
| 32 | 17 | def backwards(self, orm): | ||
| 33 | 18 | # Deleting field 'StaticIPAddress.user' | ||
| 34 | 19 | db.delete_column(u'maasserver_staticipaddress', 'user_id') | ||
| 35 | 20 | |||
| 36 | 21 | |||
| 37 | 22 | models = { | ||
| 38 | 23 | u'auth.group': { | ||
| 39 | 24 | 'Meta': {'object_name': 'Group'}, | ||
| 40 | 25 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 41 | 26 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
| 42 | 27 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| 43 | 28 | }, | ||
| 44 | 29 | u'auth.permission': { | ||
| 45 | 30 | 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | ||
| 46 | 31 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 47 | 32 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | ||
| 48 | 33 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 49 | 34 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| 50 | 35 | }, | ||
| 51 | 36 | u'auth.user': { | ||
| 52 | 37 | 'Meta': {'object_name': 'User'}, | ||
| 53 | 38 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 54 | 39 | 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), | ||
| 55 | 40 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 56 | 41 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | ||
| 57 | 42 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 58 | 43 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 59 | 44 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 60 | 45 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 61 | 46 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 62 | 47 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 63 | 48 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
| 64 | 49 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | ||
| 65 | 50 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| 66 | 51 | }, | ||
| 67 | 52 | u'contenttypes.contenttype': { | ||
| 68 | 53 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
| 69 | 54 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 70 | 55 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 71 | 56 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 72 | 57 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| 73 | 58 | }, | ||
| 74 | 59 | u'maasserver.bootimage': { | ||
| 75 | 60 | 'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'}, | ||
| 76 | 61 | 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 77 | 62 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 78 | 63 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 79 | 64 | 'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}), | ||
| 80 | 65 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), | ||
| 81 | 66 | 'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 82 | 67 | 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 83 | 68 | 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 84 | 69 | 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 85 | 70 | 'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 86 | 71 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 87 | 72 | }, | ||
| 88 | 73 | u'maasserver.bootsource': { | ||
| 89 | 74 | 'Meta': {'object_name': 'BootSource'}, | ||
| 90 | 75 | 'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), | ||
| 91 | 76 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 92 | 77 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 93 | 78 | 'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}), | ||
| 94 | 79 | 'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 95 | 80 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 96 | 81 | 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}) | ||
| 97 | 82 | }, | ||
| 98 | 83 | u'maasserver.bootsourceselection': { | ||
| 99 | 84 | 'Meta': {'object_name': 'BootSourceSelection'}, | ||
| 100 | 85 | 'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), | ||
| 101 | 86 | 'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}), | ||
| 102 | 87 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 103 | 88 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 104 | 89 | 'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), | ||
| 105 | 90 | 'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), | ||
| 106 | 91 | 'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), | ||
| 107 | 92 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 108 | 93 | }, | ||
| 109 | 94 | u'maasserver.componenterror': { | ||
| 110 | 95 | 'Meta': {'object_name': 'ComponentError'}, | ||
| 111 | 96 | 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), | ||
| 112 | 97 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 113 | 98 | 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), | ||
| 114 | 99 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 115 | 100 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 116 | 101 | }, | ||
| 117 | 102 | u'maasserver.config': { | ||
| 118 | 103 | 'Meta': {'object_name': 'Config'}, | ||
| 119 | 104 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 120 | 105 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 121 | 106 | 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) | ||
| 122 | 107 | }, | ||
| 123 | 108 | u'maasserver.dhcplease': { | ||
| 124 | 109 | 'Meta': {'object_name': 'DHCPLease'}, | ||
| 125 | 110 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 126 | 111 | 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), | ||
| 127 | 112 | 'mac': ('maasserver.fields.MACAddressField', [], {}), | ||
| 128 | 113 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) | ||
| 129 | 114 | }, | ||
| 130 | 115 | u'maasserver.downloadprogress': { | ||
| 131 | 116 | 'Meta': {'object_name': 'DownloadProgress'}, | ||
| 132 | 117 | 'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 133 | 118 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 134 | 119 | 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}), | ||
| 135 | 120 | 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 136 | 121 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 137 | 122 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), | ||
| 138 | 123 | 'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 139 | 124 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 140 | 125 | }, | ||
| 141 | 126 | u'maasserver.filestorage': { | ||
| 142 | 127 | 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'}, | ||
| 143 | 128 | 'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}), | ||
| 144 | 129 | 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 145 | 130 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 146 | 131 | 'key': ('django.db.models.fields.CharField', [], {'default': "u'b7a33d80-f840-11e3-a08e-002215205ce8'", 'unique': 'True', 'max_length': '36'}), | ||
| 147 | 132 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
| 148 | 133 | }, | ||
| 149 | 134 | u'maasserver.macaddress': { | ||
| 150 | 135 | 'Meta': {'object_name': 'MACAddress'}, | ||
| 151 | 136 | 'cluster_interface': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['maasserver.NodeGroupInterface']", 'null': 'True', 'blank': 'True'}), | ||
| 152 | 137 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 153 | 138 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 154 | 139 | 'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': 'True'}), | ||
| 155 | 140 | 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), | ||
| 156 | 141 | 'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 157 | 142 | 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), | ||
| 158 | 143 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 159 | 144 | }, | ||
| 160 | 145 | u'maasserver.macstaticipaddresslink': { | ||
| 161 | 146 | 'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'}, | ||
| 162 | 147 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 163 | 148 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 164 | 149 | 'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}), | ||
| 165 | 150 | 'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}), | ||
| 166 | 151 | 'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), | ||
| 167 | 152 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 168 | 153 | }, | ||
| 169 | 154 | u'maasserver.network': { | ||
| 170 | 155 | 'Meta': {'object_name': 'Network'}, | ||
| 171 | 156 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 172 | 157 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 173 | 158 | 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), | ||
| 174 | 159 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), | ||
| 175 | 160 | 'netmask': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), | ||
| 176 | 161 | 'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}) | ||
| 177 | 162 | }, | ||
| 178 | 163 | u'maasserver.node': { | ||
| 179 | 164 | 'Meta': {'object_name': 'Node'}, | ||
| 180 | 165 | 'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 181 | 166 | 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}), | ||
| 182 | 167 | 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 183 | 168 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 184 | 169 | 'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), | ||
| 185 | 170 | 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
| 186 | 171 | 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), | ||
| 187 | 172 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 188 | 173 | 'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), | ||
| 189 | 174 | 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 190 | 175 | 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 191 | 176 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), | ||
| 192 | 177 | 'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), | ||
| 193 | 178 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), | ||
| 194 | 179 | 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), | ||
| 195 | 180 | 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), | ||
| 196 | 181 | 'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}), | ||
| 197 | 182 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), | ||
| 198 | 183 | 'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 199 | 184 | 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-b7a51786-f840-11e3-a08e-002215205ce8'", 'unique': 'True', 'max_length': '41'}), | ||
| 200 | 185 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), | ||
| 201 | 186 | 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}), | ||
| 202 | 187 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 203 | 188 | 'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'}) | ||
| 204 | 189 | }, | ||
| 205 | 190 | u'maasserver.nodegroup': { | ||
| 206 | 191 | 'Meta': {'object_name': 'NodeGroup'}, | ||
| 207 | 192 | 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), | ||
| 208 | 193 | 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}), | ||
| 209 | 194 | 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), | ||
| 210 | 195 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 211 | 196 | 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
| 212 | 197 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 213 | 198 | 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
| 214 | 199 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
| 215 | 200 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 216 | 201 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 217 | 202 | 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) | ||
| 218 | 203 | }, | ||
| 219 | 204 | u'maasserver.nodegroupinterface': { | ||
| 220 | 205 | 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, | ||
| 221 | 206 | 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 222 | 207 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 223 | 208 | 'foreign_dhcp_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 224 | 209 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 225 | 210 | 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
| 226 | 211 | 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), | ||
| 227 | 212 | 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 228 | 213 | 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 229 | 214 | 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 230 | 215 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), | ||
| 231 | 216 | 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 232 | 217 | 'static_ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 233 | 218 | 'static_ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 234 | 219 | 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
| 235 | 220 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 236 | 221 | }, | ||
| 237 | 222 | u'maasserver.sshkey': { | ||
| 238 | 223 | 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, | ||
| 239 | 224 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 240 | 225 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 241 | 226 | 'key': ('django.db.models.fields.TextField', [], {}), | ||
| 242 | 227 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 243 | 228 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) | ||
| 244 | 229 | }, | ||
| 245 | 230 | u'maasserver.sslkey': { | ||
| 246 | 231 | 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'}, | ||
| 247 | 232 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 248 | 233 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 249 | 234 | 'key': ('django.db.models.fields.TextField', [], {}), | ||
| 250 | 235 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 251 | 236 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) | ||
| 252 | 237 | }, | ||
| 253 | 238 | u'maasserver.staticipaddress': { | ||
| 254 | 239 | 'Meta': {'object_name': 'StaticIPAddress'}, | ||
| 255 | 240 | 'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 256 | 241 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 257 | 242 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 258 | 243 | 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), | ||
| 259 | 244 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 260 | 245 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
| 261 | 246 | }, | ||
| 262 | 247 | u'maasserver.tag': { | ||
| 263 | 248 | 'Meta': {'object_name': 'Tag'}, | ||
| 264 | 249 | 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 265 | 250 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 266 | 251 | 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 267 | 252 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 268 | 253 | 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 269 | 254 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), | ||
| 270 | 255 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 271 | 256 | }, | ||
| 272 | 257 | u'maasserver.userprofile': { | ||
| 273 | 258 | 'Meta': {'object_name': 'UserProfile'}, | ||
| 274 | 259 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 275 | 260 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) | ||
| 276 | 261 | }, | ||
| 277 | 262 | u'maasserver.zone': { | ||
| 278 | 263 | 'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'}, | ||
| 279 | 264 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 280 | 265 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 281 | 266 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 282 | 267 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), | ||
| 283 | 268 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 284 | 269 | }, | ||
| 285 | 270 | u'piston.consumer': { | ||
| 286 | 271 | 'Meta': {'object_name': 'Consumer'}, | ||
| 287 | 272 | 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 288 | 273 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 289 | 274 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), | ||
| 290 | 275 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 291 | 276 | 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
| 292 | 277 | 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), | ||
| 293 | 278 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"}) | ||
| 294 | 279 | }, | ||
| 295 | 280 | u'piston.token': { | ||
| 296 | 281 | 'Meta': {'object_name': 'Token'}, | ||
| 297 | 282 | 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 298 | 283 | 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 299 | 284 | 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}), | ||
| 300 | 285 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 301 | 286 | 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 302 | 287 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), | ||
| 303 | 288 | 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
| 304 | 289 | 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1403244258L'}), | ||
| 305 | 290 | 'token_type': ('django.db.models.fields.IntegerField', [], {}), | ||
| 306 | 291 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}), | ||
| 307 | 292 | 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) | ||
| 308 | 293 | } | ||
| 309 | 294 | } | ||
| 310 | 295 | |||
| 311 | 296 | complete_apps = ['maasserver'] | ||
| 312 | 0 | \ No newline at end of file | 297 | \ No newline at end of file |
| 313 | 1 | 298 | ||
| 314 | === modified file 'src/maasserver/models/staticipaddress.py' | |||
| 315 | --- src/maasserver/models/staticipaddress.py 2014-06-12 10:08:51 +0000 | |||
| 316 | +++ src/maasserver/models/staticipaddress.py 2014-06-20 06:14:25 +0000 | |||
| 317 | @@ -24,8 +24,10 @@ | |||
| 318 | 24 | ] | 24 | ] |
| 319 | 25 | 25 | ||
| 320 | 26 | 26 | ||
| 321 | 27 | from django.contrib.auth.models import User | ||
| 322 | 27 | from django.db.models import ( | 28 | from django.db.models import ( |
| 323 | 28 | GenericIPAddressField, | 29 | GenericIPAddressField, |
| 324 | 30 | ForeignKey, | ||
| 325 | 29 | IntegerField, | 31 | IntegerField, |
| 326 | 30 | Manager, | 32 | Manager, |
| 327 | 31 | ) | 33 | ) |
| 328 | @@ -110,6 +112,9 @@ | |||
| 329 | 110 | alloc_type = IntegerField( | 112 | alloc_type = IntegerField( |
| 330 | 111 | editable=False, null=False, blank=False, default=IPADDRESS_TYPE.AUTO) | 113 | editable=False, null=False, blank=False, default=IPADDRESS_TYPE.AUTO) |
| 331 | 112 | 114 | ||
| 332 | 115 | user = ForeignKey( | ||
| 333 | 116 | User, default=None, blank=True, null=True, editable=False) | ||
| 334 | 117 | |||
| 335 | 113 | objects = StaticIPAddressManager() | 118 | objects = StaticIPAddressManager() |
| 336 | 114 | 119 | ||
| 337 | 115 | def __unicode__(self): | 120 | def __unicode__(self): |
Is this really different from UNMANAGED, perhaps without a MAC?