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