Merge lp:~blake-rouse/maas/boot-source-url-unqiue into lp:~maas-committers/maas/trunk

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 2707
Proposed branch: lp:~blake-rouse/maas/boot-source-url-unqiue
Merge into: lp:~maas-committers/maas/trunk
Prerequisite: lp:~blake-rouse/maas/remove-cluster-from-boot-source
Diff against target: 406 lines (+379/-1)
3 files modified
src/maasserver/migrations/0101_make_bootsource_url_unique.py (+373/-0)
src/maasserver/models/bootsource.py (+1/-1)
src/maasserver/models/tests/test_bootsource.py (+5/-0)
To merge this branch: bzr merge lp:~blake-rouse/maas/boot-source-url-unqiue
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+230502@code.launchpad.net

Commit message

Make url field on BootSource unique.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

For some reason the diff is not showing the addition of "unique=true" on the url field in the BootSource model. It is there in the branch, must have to do with me removing it from the prerequisite and adding it to this one.

Revision history for this message
Gavin Panella (allenap) wrote :

Looks good.

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/0101_make_bootsource_url_unique.py'
2--- src/maasserver/migrations/0101_make_bootsource_url_unique.py 1970-01-01 00:00:00 +0000
3+++ src/maasserver/migrations/0101_make_bootsource_url_unique.py 2014-08-15 03:47:42 +0000
4@@ -0,0 +1,373 @@
5+from django.db import models
6+from south.db import db
7+# -*- coding: utf-8 -*-
8+from south.utils import datetime_utils as datetime
9+from south.v2 import SchemaMigration
10+
11+
12+class Migration(SchemaMigration):
13+
14+ def forwards(self, orm):
15+ # Keep only one of each 'BootSouce' with URL.
16+ urls = []
17+ for source in orm[u'maasserver.bootsource'].objects.all():
18+ if source.url in urls:
19+ source.delete()
20+ else:
21+ urls.append(source.url)
22+
23+ # Adding unique constraint on 'BootSource', fields ['url']
24+ db.create_unique(u'maasserver_bootsource', ['url'])
25+
26+
27+ def backwards(self, orm):
28+ # Removing unique constraint on 'BootSource', fields ['url']
29+ db.delete_unique(u'maasserver_bootsource', ['url'])
30+
31+
32+ models = {
33+ u'auth.group': {
34+ 'Meta': {'object_name': 'Group'},
35+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
36+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
37+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
38+ },
39+ u'auth.permission': {
40+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
41+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
42+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
43+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
45+ },
46+ u'auth.user': {
47+ 'Meta': {'object_name': 'User'},
48+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49+ 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
50+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
51+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
52+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
53+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
54+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
55+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
56+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
57+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
58+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
59+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
60+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
61+ },
62+ u'contenttypes.contenttype': {
63+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
64+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
65+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
66+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
67+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
68+ },
69+ u'maasserver.bootimage': {
70+ 'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'},
71+ 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
72+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
73+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
74+ 'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}),
75+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
76+ 'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
77+ 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
78+ 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
79+ 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
80+ 'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
81+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
82+ 'xinstall_path': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
83+ 'xinstall_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '30', 'null': 'True', 'blank': 'True'})
84+ },
85+ u'maasserver.bootresource': {
86+ 'Meta': {'unique_together': "((u'rtype', u'name', u'architecture'),)", 'object_name': 'BootResource'},
87+ 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
88+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
89+ 'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
90+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
91+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
92+ 'rtype': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}),
93+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
94+ },
95+ u'maasserver.bootresourcefile': {
96+ 'Meta': {'unique_together': "((u'resource_set', u'filetype'),)", 'object_name': 'BootResourceFile'},
97+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
98+ 'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
99+ 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
100+ 'filetype': ('django.db.models.fields.CharField', [], {'default': "u'tgz'", 'max_length': '20'}),
101+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
102+ 'largefile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.LargeFile']"}),
103+ 'resource_set': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'files'", 'to': u"orm['maasserver.BootResourceSet']"}),
104+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
105+ },
106+ u'maasserver.bootresourceset': {
107+ 'Meta': {'unique_together': "((u'resource', u'version'),)", 'object_name': 'BootResourceSet'},
108+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
109+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
110+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
111+ 'resource': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'sets'", 'to': u"orm['maasserver.BootResource']"}),
112+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
113+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '255'})
114+ },
115+ u'maasserver.bootsource': {
116+ 'Meta': {'object_name': 'BootSource'},
117+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
118+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
119+ 'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}),
120+ 'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
121+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
122+ 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'})
123+ },
124+ u'maasserver.bootsourceselection': {
125+ 'Meta': {'object_name': 'BootSourceSelection'},
126+ 'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
127+ 'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
128+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
129+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
130+ 'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
131+ 'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
132+ 'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
133+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
134+ },
135+ u'maasserver.componenterror': {
136+ 'Meta': {'object_name': 'ComponentError'},
137+ 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
138+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
139+ 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
140+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
141+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
142+ },
143+ u'maasserver.config': {
144+ 'Meta': {'object_name': 'Config'},
145+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
146+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
147+ 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
148+ },
149+ u'maasserver.dhcplease': {
150+ 'Meta': {'object_name': 'DHCPLease'},
151+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
152+ 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
153+ 'mac': ('maasserver.fields.MACAddressField', [], {}),
154+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
155+ },
156+ u'maasserver.downloadprogress': {
157+ 'Meta': {'object_name': 'DownloadProgress'},
158+ 'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
159+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
160+ 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
161+ 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
162+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
163+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
164+ 'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
165+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
166+ },
167+ u'maasserver.event': {
168+ 'Meta': {'object_name': 'Event'},
169+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
170+ 'description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}),
171+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
172+ 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
173+ 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.EventType']"}),
174+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
175+ },
176+ u'maasserver.eventtype': {
177+ 'Meta': {'object_name': 'EventType'},
178+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
179+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
180+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
181+ 'level': ('django.db.models.fields.IntegerField', [], {}),
182+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
183+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
184+ },
185+ u'maasserver.filestorage': {
186+ 'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
187+ 'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
188+ 'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
189+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
190+ 'key': ('django.db.models.fields.CharField', [], {'default': "u'36c26f28-242e-11e4-901f-bcee7b78dc5b'", 'unique': 'True', 'max_length': '36'}),
191+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
192+ },
193+ u'maasserver.largefile': {
194+ 'Meta': {'object_name': 'LargeFile'},
195+ 'content': ('maasserver.fields.LargeObjectField', [], {}),
196+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
197+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
198+ 'sha256': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}),
199+ 'total_size': ('django.db.models.fields.BigIntegerField', [], {}),
200+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
201+ },
202+ u'maasserver.licensekey': {
203+ 'Meta': {'unique_together': "((u'osystem', u'distro_series'),)", 'object_name': 'LicenseKey'},
204+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
205+ 'distro_series': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
206+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
207+ 'license_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
208+ 'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
209+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
210+ },
211+ u'maasserver.macaddress': {
212+ 'Meta': {'ordering': "(u'created',)", 'object_name': 'MACAddress'},
213+ 'cluster_interface': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['maasserver.NodeGroupInterface']", 'null': 'True', 'blank': 'True'}),
214+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
215+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
216+ 'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': 'True'}),
217+ 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
218+ 'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}),
219+ 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
220+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
221+ },
222+ u'maasserver.macstaticipaddresslink': {
223+ 'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'},
224+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
225+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
226+ 'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}),
227+ 'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}),
228+ 'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
229+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
230+ },
231+ u'maasserver.network': {
232+ 'Meta': {'object_name': 'Network'},
233+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
234+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
235+ 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
236+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
237+ 'netmask': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
238+ 'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
239+ },
240+ u'maasserver.node': {
241+ 'Meta': {'object_name': 'Node'},
242+ 'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
243+ 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
244+ 'boot_type': ('django.db.models.fields.CharField', [], {'default': "u'fastpath'", 'max_length': '20'}),
245+ 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
246+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
247+ 'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
248+ 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
249+ 'error_description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}),
250+ 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
251+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
252+ 'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
253+ 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
254+ 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
255+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
256+ 'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
257+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
258+ 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
259+ 'power_state': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '10'}),
260+ 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
261+ 'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
262+ 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
263+ 'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
264+ 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-36c1b7ea-242e-11e4-901f-bcee7b78dc5b'", 'unique': 'True', 'max_length': '41'}),
265+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
266+ 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
267+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
268+ 'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
269+ },
270+ u'maasserver.nodegroup': {
271+ 'Meta': {'object_name': 'NodeGroup'},
272+ 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
273+ 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
274+ 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
275+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
276+ 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
277+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
278+ 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
279+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
280+ 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
281+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
282+ 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
283+ },
284+ u'maasserver.nodegroupinterface': {
285+ 'Meta': {'unique_together': "((u'nodegroup', u'name'),)", 'object_name': 'NodeGroupInterface'},
286+ 'broadcast_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
287+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
288+ 'foreign_dhcp_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
289+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
290+ 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
291+ 'ip': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
292+ 'ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
293+ 'ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
294+ 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
295+ 'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
296+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
297+ 'router_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
298+ 'static_ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
299+ 'static_ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
300+ 'subnet_mask': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
301+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
302+ },
303+ u'maasserver.sshkey': {
304+ 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
305+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
306+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
307+ 'key': ('django.db.models.fields.TextField', [], {}),
308+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
309+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
310+ },
311+ u'maasserver.sslkey': {
312+ 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'},
313+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
314+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
315+ 'key': ('django.db.models.fields.TextField', [], {}),
316+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
317+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
318+ },
319+ u'maasserver.staticipaddress': {
320+ 'Meta': {'object_name': 'StaticIPAddress'},
321+ 'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
322+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
323+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
324+ 'ip': ('maasserver.fields.MAASIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
325+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
326+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
327+ },
328+ u'maasserver.tag': {
329+ 'Meta': {'object_name': 'Tag'},
330+ 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
331+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
332+ 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
333+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
334+ 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
335+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
336+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
337+ },
338+ u'maasserver.userprofile': {
339+ 'Meta': {'object_name': 'UserProfile'},
340+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
341+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
342+ },
343+ u'maasserver.zone': {
344+ 'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
345+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
346+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
347+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
348+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
349+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
350+ },
351+ u'piston.consumer': {
352+ 'Meta': {'object_name': 'Consumer'},
353+ 'description': ('django.db.models.fields.TextField', [], {}),
354+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
355+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
356+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
357+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
358+ 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
359+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
360+ },
361+ u'piston.token': {
362+ 'Meta': {'object_name': 'Token'},
363+ 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
364+ 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
365+ 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
366+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
367+ 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
368+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
369+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
370+ 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1408074162L'}),
371+ 'token_type': ('django.db.models.fields.IntegerField', [], {}),
372+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
373+ 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
374+ }
375+ }
376+
377+ complete_apps = ['maasserver']
378
379=== modified file 'src/maasserver/models/bootsource.py'
380--- src/maasserver/models/bootsource.py 2014-08-15 03:47:42 +0000
381+++ src/maasserver/models/bootsource.py 2014-08-15 03:47:42 +0000
382@@ -37,7 +37,7 @@
383 """Needed for South to recognize this model."""
384
385 url = URLField(
386- blank=False, help_text="The URL of the BootSource.")
387+ blank=False, unique=True, help_text="The URL of the BootSource.")
388
389 keyring_filename = FilePathField(
390 blank=True,
391
392=== modified file 'src/maasserver/models/tests/test_bootsource.py'
393--- src/maasserver/models/tests/test_bootsource.py 2014-08-15 03:47:42 +0000
394+++ src/maasserver/models/tests/test_bootsource.py 2014-08-15 03:47:42 +0000
395@@ -34,6 +34,11 @@
396 self.assertTrue(
397 BootSource.objects.filter(id=boot_source.id).exists())
398
399+ def test_url_is_unqiue(self):
400+ boot_source = factory.make_boot_source()
401+ self.assertRaises(
402+ ValidationError, factory.make_boot_source, url=boot_source.url)
403+
404 def test_cannot_set_keyring_data_and_filename(self):
405 # A BootSource cannot have both a keyring filename and keyring
406 # data. Attempting to set both will raise an error.