Merge lp:~rvb/maas/bug-1123986 into lp:~maas-committers/maas/trunk
- bug-1123986
- Merge into trunk
Proposed by
Raphaël Badin
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1439 | ||||
Proposed branch: | lp:~rvb/maas/bug-1123986 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
261 lines (+228/-2) 2 files modified
src/maasserver/migrations/0047_add_owner_to_filestorage.py (+218/-0) src/maasserver/models/filestorage.py (+10/-2) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/bug-1123986 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+149057@code.launchpad.net |
Commit message
Add 'owner' field to FileStorage.
Description of the change
- Add 'owner' field to FileStorage.
- Remove uniqueness of FileStorage.
- ('owner', 'filename') must be unique.
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'src/maasserver/migrations/0047_add_owner_to_filestorage.py' |
2 | --- src/maasserver/migrations/0047_add_owner_to_filestorage.py 1970-01-01 00:00:00 +0000 |
3 | +++ src/maasserver/migrations/0047_add_owner_to_filestorage.py 2013-02-18 14:29:27 +0000 |
4 | @@ -0,0 +1,218 @@ |
5 | +# -*- coding: utf-8 -*- |
6 | +import datetime |
7 | + |
8 | +from django.db import models |
9 | +from south.db import db |
10 | +from south.v2 import SchemaMigration |
11 | + |
12 | + |
13 | +class Migration(SchemaMigration): |
14 | + |
15 | + def forwards(self, orm): |
16 | + # Removing unique constraint on 'FileStorage', fields ['filename'] |
17 | + db.delete_unique(u'maasserver_filestorage', ['filename']) |
18 | + |
19 | + # Adding field 'FileStorage.owner' |
20 | + db.add_column(u'maasserver_filestorage', 'owner', |
21 | + self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['auth.User'], null=True, blank=True), |
22 | + keep_default=False) |
23 | + |
24 | + # Adding unique constraint on 'FileStorage', fields ['owner', 'filename'] |
25 | + db.create_unique(u'maasserver_filestorage', ['owner_id', 'filename']) |
26 | + |
27 | + |
28 | + def backwards(self, orm): |
29 | + # Removing unique constraint on 'FileStorage', fields ['owner', 'filename'] |
30 | + db.delete_unique(u'maasserver_filestorage', ['owner_id', 'filename']) |
31 | + |
32 | + # Deleting field 'FileStorage.owner' |
33 | + db.delete_column(u'maasserver_filestorage', 'owner_id') |
34 | + |
35 | + # Adding unique constraint on 'FileStorage', fields ['filename'] |
36 | + db.create_unique(u'maasserver_filestorage', ['filename']) |
37 | + |
38 | + |
39 | + models = { |
40 | + 'auth.group': { |
41 | + 'Meta': {'object_name': 'Group'}, |
42 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
43 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
44 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
45 | + }, |
46 | + 'auth.permission': { |
47 | + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
48 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
49 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
50 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
51 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
52 | + }, |
53 | + 'auth.user': { |
54 | + 'Meta': {'object_name': 'User'}, |
55 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
56 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), |
57 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
58 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), |
59 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
60 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
61 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
62 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
63 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
64 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
65 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
66 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), |
67 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
68 | + }, |
69 | + 'contenttypes.contenttype': { |
70 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
71 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
72 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
73 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
74 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
75 | + }, |
76 | + u'maasserver.bootimage': { |
77 | + 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'}, |
78 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
79 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
80 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
81 | + 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
82 | + 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
83 | + 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}) |
84 | + }, |
85 | + u'maasserver.componenterror': { |
86 | + 'Meta': {'object_name': 'ComponentError'}, |
87 | + 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), |
88 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
89 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), |
90 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
91 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
92 | + }, |
93 | + u'maasserver.config': { |
94 | + 'Meta': {'object_name': 'Config'}, |
95 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
96 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
97 | + 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) |
98 | + }, |
99 | + u'maasserver.dhcplease': { |
100 | + 'Meta': {'object_name': 'DHCPLease'}, |
101 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
102 | + 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), |
103 | + 'mac': ('maasserver.fields.MACAddressField', [], {}), |
104 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) |
105 | + }, |
106 | + u'maasserver.filestorage': { |
107 | + 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'}, |
108 | + 'content': ('metadataserver.fields.BinaryField', [], {}), |
109 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
110 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
111 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) |
112 | + }, |
113 | + u'maasserver.macaddress': { |
114 | + 'Meta': {'object_name': 'MACAddress'}, |
115 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
116 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
117 | + 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), |
118 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
119 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
120 | + }, |
121 | + u'maasserver.node': { |
122 | + 'Meta': {'object_name': 'Node'}, |
123 | + 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
124 | + 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}), |
125 | + 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
126 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
127 | + 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}), |
128 | + 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
129 | + 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), |
130 | + 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), |
131 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
132 | + 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
133 | + 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
134 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), |
135 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), |
136 | + 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
137 | + 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), |
138 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), |
139 | + 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-dd7d4f0e-79b7-11e2-90c3-3c970e0e56dc'", 'unique': 'True', 'max_length': '41'}), |
140 | + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), |
141 | + 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}), |
142 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
143 | + }, |
144 | + u'maasserver.nodegroup': { |
145 | + 'Meta': {'object_name': 'NodeGroup'}, |
146 | + 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), |
147 | + 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}), |
148 | + 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), |
149 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
150 | + 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
151 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
152 | + 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
153 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), |
154 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
155 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
156 | + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) |
157 | + }, |
158 | + u'maasserver.nodegroupinterface': { |
159 | + 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, |
160 | + 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
161 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
162 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
163 | + 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
164 | + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), |
165 | + 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
166 | + 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
167 | + 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
168 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
169 | + 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
170 | + 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
171 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
172 | + }, |
173 | + u'maasserver.sshkey': { |
174 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, |
175 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
176 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
177 | + 'key': ('django.db.models.fields.TextField', [], {}), |
178 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
179 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) |
180 | + }, |
181 | + u'maasserver.tag': { |
182 | + 'Meta': {'object_name': 'Tag'}, |
183 | + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
184 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
185 | + 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
186 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
187 | + 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), |
188 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
189 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
190 | + }, |
191 | + u'maasserver.userprofile': { |
192 | + 'Meta': {'object_name': 'UserProfile'}, |
193 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
194 | + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
195 | + }, |
196 | + 'piston.consumer': { |
197 | + 'Meta': {'object_name': 'Consumer'}, |
198 | + 'description': ('django.db.models.fields.TextField', [], {}), |
199 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
200 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
201 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
202 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
203 | + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), |
204 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"}) |
205 | + }, |
206 | + 'piston.token': { |
207 | + 'Meta': {'object_name': 'Token'}, |
208 | + 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), |
209 | + 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
210 | + 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}), |
211 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
212 | + 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
213 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
214 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
215 | + 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1361184137L'}), |
216 | + 'token_type': ('django.db.models.fields.IntegerField', [], {}), |
217 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}), |
218 | + 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) |
219 | + } |
220 | + } |
221 | + |
222 | + complete_apps = ['maasserver'] |
223 | \ No newline at end of file |
224 | |
225 | === modified file 'src/maasserver/models/filestorage.py' |
226 | --- src/maasserver/models/filestorage.py 2012-11-08 06:34:48 +0000 |
227 | +++ src/maasserver/models/filestorage.py 2013-02-18 14:29:27 +0000 |
228 | @@ -15,8 +15,10 @@ |
229 | ] |
230 | |
231 | |
232 | +from django.contrib.auth.models import User |
233 | from django.db.models import ( |
234 | CharField, |
235 | + ForeignKey, |
236 | Manager, |
237 | Model, |
238 | ) |
239 | @@ -63,15 +65,21 @@ |
240 | class FileStorage(CleanSave, Model): |
241 | """A simple file storage keyed on file name. |
242 | |
243 | - :ivar filename: A unique file name to use for the data being stored. |
244 | + :ivar filename: A file name to use for the data being stored. |
245 | + :ivar owner: This file's owner.. |
246 | :ivar content: The file's actual data. |
247 | """ |
248 | |
249 | class Meta(DefaultMeta): |
250 | """Needed for South to recognize this model.""" |
251 | + unique_together = ('filename', 'owner') |
252 | |
253 | - filename = CharField(max_length=255, unique=True, editable=False) |
254 | + filename = CharField(max_length=255, unique=False, editable=False) |
255 | content = BinaryField(null=False) |
256 | + # owner can be None: this is to support upgrading existing |
257 | + # installations where the files were not linked to users yet. |
258 | + owner = ForeignKey( |
259 | + User, default=None, blank=True, null=True, editable=False) |
260 | |
261 | objects = FileStorageManager() |
262 |