Merge lp:~rvb/maas/bug-1123986-db-filestorage-key into lp:~maas-committers/maas/trunk
- bug-1123986-db-filestorage-key
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1440 | ||||
Proposed branch: | lp:~rvb/maas/bug-1123986-db-filestorage-key | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Prerequisite: | lp:~rvb/maas/bug-1123986 | ||||
Diff against target: |
480 lines (+437/-0) 4 files modified
src/maasserver/migrations/0048_add_key_to_filestorage.py (+213/-0) src/maasserver/migrations/0049_filestorage_key_unique.py (+205/-0) src/maasserver/models/filestorage.py (+9/-0) src/maasserver/tests/test_filestorage.py (+10/-0) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/bug-1123986-db-filestorage-key | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+149058@code.launchpad.net |
Commit message
Add randomly generated key to FileStorage objects.
Description of the change
This is done in 2 migrations:
- one that adds the new field and populates it
- one that adds the unique constraints
Raphaël Badin (rvb) wrote : | # |
Thanks for the review.
> [1]
>
> + db.add_
> + self.gf(
> 'f8d320dc-
> + keep_default=False)
> The default looks like it sneaked in.
Indeed, fixed (I've replaced it with ''). Note that it was of no consequence since the value of 'key' was changed right after this code.
> Although, what does keep_default=False do?
** South doc **
If keep_default is True, then any default value specified on the field will be added to the database schema for that column permanently. If not, then the default is only used when adding the column, and then dropped afterwards.
In this instance, Django itself will initialize the value so there is no need to set a default at the DB level. That would also make little sense because of the uniqueness of the column.
Preview Diff
1 | === added file 'src/maasserver/migrations/0048_add_key_to_filestorage.py' |
2 | --- src/maasserver/migrations/0048_add_key_to_filestorage.py 1970-01-01 00:00:00 +0000 |
3 | +++ src/maasserver/migrations/0048_add_key_to_filestorage.py 2013-02-18 16:04:22 +0000 |
4 | @@ -0,0 +1,213 @@ |
5 | +# -*- coding: utf-8 -*- |
6 | +import datetime |
7 | + |
8 | +from django.db import models |
9 | +from maasserver.models import filestorage |
10 | +from south.db import db |
11 | +from south.v2 import SchemaMigration |
12 | + |
13 | + |
14 | +class Migration(SchemaMigration): |
15 | + |
16 | + def forwards(self, orm): |
17 | + # Adding field 'FileStorage.key' |
18 | + db.add_column(u'maasserver_filestorage', 'key', |
19 | + self.gf('django.db.models.fields.CharField')(default=u'', max_length=36), |
20 | + keep_default=False) |
21 | + |
22 | + # Populate FileStorage.key with random keys. |
23 | + for file_storage in orm.FileStorage.objects.all(): |
24 | + file_storage.key = filestorage.generate_filestorage_key() |
25 | + file_storage.save() |
26 | + |
27 | + |
28 | + def backwards(self, orm): |
29 | + # Deleting field 'FileStorage.key' |
30 | + db.delete_column(u'maasserver_filestorage', 'key') |
31 | + |
32 | + |
33 | + models = { |
34 | + 'auth.group': { |
35 | + 'Meta': {'object_name': 'Group'}, |
36 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
37 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
38 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
39 | + }, |
40 | + 'auth.permission': { |
41 | + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
42 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
43 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
44 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
45 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
46 | + }, |
47 | + 'auth.user': { |
48 | + 'Meta': {'object_name': 'User'}, |
49 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
50 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), |
51 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
52 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), |
53 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
54 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
55 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
56 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
57 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
58 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
59 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
60 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), |
61 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
62 | + }, |
63 | + 'contenttypes.contenttype': { |
64 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
65 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
66 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
67 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
68 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
69 | + }, |
70 | + u'maasserver.bootimage': { |
71 | + 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'}, |
72 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
73 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
74 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
75 | + 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
76 | + 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
77 | + 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}) |
78 | + }, |
79 | + u'maasserver.componenterror': { |
80 | + 'Meta': {'object_name': 'ComponentError'}, |
81 | + 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), |
82 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
83 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), |
84 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
85 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
86 | + }, |
87 | + u'maasserver.config': { |
88 | + 'Meta': {'object_name': 'Config'}, |
89 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
90 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
91 | + 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) |
92 | + }, |
93 | + u'maasserver.dhcplease': { |
94 | + 'Meta': {'object_name': 'DHCPLease'}, |
95 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
96 | + 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), |
97 | + 'mac': ('maasserver.fields.MACAddressField', [], {}), |
98 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) |
99 | + }, |
100 | + u'maasserver.filestorage': { |
101 | + 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'}, |
102 | + 'content': ('metadataserver.fields.BinaryField', [], {}), |
103 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
104 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
105 | + 'key': ('django.db.models.fields.CharField', [], {'default': "u'f8de970a-79ba-11e2-9997-3c970e0e56dc'", 'max_length': '36'}), |
106 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) |
107 | + }, |
108 | + u'maasserver.macaddress': { |
109 | + 'Meta': {'object_name': 'MACAddress'}, |
110 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
111 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
112 | + 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), |
113 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
114 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
115 | + }, |
116 | + u'maasserver.node': { |
117 | + 'Meta': {'object_name': 'Node'}, |
118 | + 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
119 | + 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}), |
120 | + 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
121 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
122 | + 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}), |
123 | + 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
124 | + 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), |
125 | + 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), |
126 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
127 | + 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
128 | + 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
129 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), |
130 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), |
131 | + 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
132 | + 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), |
133 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), |
134 | + 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-f8dfe132-79ba-11e2-9997-3c970e0e56dc'", 'unique': 'True', 'max_length': '41'}), |
135 | + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), |
136 | + 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}), |
137 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
138 | + }, |
139 | + u'maasserver.nodegroup': { |
140 | + 'Meta': {'object_name': 'NodeGroup'}, |
141 | + 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), |
142 | + 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}), |
143 | + 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), |
144 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
145 | + 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
146 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
147 | + 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
148 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), |
149 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
150 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
151 | + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) |
152 | + }, |
153 | + u'maasserver.nodegroupinterface': { |
154 | + 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, |
155 | + 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
156 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
157 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
158 | + 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
159 | + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), |
160 | + 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
161 | + 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
162 | + 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
163 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
164 | + 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
165 | + 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
166 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
167 | + }, |
168 | + u'maasserver.sshkey': { |
169 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, |
170 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
171 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
172 | + 'key': ('django.db.models.fields.TextField', [], {}), |
173 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
174 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) |
175 | + }, |
176 | + u'maasserver.tag': { |
177 | + 'Meta': {'object_name': 'Tag'}, |
178 | + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
179 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
180 | + 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
181 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
182 | + 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), |
183 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
184 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
185 | + }, |
186 | + u'maasserver.userprofile': { |
187 | + 'Meta': {'object_name': 'UserProfile'}, |
188 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
189 | + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
190 | + }, |
191 | + 'piston.consumer': { |
192 | + 'Meta': {'object_name': 'Consumer'}, |
193 | + 'description': ('django.db.models.fields.TextField', [], {}), |
194 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
195 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
196 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
197 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
198 | + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), |
199 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"}) |
200 | + }, |
201 | + 'piston.token': { |
202 | + 'Meta': {'object_name': 'Token'}, |
203 | + 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), |
204 | + 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
205 | + 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}), |
206 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
207 | + 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
208 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
209 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
210 | + 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1361185471L'}), |
211 | + 'token_type': ('django.db.models.fields.IntegerField', [], {}), |
212 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}), |
213 | + 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) |
214 | + } |
215 | + } |
216 | + |
217 | + complete_apps = ['maasserver'] |
218 | |
219 | === added file 'src/maasserver/migrations/0049_filestorage_key_unique.py' |
220 | --- src/maasserver/migrations/0049_filestorage_key_unique.py 1970-01-01 00:00:00 +0000 |
221 | +++ src/maasserver/migrations/0049_filestorage_key_unique.py 2013-02-18 16:04:22 +0000 |
222 | @@ -0,0 +1,205 @@ |
223 | +# -*- coding: utf-8 -*- |
224 | +import datetime |
225 | + |
226 | +from django.db import models |
227 | +from south.db import db |
228 | +from south.v2 import SchemaMigration |
229 | + |
230 | + |
231 | +class Migration(SchemaMigration): |
232 | + |
233 | + def forwards(self, orm): |
234 | + # Adding unique constraint on 'FileStorage', fields ['key'] |
235 | + db.create_unique(u'maasserver_filestorage', ['key']) |
236 | + |
237 | + |
238 | + def backwards(self, orm): |
239 | + # Removing unique constraint on 'FileStorage', fields ['key'] |
240 | + db.delete_unique(u'maasserver_filestorage', ['key']) |
241 | + |
242 | + |
243 | + models = { |
244 | + 'auth.group': { |
245 | + 'Meta': {'object_name': 'Group'}, |
246 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
247 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
248 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
249 | + }, |
250 | + 'auth.permission': { |
251 | + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
252 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
253 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
254 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
255 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
256 | + }, |
257 | + 'auth.user': { |
258 | + 'Meta': {'object_name': 'User'}, |
259 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
260 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), |
261 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
262 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), |
263 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
264 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
265 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
266 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
267 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
268 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
269 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
270 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), |
271 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
272 | + }, |
273 | + 'contenttypes.contenttype': { |
274 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
275 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
276 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
277 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
278 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
279 | + }, |
280 | + u'maasserver.bootimage': { |
281 | + 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'}, |
282 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
283 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
284 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
285 | + 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
286 | + 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
287 | + 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}) |
288 | + }, |
289 | + u'maasserver.componenterror': { |
290 | + 'Meta': {'object_name': 'ComponentError'}, |
291 | + 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), |
292 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
293 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), |
294 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
295 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
296 | + }, |
297 | + u'maasserver.config': { |
298 | + 'Meta': {'object_name': 'Config'}, |
299 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
300 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
301 | + 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) |
302 | + }, |
303 | + u'maasserver.dhcplease': { |
304 | + 'Meta': {'object_name': 'DHCPLease'}, |
305 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
306 | + 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), |
307 | + 'mac': ('maasserver.fields.MACAddressField', [], {}), |
308 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) |
309 | + }, |
310 | + u'maasserver.filestorage': { |
311 | + 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'}, |
312 | + 'content': ('metadataserver.fields.BinaryField', [], {}), |
313 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
314 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
315 | + 'key': ('django.db.models.fields.CharField', [], {'default': "u'1cbbd0e8-79bb-11e2-a69f-3c970e0e56dc'", 'unique': 'True', 'max_length': '36'}), |
316 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) |
317 | + }, |
318 | + u'maasserver.macaddress': { |
319 | + 'Meta': {'object_name': 'MACAddress'}, |
320 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
321 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
322 | + 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), |
323 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
324 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
325 | + }, |
326 | + u'maasserver.node': { |
327 | + 'Meta': {'object_name': 'Node'}, |
328 | + 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
329 | + 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}), |
330 | + 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
331 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
332 | + 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}), |
333 | + 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
334 | + 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), |
335 | + 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), |
336 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
337 | + 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
338 | + 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
339 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), |
340 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), |
341 | + 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
342 | + 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), |
343 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), |
344 | + 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-1cbad472-79bb-11e2-a69f-3c970e0e56dc'", 'unique': 'True', 'max_length': '41'}), |
345 | + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), |
346 | + 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}), |
347 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
348 | + }, |
349 | + u'maasserver.nodegroup': { |
350 | + 'Meta': {'object_name': 'NodeGroup'}, |
351 | + 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), |
352 | + 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}), |
353 | + 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), |
354 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
355 | + 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
356 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
357 | + 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
358 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), |
359 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
360 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
361 | + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) |
362 | + }, |
363 | + u'maasserver.nodegroupinterface': { |
364 | + 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, |
365 | + 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
366 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
367 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
368 | + 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
369 | + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), |
370 | + 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
371 | + 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
372 | + 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
373 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
374 | + 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
375 | + 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
376 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
377 | + }, |
378 | + u'maasserver.sshkey': { |
379 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, |
380 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
381 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
382 | + 'key': ('django.db.models.fields.TextField', [], {}), |
383 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
384 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) |
385 | + }, |
386 | + u'maasserver.tag': { |
387 | + 'Meta': {'object_name': 'Tag'}, |
388 | + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
389 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
390 | + 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
391 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
392 | + 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), |
393 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
394 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
395 | + }, |
396 | + u'maasserver.userprofile': { |
397 | + 'Meta': {'object_name': 'UserProfile'}, |
398 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
399 | + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
400 | + }, |
401 | + 'piston.consumer': { |
402 | + 'Meta': {'object_name': 'Consumer'}, |
403 | + 'description': ('django.db.models.fields.TextField', [], {}), |
404 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
405 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
406 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
407 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
408 | + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), |
409 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"}) |
410 | + }, |
411 | + 'piston.token': { |
412 | + 'Meta': {'object_name': 'Token'}, |
413 | + 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), |
414 | + 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
415 | + 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}), |
416 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
417 | + 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
418 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
419 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
420 | + 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1361185532L'}), |
421 | + 'token_type': ('django.db.models.fields.IntegerField', [], {}), |
422 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}), |
423 | + 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) |
424 | + } |
425 | + } |
426 | + |
427 | + complete_apps = ['maasserver'] |
428 | \ No newline at end of file |
429 | |
430 | === modified file 'src/maasserver/models/filestorage.py' |
431 | --- src/maasserver/models/filestorage.py 2013-02-18 16:04:22 +0000 |
432 | +++ src/maasserver/models/filestorage.py 2013-02-18 16:04:22 +0000 |
433 | @@ -15,6 +15,8 @@ |
434 | ] |
435 | |
436 | |
437 | +from uuid import uuid1 |
438 | + |
439 | from django.contrib.auth.models import User |
440 | from django.db.models import ( |
441 | CharField, |
442 | @@ -62,6 +64,10 @@ |
443 | return storage |
444 | |
445 | |
446 | +def generate_filestorage_key(): |
447 | + return '%s' % uuid1() |
448 | + |
449 | + |
450 | class FileStorage(CleanSave, Model): |
451 | """A simple file storage keyed on file name. |
452 | |
453 | @@ -80,6 +86,9 @@ |
454 | # installations where the files were not linked to users yet. |
455 | owner = ForeignKey( |
456 | User, default=None, blank=True, null=True, editable=False) |
457 | + key = CharField( |
458 | + max_length=36, unique=True, default=generate_filestorage_key, |
459 | + editable=False) |
460 | |
461 | objects = FileStorageManager() |
462 | |
463 | |
464 | === modified file 'src/maasserver/tests/test_filestorage.py' |
465 | --- src/maasserver/tests/test_filestorage.py 2012-11-23 11:40:16 +0000 |
466 | +++ src/maasserver/tests/test_filestorage.py 2013-02-18 16:04:22 +0000 |
467 | @@ -71,3 +71,13 @@ |
468 | self.assertEqual(old_storage.filename, new_storage.filename) |
469 | self.assertEqual( |
470 | new_data, FileStorage.objects.get(filename=filename).content) |
471 | + |
472 | + def test_key_gets_generated(self): |
473 | + # The generated system_id looks good. |
474 | + storage = factory.make_file_storage() |
475 | + self.assertEqual(len(storage.key), 36) |
476 | + |
477 | + def test_key_includes_random_part(self): |
478 | + storage1 = factory.make_file_storage() |
479 | + storage2 = factory.make_file_storage() |
480 | + self.assertNotEqual(storage1.key, storage2.key) |
Looks good.
[1]
+ db.add_ column( u'maasserver_ filestorage' , 'key', 'django. db.models. fields. CharField' )(default= u'f8d320dc- 79ba-11e2- 9997-3c970e0e56 dc', max_length=36),
+ self.gf(
+ keep_default=False)
The default looks like it sneaked in. Although, what does
keep_default=False do?