MAAS

Merge lp:~gz/maas/1.2_fix_duplicated_039_migration into lp:maas/1.2

  1. 1.2_fix_duplicated_039_migration
  2. Merge into 1.2
Proposed by Martin Packman
Status: Merged
Approved by: Diogo Matsubara
Approved revision: no longer in the source branch.
Merged at revision: 1284
Proposed branch: lp:~gz/maas/1.2_fix_duplicated_039_migration
Merge into: lp:maas/1.2
Diff against target: 204 lines (+200/-0)
1 file modified
src/maasserver/migrations/0042_fix_039_conflict.py (+200/-0)
To merge this branch: bzr merge lp:~gz/maas/1.2_fix_duplicated_039_migration
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+133042@code.launchpad.net

Commit message

Cherrypick r1323 from trunk fixing broken schema migrations

Description of the change

Backports Raphael's fix to migrations to the 1.2 branch, so further required migrations on that branch are possible using --auto.

See the original merge proposal for details:

<https://code.launchpad.net/~rvb/maas/fix_migration_039/+merge/132469>

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Thanks for doing this Martin.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/252/console reported an error when processing this lp:~gz/maas/1.2_fix_duplicated_039_migration branch.
Not merging it.

Revision history for this message
MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/252/console reported an error when processing this lp:~gz/maas/1.2_fix_duplicated_039_migration branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/maasserver/migrations/0042_fix_039_conflict.py'
2--- src/maasserver/migrations/0042_fix_039_conflict.py 1970-01-01 00:00:00 +0000
3+++ src/maasserver/migrations/0042_fix_039_conflict.py 2012-11-06 11:43:19 +0000
4@@ -0,0 +1,200 @@
5+# -*- coding: utf-8 -*-
6+import datetime
7+
8+from django.db import models
9+from south.db import db
10+from south.v2 import SchemaMigration
11+
12+# This migration only exists to fix the problem introduced by the
13+# duplicated migration number 039.
14+
15+
16+class Migration(SchemaMigration):
17+
18+ def forwards(self, orm):
19+ pass
20+
21+ def backwards(self, orm):
22+ pass
23+
24+ models = {
25+ 'auth.group': {
26+ 'Meta': {'object_name': 'Group'},
27+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
28+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
29+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
30+ },
31+ 'auth.permission': {
32+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
33+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
34+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
35+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
36+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
37+ },
38+ 'auth.user': {
39+ 'Meta': {'object_name': 'User'},
40+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
41+ 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
42+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
43+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
44+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
45+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
46+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
47+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
48+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
49+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
50+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
51+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
52+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
53+ },
54+ 'contenttypes.contenttype': {
55+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
56+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
57+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
58+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
59+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
60+ },
61+ u'maasserver.bootimage': {
62+ 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'},
63+ 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
64+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
66+ 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
67+ 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
68+ 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'})
69+ },
70+ u'maasserver.componenterror': {
71+ 'Meta': {'object_name': 'ComponentError'},
72+ 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
73+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
74+ 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
75+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
76+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
77+ },
78+ u'maasserver.config': {
79+ 'Meta': {'object_name': 'Config'},
80+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
81+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
82+ 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
83+ },
84+ u'maasserver.dhcplease': {
85+ 'Meta': {'object_name': 'DHCPLease'},
86+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
87+ 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}),
88+ 'mac': ('maasserver.fields.MACAddressField', [], {}),
89+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
90+ },
91+ u'maasserver.filestorage': {
92+ 'Meta': {'object_name': 'FileStorage'},
93+ 'content': ('metadataserver.fields.BinaryField', [], {}),
94+ 'filename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
95+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
96+ },
97+ u'maasserver.macaddress': {
98+ 'Meta': {'object_name': 'MACAddress'},
99+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
100+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
101+ 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
102+ 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
103+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
104+ },
105+ u'maasserver.node': {
106+ 'Meta': {'object_name': 'Node'},
107+ 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
108+ 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}),
109+ 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
110+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
111+ 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}),
112+ 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
113+ 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
114+ 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
115+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
116+ 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
117+ 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
118+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
119+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
120+ 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
121+ 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
122+ 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
123+ 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-ef10dbce-2402-11e2-bd36-9c4e363b1c94'", 'unique': 'True', 'max_length': '41'}),
124+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
125+ 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}),
126+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
127+ },
128+ u'maasserver.nodegroup': {
129+ 'Meta': {'object_name': 'NodeGroup'},
130+ 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
131+ 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}),
132+ 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
133+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
134+ 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
135+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
136+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
137+ 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
138+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
139+ 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
140+ },
141+ u'maasserver.nodegroupinterface': {
142+ 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'},
143+ 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
144+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
145+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
146+ 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
147+ 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
148+ 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
149+ 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
150+ 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
151+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
152+ 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
153+ 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
154+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
155+ },
156+ u'maasserver.sshkey': {
157+ 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
158+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
159+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
160+ 'key': ('django.db.models.fields.TextField', [], {}),
161+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
162+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
163+ },
164+ u'maasserver.tag': {
165+ 'Meta': {'object_name': 'Tag'},
166+ 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
167+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
168+ 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
169+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
170+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
171+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
172+ },
173+ u'maasserver.userprofile': {
174+ 'Meta': {'object_name': 'UserProfile'},
175+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
176+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
177+ },
178+ 'piston.consumer': {
179+ 'Meta': {'object_name': 'Consumer'},
180+ 'description': ('django.db.models.fields.TextField', [], {}),
181+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
182+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
183+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
184+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
185+ 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
186+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"})
187+ },
188+ 'piston.token': {
189+ 'Meta': {'object_name': 'Token'},
190+ 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
191+ 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
192+ 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}),
193+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
194+ 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
195+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
196+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
197+ 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1351760579L'}),
198+ 'token_type': ('django.db.models.fields.IntegerField', [], {}),
199+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}),
200+ 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
201+ }
202+ }
203+
204+ complete_apps = ['maasserver']

Subscribers

People subscribed via source and target branches

to status/vote changes: