Merge lp:~blake-rouse/maas/bootresource-cleanup into lp:~maas-committers/maas/trunk
- bootresource-cleanup
- Merge into trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2794 |
Proposed branch: | lp:~blake-rouse/maas/bootresource-cleanup |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
620 lines (+479/-14) 4 files modified
src/maasserver/forms.py (+8/-0) src/maasserver/migrations/0105_remove_rtype_from_uniqueness_on_boot_resource.py (+378/-0) src/maasserver/models/bootresource.py (+33/-3) src/maasserver/models/tests/test_bootresource.py (+60/-11) |
To merge this branch: | bzr merge lp:~blake-rouse/maas/bootresource-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+231944@code.launchpad.net |
Commit message
Remove rtype from unique_together on BootResource model and add validation for name of BootResource, based on the rtype.
Previously a boot resource could be created with an incorrectly formatted name. If the boot resource is synced or generated then the name needed to be in the format of os/series. A custom image should not contain a '/' in the name.
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'src/maasserver/forms.py' |
2 | --- src/maasserver/forms.py 2014-08-21 19:14:52 +0000 |
3 | +++ src/maasserver/forms.py 2014-08-22 19:31:28 +0000 |
4 | @@ -2248,6 +2248,14 @@ |
5 | resource_set=resource_set, largefile=largefile, |
6 | filename=filetype, filetype=filetype) |
7 | |
8 | + def validate_unique(self): |
9 | + """Override to allow the same `BootResource` to already exist. |
10 | + |
11 | + This is done because the existing `BootResource` will be used, and a |
12 | + new set will be added to that resource. |
13 | + """ |
14 | + # Do nothing, as we do not want to report a uniqueness error. |
15 | + |
16 | def save(self): |
17 | """Persist the boot resource into the database. |
18 | |
19 | |
20 | === added file 'src/maasserver/migrations/0105_remove_rtype_from_uniqueness_on_boot_resource.py' |
21 | --- src/maasserver/migrations/0105_remove_rtype_from_uniqueness_on_boot_resource.py 1970-01-01 00:00:00 +0000 |
22 | +++ src/maasserver/migrations/0105_remove_rtype_from_uniqueness_on_boot_resource.py 2014-08-22 19:31:28 +0000 |
23 | @@ -0,0 +1,378 @@ |
24 | +from django.db import models |
25 | +from south.db import db |
26 | +# -*- coding: utf-8 -*- |
27 | +from south.utils import datetime_utils as datetime |
28 | +from south.v2 import SchemaMigration |
29 | + |
30 | + |
31 | +class Migration(SchemaMigration): |
32 | + |
33 | + def forwards(self, orm): |
34 | + # Removing unique constraint on 'BootResource', fields ['architecture', 'name', 'rtype'] |
35 | + db.delete_unique(u'maasserver_bootresource', ['architecture', 'name', 'rtype']) |
36 | + |
37 | + # Adding unique constraint on 'BootResource', fields ['name', 'architecture'] |
38 | + db.create_unique(u'maasserver_bootresource', ['name', 'architecture']) |
39 | + |
40 | + |
41 | + def backwards(self, orm): |
42 | + # Removing unique constraint on 'BootResource', fields ['name', 'architecture'] |
43 | + db.delete_unique(u'maasserver_bootresource', ['name', 'architecture']) |
44 | + |
45 | + # Adding unique constraint on 'BootResource', fields ['architecture', 'name', 'rtype'] |
46 | + db.create_unique(u'maasserver_bootresource', ['architecture', 'name', 'rtype']) |
47 | + |
48 | + |
49 | + models = { |
50 | + u'auth.group': { |
51 | + 'Meta': {'object_name': 'Group'}, |
52 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
53 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
54 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
55 | + }, |
56 | + u'auth.permission': { |
57 | + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, |
58 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
59 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), |
60 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
61 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
62 | + }, |
63 | + u'auth.user': { |
64 | + 'Meta': {'object_name': 'User'}, |
65 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
66 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), |
67 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
68 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), |
69 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
70 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
71 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
72 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
73 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
74 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
75 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
76 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), |
77 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
78 | + }, |
79 | + u'contenttypes.contenttype': { |
80 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
81 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
82 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
83 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
84 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
85 | + }, |
86 | + u'maasserver.bootimage': { |
87 | + 'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'}, |
88 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
89 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
90 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
91 | + 'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}), |
92 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
93 | + 'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
94 | + 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
95 | + 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
96 | + 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
97 | + 'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), |
98 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
99 | + 'xinstall_path': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), |
100 | + 'xinstall_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '30', 'null': 'True', 'blank': 'True'}) |
101 | + }, |
102 | + u'maasserver.bootresource': { |
103 | + 'Meta': {'unique_together': "((u'name', u'architecture'),)", 'object_name': 'BootResource'}, |
104 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
105 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
106 | + 'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
107 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
108 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
109 | + 'rtype': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), |
110 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
111 | + }, |
112 | + u'maasserver.bootresourcefile': { |
113 | + 'Meta': {'unique_together': "((u'resource_set', u'filetype'),)", 'object_name': 'BootResourceFile'}, |
114 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
115 | + 'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
116 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
117 | + 'filetype': ('django.db.models.fields.CharField', [], {'default': "u'tgz'", 'max_length': '20'}), |
118 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
119 | + 'largefile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.LargeFile']"}), |
120 | + 'resource_set': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'files'", 'to': u"orm['maasserver.BootResourceSet']"}), |
121 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
122 | + }, |
123 | + u'maasserver.bootresourceset': { |
124 | + 'Meta': {'unique_together': "((u'resource', u'version'),)", 'object_name': 'BootResourceSet'}, |
125 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
126 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
127 | + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
128 | + 'resource': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'sets'", 'to': u"orm['maasserver.BootResource']"}), |
129 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
130 | + 'version': ('django.db.models.fields.CharField', [], {'max_length': '255'}) |
131 | + }, |
132 | + u'maasserver.bootsource': { |
133 | + 'Meta': {'object_name': 'BootSource'}, |
134 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
135 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
136 | + 'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}), |
137 | + 'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}), |
138 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
139 | + 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'}) |
140 | + }, |
141 | + u'maasserver.bootsourceselection': { |
142 | + 'Meta': {'object_name': 'BootSourceSelection'}, |
143 | + 'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), |
144 | + 'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}), |
145 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
146 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
147 | + 'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), |
148 | + 'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), |
149 | + 'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}), |
150 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
151 | + }, |
152 | + u'maasserver.candidatename': { |
153 | + 'Meta': {'unique_together': "((u'name', u'position'),)", 'object_name': 'CandidateName'}, |
154 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
155 | + 'name': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), |
156 | + 'position': ('django.db.models.fields.IntegerField', [], {}) |
157 | + }, |
158 | + u'maasserver.componenterror': { |
159 | + 'Meta': {'object_name': 'ComponentError'}, |
160 | + 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), |
161 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
162 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), |
163 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
164 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
165 | + }, |
166 | + u'maasserver.config': { |
167 | + 'Meta': {'object_name': 'Config'}, |
168 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
169 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
170 | + 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) |
171 | + }, |
172 | + u'maasserver.dhcplease': { |
173 | + 'Meta': {'object_name': 'DHCPLease'}, |
174 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
175 | + 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}), |
176 | + 'mac': ('maasserver.fields.MACAddressField', [], {}), |
177 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) |
178 | + }, |
179 | + u'maasserver.downloadprogress': { |
180 | + 'Meta': {'object_name': 'DownloadProgress'}, |
181 | + 'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), |
182 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
183 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}), |
184 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
185 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
186 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
187 | + 'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), |
188 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
189 | + }, |
190 | + u'maasserver.event': { |
191 | + 'Meta': {'object_name': 'Event'}, |
192 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
193 | + 'description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}), |
194 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
195 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
196 | + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.EventType']"}), |
197 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
198 | + }, |
199 | + u'maasserver.eventtype': { |
200 | + 'Meta': {'object_name': 'EventType'}, |
201 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
202 | + 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
203 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
204 | + 'level': ('django.db.models.fields.IntegerField', [], {}), |
205 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), |
206 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
207 | + }, |
208 | + u'maasserver.filestorage': { |
209 | + 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'}, |
210 | + 'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}), |
211 | + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
212 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
213 | + 'key': ('django.db.models.fields.CharField', [], {'default': "u'8cc62392-2a28-11e4-8988-bcee7b78dc5b'", 'unique': 'True', 'max_length': '36'}), |
214 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) |
215 | + }, |
216 | + u'maasserver.largefile': { |
217 | + 'Meta': {'object_name': 'LargeFile'}, |
218 | + 'content': ('maasserver.fields.LargeObjectField', [], {}), |
219 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
220 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
221 | + 'sha256': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), |
222 | + 'total_size': ('django.db.models.fields.BigIntegerField', [], {}), |
223 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
224 | + }, |
225 | + u'maasserver.licensekey': { |
226 | + 'Meta': {'unique_together': "((u'osystem', u'distro_series'),)", 'object_name': 'LicenseKey'}, |
227 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
228 | + 'distro_series': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
229 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
230 | + 'license_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
231 | + 'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
232 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
233 | + }, |
234 | + u'maasserver.macaddress': { |
235 | + 'Meta': {'ordering': "(u'created',)", 'object_name': 'MACAddress'}, |
236 | + 'cluster_interface': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['maasserver.NodeGroupInterface']", 'null': 'True', 'blank': 'True'}), |
237 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
238 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
239 | + 'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': 'True'}), |
240 | + 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), |
241 | + 'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}), |
242 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
243 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
244 | + }, |
245 | + u'maasserver.macstaticipaddresslink': { |
246 | + 'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'}, |
247 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
248 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
249 | + 'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}), |
250 | + 'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}), |
251 | + 'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), |
252 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
253 | + }, |
254 | + u'maasserver.network': { |
255 | + 'Meta': {'object_name': 'Network'}, |
256 | + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
257 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
258 | + 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}), |
259 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), |
260 | + 'netmask': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}), |
261 | + 'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}) |
262 | + }, |
263 | + u'maasserver.node': { |
264 | + 'Meta': {'object_name': 'Node'}, |
265 | + 'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), |
266 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}), |
267 | + 'boot_type': ('django.db.models.fields.CharField', [], {'default': "u'fastpath'", 'max_length': '20'}), |
268 | + 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
269 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
270 | + 'disable_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
271 | + 'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), |
272 | + 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
273 | + 'error_description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}), |
274 | + 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), |
275 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
276 | + 'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), |
277 | + 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
278 | + 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
279 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), |
280 | + 'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}), |
281 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), |
282 | + 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
283 | + 'power_state': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '10'}), |
284 | + 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), |
285 | + 'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}), |
286 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), |
287 | + 'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
288 | + 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-8cc3fc5c-2a28-11e4-8988-bcee7b78dc5b'", 'unique': 'True', 'max_length': '41'}), |
289 | + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), |
290 | + 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}), |
291 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
292 | + 'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'}) |
293 | + }, |
294 | + u'maasserver.nodegroup': { |
295 | + 'Meta': {'object_name': 'NodeGroup'}, |
296 | + 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), |
297 | + 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}), |
298 | + 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), |
299 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
300 | + 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
301 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
302 | + 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
303 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), |
304 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
305 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
306 | + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) |
307 | + }, |
308 | + u'maasserver.nodegroupinterface': { |
309 | + 'Meta': {'unique_together': "((u'nodegroup', u'name'),)", 'object_name': 'NodeGroupInterface'}, |
310 | + 'broadcast_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
311 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
312 | + 'foreign_dhcp_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
313 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
314 | + 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
315 | + 'ip': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}), |
316 | + 'ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
317 | + 'ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
318 | + 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
319 | + 'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
320 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
321 | + 'router_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
322 | + 'static_ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
323 | + 'static_ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
324 | + 'subnet_mask': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
325 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
326 | + }, |
327 | + u'maasserver.sshkey': { |
328 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, |
329 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
330 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
331 | + 'key': ('django.db.models.fields.TextField', [], {}), |
332 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
333 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) |
334 | + }, |
335 | + u'maasserver.sslkey': { |
336 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'}, |
337 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
338 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
339 | + 'key': ('django.db.models.fields.TextField', [], {}), |
340 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
341 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) |
342 | + }, |
343 | + u'maasserver.staticipaddress': { |
344 | + 'Meta': {'object_name': 'StaticIPAddress'}, |
345 | + 'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
346 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
347 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
348 | + 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}), |
349 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
350 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) |
351 | + }, |
352 | + u'maasserver.tag': { |
353 | + 'Meta': {'object_name': 'Tag'}, |
354 | + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
355 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
356 | + 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
357 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
358 | + 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), |
359 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
360 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
361 | + }, |
362 | + u'maasserver.userprofile': { |
363 | + 'Meta': {'object_name': 'UserProfile'}, |
364 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
365 | + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) |
366 | + }, |
367 | + u'maasserver.zone': { |
368 | + 'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'}, |
369 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
370 | + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
371 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
372 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
373 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
374 | + }, |
375 | + u'piston.consumer': { |
376 | + 'Meta': {'object_name': 'Consumer'}, |
377 | + 'description': ('django.db.models.fields.TextField', [], {}), |
378 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
379 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
380 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
381 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
382 | + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), |
383 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"}) |
384 | + }, |
385 | + u'piston.token': { |
386 | + 'Meta': {'object_name': 'Token'}, |
387 | + 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), |
388 | + 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
389 | + 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}), |
390 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
391 | + 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
392 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
393 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
394 | + 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1408731437L'}), |
395 | + 'token_type': ('django.db.models.fields.IntegerField', [], {}), |
396 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}), |
397 | + 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) |
398 | + } |
399 | + } |
400 | + |
401 | + complete_apps = ['maasserver'] |
402 | |
403 | === modified file 'src/maasserver/models/bootresource.py' |
404 | --- src/maasserver/models/bootresource.py 2014-08-09 21:58:36 +0000 |
405 | +++ src/maasserver/models/bootresource.py 2014-08-22 19:31:28 +0000 |
406 | @@ -26,6 +26,7 @@ |
407 | from maasserver.enum import ( |
408 | BOOT_RESOURCE_TYPE, |
409 | BOOT_RESOURCE_TYPE_CHOICES, |
410 | + BOOT_RESOURCE_TYPE_CHOICES_DICT, |
411 | ) |
412 | from maasserver.fields import JSONObjectField |
413 | from maasserver.models.cleansave import CleanSave |
414 | @@ -35,6 +36,14 @@ |
415 | get_one, |
416 | ) |
417 | |
418 | +# Names on boot resources have a specific meaning depending on the type |
419 | +# of boot resource. If its a synced or generated image then the name must |
420 | +# be in the format os/series. |
421 | +RTYPE_REQUIRING_OS_SERIES_NAME = ( |
422 | + BOOT_RESOURCE_TYPE.SYNCED, |
423 | + BOOT_RESOURCE_TYPE.GENERATED, |
424 | + ) |
425 | + |
426 | |
427 | class BootResourceManager(Manager): |
428 | |
429 | @@ -174,7 +183,7 @@ |
430 | |
431 | class Meta(DefaultMeta): |
432 | unique_together = ( |
433 | - ('rtype', 'name', 'architecture'), |
434 | + ('name', 'architecture'), |
435 | ) |
436 | |
437 | objects = BootResourceManager() |
438 | @@ -192,11 +201,32 @@ |
439 | def __repr__(self): |
440 | return "<BootResource %s>" % self.name |
441 | |
442 | + @property |
443 | + def display_rtype(self): |
444 | + """Return rtype text as displayed to the user.""" |
445 | + return BOOT_RESOURCE_TYPE_CHOICES_DICT[self.rtype] |
446 | + |
447 | + def clean(self): |
448 | + """Validate the model. |
449 | + |
450 | + Checks that the name is in a valid format, for its type. |
451 | + """ |
452 | + if self.rtype == BOOT_RESOURCE_TYPE.UPLOADED: |
453 | + if '/' in self.name: |
454 | + raise ValidationError( |
455 | + "%s boot resource cannot contain a '/' in it's name." % ( |
456 | + self.display_rtype)) |
457 | + elif self.rtype in RTYPE_REQUIRING_OS_SERIES_NAME: |
458 | + if '/' not in self.name: |
459 | + raise ValidationError( |
460 | + "%s boot resource must contain a '/' in it's name." % ( |
461 | + self.display_rtype)) |
462 | + |
463 | def unique_error_message(self, model_class, unique_check): |
464 | if unique_check == ( |
465 | - 'rtype', 'name', 'architecture'): |
466 | + 'name', 'architecture'): |
467 | return ( |
468 | - "Boot resource of type, name, and architecture already " |
469 | + "Boot resource of name, and architecture already " |
470 | "exists.") |
471 | return super( |
472 | BootResource, self).unique_error_message(model_class, unique_check) |
473 | |
474 | === modified file 'src/maasserver/models/tests/test_bootresource.py' |
475 | --- src/maasserver/models/tests/test_bootresource.py 2014-08-09 21:58:36 +0000 |
476 | +++ src/maasserver/models/tests/test_bootresource.py 2014-08-22 19:31:28 +0000 |
477 | @@ -20,6 +20,7 @@ |
478 | from maasserver.enum import ( |
479 | BOOT_RESOURCE_FILE_TYPE, |
480 | BOOT_RESOURCE_TYPE, |
481 | + BOOT_RESOURCE_TYPE_CHOICES_DICT, |
482 | ) |
483 | from maasserver.models.bootresource import BootResource |
484 | from maasserver.testing.factory import factory |
485 | @@ -160,7 +161,8 @@ |
486 | os = factory.make_name('os') |
487 | series = factory.make_name('series') |
488 | name = '%s/%s' % (os, series) |
489 | - factory.make_usable_boot_resource(name=name) |
490 | + factory.make_usable_boot_resource( |
491 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name) |
492 | commissionables = BootResource.objects.get_commissionable_resource( |
493 | os, series) |
494 | self.assertIsInstance(commissionables, Iterable) |
495 | @@ -169,8 +171,10 @@ |
496 | os = factory.make_name('os') |
497 | series = factory.make_name('series') |
498 | name = '%s/%s' % (os, series) |
499 | - resource = factory.make_usable_boot_resource(name=name) |
500 | - not_commissionable = factory.make_boot_resource(name=name) |
501 | + resource = factory.make_usable_boot_resource( |
502 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name) |
503 | + not_commissionable = factory.make_boot_resource( |
504 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name) |
505 | factory.make_boot_resource_set(not_commissionable) |
506 | commissionables = BootResource.objects.get_commissionable_resource( |
507 | os, series) |
508 | @@ -180,7 +184,8 @@ |
509 | os = factory.make_name('os') |
510 | series = factory.make_name('series') |
511 | name = '%s/%s' % (os, series) |
512 | - resource = factory.make_usable_boot_resource(name=name) |
513 | + resource = factory.make_usable_boot_resource( |
514 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name) |
515 | factory.make_usable_boot_resource() |
516 | commissionables = BootResource.objects.get_commissionable_resource( |
517 | os, series) |
518 | @@ -191,10 +196,13 @@ |
519 | series = factory.make_name('series') |
520 | name = '%s/%s' % (os, series) |
521 | resource_b = factory.make_usable_boot_resource( |
522 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
523 | name=name, architecture='b/generic') |
524 | resource_a = factory.make_usable_boot_resource( |
525 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
526 | name=name, architecture='a/generic') |
527 | resource_c = factory.make_usable_boot_resource( |
528 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
529 | name=name, architecture='c/generic') |
530 | commissionables = BootResource.objects.get_commissionable_resource( |
531 | os, series) |
532 | @@ -207,7 +215,9 @@ |
533 | name = '%s/%s' % (os, series) |
534 | arches = ['i386/generic', 'amd64/generic', 'arm64/generic'] |
535 | for arch in arches: |
536 | - factory.make_usable_boot_resource(name=name, architecture=arch) |
537 | + factory.make_usable_boot_resource( |
538 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
539 | + name=name, architecture=arch) |
540 | self.assertEqual( |
541 | 'i386/generic', |
542 | BootResource.objects.get_default_commissioning_resource( |
543 | @@ -219,7 +229,9 @@ |
544 | name = '%s/%s' % (os, series) |
545 | arches = ['amd64/generic', 'arm64/generic'] |
546 | for arch in arches: |
547 | - factory.make_usable_boot_resource(name=name, architecture=arch) |
548 | + factory.make_usable_boot_resource( |
549 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
550 | + name=name, architecture=arch) |
551 | self.assertEqual( |
552 | 'amd64/generic', |
553 | BootResource.objects.get_default_commissioning_resource( |
554 | @@ -231,7 +243,9 @@ |
555 | name = '%s/%s' % (os, series) |
556 | arches = ['ppc64el/generic', 'arm64/generic'] |
557 | for arch in arches: |
558 | - factory.make_usable_boot_resource(name=name, architecture=arch) |
559 | + factory.make_usable_boot_resource( |
560 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
561 | + name=name, architecture=arch) |
562 | self.assertEqual( |
563 | 'arm64/generic', |
564 | BootResource.objects.get_default_commissioning_resource( |
565 | @@ -255,16 +269,51 @@ |
566 | self.assertRaises( |
567 | ValidationError, factory.make_boot_resource, architecture=arch) |
568 | |
569 | + def test_validation_raises_error_on_invalid_name_for_synced(self): |
570 | + name = factory.make_name('name') |
571 | + arch = '%s/%s' % ( |
572 | + factory.make_name('arch'), factory.make_name('subarch')) |
573 | + resource = BootResource( |
574 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name, architecture=arch) |
575 | + self.assertRaises( |
576 | + ValidationError, resource.save) |
577 | + |
578 | + def test_validation_raises_error_on_invalid_name_for_generated(self): |
579 | + name = factory.make_name('name') |
580 | + arch = '%s/%s' % ( |
581 | + factory.make_name('arch'), factory.make_name('subarch')) |
582 | + resource = BootResource( |
583 | + rtype=BOOT_RESOURCE_TYPE.GENERATED, name=name, architecture=arch) |
584 | + self.assertRaises( |
585 | + ValidationError, resource.save) |
586 | + |
587 | + def test_validation_raises_error_on_invalid_name_for_uploaded(self): |
588 | + name = '%s/%s' % ( |
589 | + factory.make_name('os'), factory.make_name('series')) |
590 | + arch = '%s/%s' % ( |
591 | + factory.make_name('arch'), factory.make_name('subarch')) |
592 | + resource = BootResource( |
593 | + rtype=BOOT_RESOURCE_TYPE.UPLOADED, name=name, architecture=arch) |
594 | + self.assertRaises( |
595 | + ValidationError, resource.save) |
596 | + |
597 | def test_create_raises_error_on_not_unique(self): |
598 | - rtype = factory.pick_enum(BOOT_RESOURCE_TYPE) |
599 | - name = factory.make_name('name') |
600 | + name = '%s/%s' % ( |
601 | + factory.make_name('os'), factory.make_name('series')) |
602 | arch = '%s/%s' % ( |
603 | factory.make_name('arch'), factory.make_name('subarch')) |
604 | - factory.make_boot_resource(rtype=rtype, name=name, architecture=arch) |
605 | + factory.make_boot_resource( |
606 | + rtype=BOOT_RESOURCE_TYPE.SYNCED, |
607 | + name=name, architecture=arch) |
608 | self.assertRaises( |
609 | ValidationError, |
610 | factory.make_boot_resource, |
611 | - rtype=rtype, name=name, architecture=arch) |
612 | + rtype=BOOT_RESOURCE_TYPE.GENERATED, name=name, architecture=arch) |
613 | + |
614 | + def test_display_rtype(self): |
615 | + for key, value in BOOT_RESOURCE_TYPE_CHOICES_DICT.items(): |
616 | + resource = BootResource(rtype=key) |
617 | + self.assertEqual(value, resource.display_rtype) |
618 | |
619 | def test_split_arch(self): |
620 | arch = factory.make_name('arch') |
Looks good. Just two remarks; one bellow and the other inline.
"Remove rtype from unique_together on BootResource model."
In the commit message, it's always better to also have an explanation of *why* you're doing the change rather than only a description of the change.