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