Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode
- multinode
- Merge into multinode
Proposed by
Senthil Kumaran S
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Neil Williams | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 250 | ||||
Proposed branch: | lp:~stylesen/lava-scheduler/multinode | ||||
Merge into: | lp:lava-scheduler/multinode | ||||
Diff against target: |
531 lines (+173/-324) 4 files modified
lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id.py (+0/-160) lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py (+169/-0) lava_scheduler_app/migrations/0031_auto__add_field_testjob_target_group.py (+0/-161) lava_scheduler_app/models.py (+4/-3) |
||||
To merge this branch: | bzr merge lp:~stylesen/lava-scheduler/multinode | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Neil Williams | Approve | ||
Review via email: mp+171290@code.launchpad.net |
Commit message
Description of the change
Fix database migration scripts.
To post a comment you must log in.
- 250. By Neil Williams
-
Apply the cleanup branch merge.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id.py' | |||
2 | --- lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id.py 2013-06-20 11:45:50 +0000 | |||
3 | +++ lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id.py 1970-01-01 00:00:00 +0000 | |||
4 | @@ -1,160 +0,0 @@ | |||
5 | 1 | # -*- coding: utf-8 -*- | ||
6 | 2 | import datetime | ||
7 | 3 | from south.db import db | ||
8 | 4 | from south.v2 import SchemaMigration | ||
9 | 5 | from django.db import models | ||
10 | 6 | |||
11 | 7 | |||
12 | 8 | class Migration(SchemaMigration): | ||
13 | 9 | |||
14 | 10 | def forwards(self, orm): | ||
15 | 11 | # Adding field 'TestJob.sub_id' | ||
16 | 12 | db.add_column('lava_scheduler_app_testjob', 'sub_id', | ||
17 | 13 | self.gf('django.db.models.fields.CharField')(default='', max_length=200, blank=True), | ||
18 | 14 | keep_default=False) | ||
19 | 15 | |||
20 | 16 | |||
21 | 17 | def backwards(self, orm): | ||
22 | 18 | # Deleting field 'TestJob.sub_id' | ||
23 | 19 | db.delete_column('lava_scheduler_app_testjob', 'sub_id') | ||
24 | 20 | |||
25 | 21 | |||
26 | 22 | models = { | ||
27 | 23 | 'auth.group': { | ||
28 | 24 | 'Meta': {'object_name': 'Group'}, | ||
29 | 25 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
30 | 26 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
31 | 27 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
32 | 28 | }, | ||
33 | 29 | 'auth.permission': { | ||
34 | 30 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
35 | 31 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
36 | 32 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
37 | 33 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
38 | 34 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
39 | 35 | }, | ||
40 | 36 | 'auth.user': { | ||
41 | 37 | 'Meta': {'object_name': 'User'}, | ||
42 | 38 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
43 | 39 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
44 | 40 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
45 | 41 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
46 | 42 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
47 | 43 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
48 | 44 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
49 | 45 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
50 | 46 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
51 | 47 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
52 | 48 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
53 | 49 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
54 | 50 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
55 | 51 | }, | ||
56 | 52 | 'contenttypes.contenttype': { | ||
57 | 53 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
58 | 54 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
59 | 55 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
60 | 56 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
61 | 57 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
62 | 58 | }, | ||
63 | 59 | 'dashboard_app.bundle': { | ||
64 | 60 | 'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'}, | ||
65 | 61 | '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}), | ||
66 | 62 | '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}), | ||
67 | 63 | 'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}), | ||
68 | 64 | 'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}), | ||
69 | 65 | 'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}), | ||
70 | 66 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
71 | 67 | 'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
72 | 68 | 'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}), | ||
73 | 69 | 'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}) | ||
74 | 70 | }, | ||
75 | 71 | 'dashboard_app.bundlestream': { | ||
76 | 72 | 'Meta': {'object_name': 'BundleStream'}, | ||
77 | 73 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
78 | 74 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
79 | 75 | 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
80 | 76 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
81 | 77 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
82 | 78 | 'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}), | ||
83 | 79 | 'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
84 | 80 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
85 | 81 | }, | ||
86 | 82 | 'lava_scheduler_app.device': { | ||
87 | 83 | 'Meta': {'object_name': 'Device'}, | ||
88 | 84 | 'current_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
89 | 85 | 'device_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
90 | 86 | 'device_version': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
91 | 87 | 'health_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
92 | 88 | 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '200', 'primary_key': 'True'}), | ||
93 | 89 | 'last_health_report_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
94 | 90 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
95 | 91 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}) | ||
96 | 92 | }, | ||
97 | 93 | 'lava_scheduler_app.devicestatetransition': { | ||
98 | 94 | 'Meta': {'object_name': 'DeviceStateTransition'}, | ||
99 | 95 | 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
100 | 96 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
101 | 97 | 'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}), | ||
102 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
103 | 99 | 'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
104 | 100 | 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
105 | 101 | 'new_state': ('django.db.models.fields.IntegerField', [], {}), | ||
106 | 102 | 'old_state': ('django.db.models.fields.IntegerField', [], {}) | ||
107 | 103 | }, | ||
108 | 104 | 'lava_scheduler_app.devicetype': { | ||
109 | 105 | 'Meta': {'object_name': 'DeviceType'}, | ||
110 | 106 | 'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
111 | 107 | 'health_check_job': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), | ||
112 | 108 | 'name': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'primary_key': 'True'}) | ||
113 | 109 | }, | ||
114 | 110 | 'lava_scheduler_app.jobfailuretag': { | ||
115 | 111 | 'Meta': {'object_name': 'JobFailureTag'}, | ||
116 | 112 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
117 | 113 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
118 | 114 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}) | ||
119 | 115 | }, | ||
120 | 116 | 'lava_scheduler_app.tag': { | ||
121 | 117 | 'Meta': {'object_name': 'Tag'}, | ||
122 | 118 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
123 | 119 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
124 | 120 | 'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) | ||
125 | 121 | }, | ||
126 | 122 | 'lava_scheduler_app.testjob': { | ||
127 | 123 | 'Meta': {'object_name': 'TestJob'}, | ||
128 | 124 | '_results_bundle': ('django.db.models.fields.related.OneToOneField', [], {'null': 'True', 'db_column': "'results_bundle_id'", 'on_delete': 'models.SET_NULL', 'to': "orm['dashboard_app.Bundle']", 'blank': 'True', 'unique': 'True'}), | ||
129 | 125 | '_results_link': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '400', 'null': 'True', 'db_column': "'results_link'", 'blank': 'True'}), | ||
130 | 126 | 'actual_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
131 | 127 | 'definition': ('django.db.models.fields.TextField', [], {}), | ||
132 | 128 | 'description': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
133 | 129 | 'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
134 | 130 | 'failure_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
135 | 131 | 'failure_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'failure_tags'", 'blank': 'True', 'to': "orm['lava_scheduler_app.JobFailureTag']"}), | ||
136 | 132 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
137 | 133 | 'health_check': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
138 | 134 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
139 | 135 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
140 | 136 | 'log_file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
141 | 137 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}), | ||
142 | 138 | 'requested_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
143 | 139 | 'requested_device_type': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
144 | 140 | 'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
145 | 141 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
146 | 142 | 'sub_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
147 | 143 | 'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
148 | 144 | 'submit_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['linaro_django_xmlrpc.AuthToken']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
149 | 145 | 'submitter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), | ||
150 | 146 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}), | ||
151 | 147 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
152 | 148 | }, | ||
153 | 149 | 'linaro_django_xmlrpc.authtoken': { | ||
154 | 150 | 'Meta': {'object_name': 'AuthToken'}, | ||
155 | 151 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
156 | 152 | 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), | ||
157 | 153 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
158 | 154 | 'last_used_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), | ||
159 | 155 | 'secret': ('django.db.models.fields.CharField', [], {'default': "'ynu6yihw337isktsrzd0ocr83r0huox1b5y4qs1c0ktat7s3089d2xgiz3ll0n68fr6q026mep0t5xwg1coxnl2aoknolgowx2779uluan8quez0row0jnk5j2qsxlle'", 'unique': 'True', 'max_length': '128'}), | ||
160 | 156 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_tokens'", 'to': "orm['auth.User']"}) | ||
161 | 157 | } | ||
162 | 158 | } | ||
163 | 159 | |||
164 | 160 | complete_apps = ['lava_scheduler_app'] | ||
165 | 161 | \ No newline at end of file | 0 | \ No newline at end of file |
166 | 162 | 1 | ||
167 | === added file 'lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py' | |||
168 | --- lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py 1970-01-01 00:00:00 +0000 | |||
169 | +++ lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py 2013-06-25 12:38:27 +0000 | |||
170 | @@ -0,0 +1,169 @@ | |||
171 | 1 | # -*- coding: utf-8 -*- | ||
172 | 2 | import datetime | ||
173 | 3 | from south.db import db | ||
174 | 4 | from south.v2 import SchemaMigration | ||
175 | 5 | from django.db import models | ||
176 | 6 | |||
177 | 7 | |||
178 | 8 | class Migration(SchemaMigration): | ||
179 | 9 | |||
180 | 10 | def forwards(self, orm): | ||
181 | 11 | # Adding field 'TestJob.sub_id' | ||
182 | 12 | db.add_column('lava_scheduler_app_testjob', 'sub_id', | ||
183 | 13 | self.gf('django.db.models.fields.CharField')(default='', max_length=200, blank=True), | ||
184 | 14 | keep_default=False) | ||
185 | 15 | |||
186 | 16 | # Adding field 'TestJob.target_group' | ||
187 | 17 | db.add_column('lava_scheduler_app_testjob', 'target_group', | ||
188 | 18 | self.gf('django.db.models.fields.CharField')(default=None, max_length=64, null=True, blank=True), | ||
189 | 19 | keep_default=False) | ||
190 | 20 | |||
191 | 21 | |||
192 | 22 | def backwards(self, orm): | ||
193 | 23 | # Deleting field 'TestJob.sub_id' | ||
194 | 24 | db.delete_column('lava_scheduler_app_testjob', 'sub_id') | ||
195 | 25 | |||
196 | 26 | # Deleting field 'TestJob.target_group' | ||
197 | 27 | db.delete_column('lava_scheduler_app_testjob', 'target_group') | ||
198 | 28 | |||
199 | 29 | |||
200 | 30 | models = { | ||
201 | 31 | 'auth.group': { | ||
202 | 32 | 'Meta': {'object_name': 'Group'}, | ||
203 | 33 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
204 | 34 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
205 | 35 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
206 | 36 | }, | ||
207 | 37 | 'auth.permission': { | ||
208 | 38 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
209 | 39 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
210 | 40 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
211 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
212 | 42 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
213 | 43 | }, | ||
214 | 44 | 'auth.user': { | ||
215 | 45 | 'Meta': {'object_name': 'User'}, | ||
216 | 46 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
217 | 47 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
218 | 48 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
219 | 49 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
220 | 50 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
221 | 51 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
222 | 52 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
223 | 53 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
224 | 54 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
225 | 55 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
226 | 56 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
227 | 57 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
228 | 58 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
229 | 59 | }, | ||
230 | 60 | 'contenttypes.contenttype': { | ||
231 | 61 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
232 | 62 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
233 | 63 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
234 | 64 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
235 | 65 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
236 | 66 | }, | ||
237 | 67 | 'dashboard_app.bundle': { | ||
238 | 68 | 'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'}, | ||
239 | 69 | '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}), | ||
240 | 70 | '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}), | ||
241 | 71 | 'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}), | ||
242 | 72 | 'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}), | ||
243 | 73 | 'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}), | ||
244 | 74 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
245 | 75 | 'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
246 | 76 | 'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}), | ||
247 | 77 | 'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}) | ||
248 | 78 | }, | ||
249 | 79 | 'dashboard_app.bundlestream': { | ||
250 | 80 | 'Meta': {'object_name': 'BundleStream'}, | ||
251 | 81 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
252 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
253 | 83 | 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
254 | 84 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
255 | 85 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
256 | 86 | 'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}), | ||
257 | 87 | 'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
258 | 88 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
259 | 89 | }, | ||
260 | 90 | 'lava_scheduler_app.device': { | ||
261 | 91 | 'Meta': {'object_name': 'Device'}, | ||
262 | 92 | 'current_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
263 | 93 | 'device_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
264 | 94 | 'device_version': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
265 | 95 | 'health_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
266 | 96 | 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '200', 'primary_key': 'True'}), | ||
267 | 97 | 'last_health_report_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
268 | 98 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
269 | 99 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}) | ||
270 | 100 | }, | ||
271 | 101 | 'lava_scheduler_app.devicestatetransition': { | ||
272 | 102 | 'Meta': {'object_name': 'DeviceStateTransition'}, | ||
273 | 103 | 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
274 | 104 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
275 | 105 | 'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}), | ||
276 | 106 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
277 | 107 | 'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
278 | 108 | 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
279 | 109 | 'new_state': ('django.db.models.fields.IntegerField', [], {}), | ||
280 | 110 | 'old_state': ('django.db.models.fields.IntegerField', [], {}) | ||
281 | 111 | }, | ||
282 | 112 | 'lava_scheduler_app.devicetype': { | ||
283 | 113 | 'Meta': {'object_name': 'DeviceType'}, | ||
284 | 114 | 'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
285 | 115 | 'health_check_job': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), | ||
286 | 116 | 'name': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'primary_key': 'True'}) | ||
287 | 117 | }, | ||
288 | 118 | 'lava_scheduler_app.jobfailuretag': { | ||
289 | 119 | 'Meta': {'object_name': 'JobFailureTag'}, | ||
290 | 120 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
291 | 121 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
292 | 122 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}) | ||
293 | 123 | }, | ||
294 | 124 | 'lava_scheduler_app.tag': { | ||
295 | 125 | 'Meta': {'object_name': 'Tag'}, | ||
296 | 126 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
297 | 127 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
298 | 128 | 'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) | ||
299 | 129 | }, | ||
300 | 130 | 'lava_scheduler_app.testjob': { | ||
301 | 131 | 'Meta': {'object_name': 'TestJob'}, | ||
302 | 132 | '_results_bundle': ('django.db.models.fields.related.OneToOneField', [], {'null': 'True', 'db_column': "'results_bundle_id'", 'on_delete': 'models.SET_NULL', 'to': "orm['dashboard_app.Bundle']", 'blank': 'True', 'unique': 'True'}), | ||
303 | 133 | '_results_link': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '400', 'null': 'True', 'db_column': "'results_link'", 'blank': 'True'}), | ||
304 | 134 | 'actual_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
305 | 135 | 'definition': ('django.db.models.fields.TextField', [], {}), | ||
306 | 136 | 'description': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
307 | 137 | 'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
308 | 138 | 'failure_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
309 | 139 | 'failure_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'failure_tags'", 'blank': 'True', 'to': "orm['lava_scheduler_app.JobFailureTag']"}), | ||
310 | 140 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
311 | 141 | 'health_check': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
312 | 142 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
313 | 143 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
314 | 144 | 'log_file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
315 | 145 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}), | ||
316 | 146 | 'requested_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
317 | 147 | 'requested_device_type': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
318 | 148 | 'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
319 | 149 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
320 | 150 | 'sub_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
321 | 151 | 'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
322 | 152 | 'submit_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['linaro_django_xmlrpc.AuthToken']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
323 | 153 | 'submitter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), | ||
324 | 154 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}), | ||
325 | 155 | 'target_group': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '64', 'null': 'True', 'blank': 'True'}), | ||
326 | 156 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
327 | 157 | }, | ||
328 | 158 | 'linaro_django_xmlrpc.authtoken': { | ||
329 | 159 | 'Meta': {'object_name': 'AuthToken'}, | ||
330 | 160 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
331 | 161 | 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), | ||
332 | 162 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
333 | 163 | 'last_used_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), | ||
334 | 164 | 'secret': ('django.db.models.fields.CharField', [], {'default': "'7rf4239t35kqjrcixn4srgw00r61ncuq51jna0d6xbwpg2ur2annw5y1gkr9yt6ys9gh06b3wtcum4j0f2pdn5crul72mu1e1tw4at9jfgwk18asogkgoqcbc20ftylx'", 'unique': 'True', 'max_length': '128'}), | ||
335 | 165 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_tokens'", 'to': "orm['auth.User']"}) | ||
336 | 166 | } | ||
337 | 167 | } | ||
338 | 168 | |||
339 | 169 | complete_apps = ['lava_scheduler_app'] | ||
340 | 0 | \ No newline at end of file | 170 | \ No newline at end of file |
341 | 1 | 171 | ||
342 | === removed file 'lava_scheduler_app/migrations/0031_auto__add_field_testjob_target_group.py' | |||
343 | --- lava_scheduler_app/migrations/0031_auto__add_field_testjob_target_group.py 2013-06-25 06:11:41 +0000 | |||
344 | +++ lava_scheduler_app/migrations/0031_auto__add_field_testjob_target_group.py 1970-01-01 00:00:00 +0000 | |||
345 | @@ -1,161 +0,0 @@ | |||
346 | 1 | # -*- coding: utf-8 -*- | ||
347 | 2 | import datetime | ||
348 | 3 | from south.db import db | ||
349 | 4 | from south.v2 import SchemaMigration | ||
350 | 5 | from django.db import models | ||
351 | 6 | |||
352 | 7 | |||
353 | 8 | class Migration(SchemaMigration): | ||
354 | 9 | |||
355 | 10 | def forwards(self, orm): | ||
356 | 11 | # Adding field 'TestJob.target_group' | ||
357 | 12 | db.add_column('lava_scheduler_app_testjob', 'target_group', | ||
358 | 13 | self.gf('django.db.models.fields.CharField')(default='', max_length=64, blank=True), | ||
359 | 14 | keep_default=False) | ||
360 | 15 | |||
361 | 16 | |||
362 | 17 | def backwards(self, orm): | ||
363 | 18 | # Deleting field 'TestJob.target_group' | ||
364 | 19 | db.delete_column('lava_scheduler_app_testjob', 'target_group') | ||
365 | 20 | |||
366 | 21 | |||
367 | 22 | models = { | ||
368 | 23 | 'auth.group': { | ||
369 | 24 | 'Meta': {'object_name': 'Group'}, | ||
370 | 25 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
371 | 26 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
372 | 27 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
373 | 28 | }, | ||
374 | 29 | 'auth.permission': { | ||
375 | 30 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
376 | 31 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
377 | 32 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
378 | 33 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
379 | 34 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
380 | 35 | }, | ||
381 | 36 | 'auth.user': { | ||
382 | 37 | 'Meta': {'object_name': 'User'}, | ||
383 | 38 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
384 | 39 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
385 | 40 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
386 | 41 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
387 | 42 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
388 | 43 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
389 | 44 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
390 | 45 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
391 | 46 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
392 | 47 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
393 | 48 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
394 | 49 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
395 | 50 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
396 | 51 | }, | ||
397 | 52 | 'contenttypes.contenttype': { | ||
398 | 53 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
399 | 54 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
400 | 55 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
401 | 56 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
402 | 57 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
403 | 58 | }, | ||
404 | 59 | 'dashboard_app.bundle': { | ||
405 | 60 | 'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'}, | ||
406 | 61 | '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}), | ||
407 | 62 | '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}), | ||
408 | 63 | 'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}), | ||
409 | 64 | 'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}), | ||
410 | 65 | 'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}), | ||
411 | 66 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
412 | 67 | 'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
413 | 68 | 'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}), | ||
414 | 69 | 'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}) | ||
415 | 70 | }, | ||
416 | 71 | 'dashboard_app.bundlestream': { | ||
417 | 72 | 'Meta': {'object_name': 'BundleStream'}, | ||
418 | 73 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
419 | 74 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
420 | 75 | 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
421 | 76 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
422 | 77 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
423 | 78 | 'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}), | ||
424 | 79 | 'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
425 | 80 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
426 | 81 | }, | ||
427 | 82 | 'lava_scheduler_app.device': { | ||
428 | 83 | 'Meta': {'object_name': 'Device'}, | ||
429 | 84 | 'current_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
430 | 85 | 'device_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
431 | 86 | 'device_version': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
432 | 87 | 'health_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
433 | 88 | 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '200', 'primary_key': 'True'}), | ||
434 | 89 | 'last_health_report_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}), | ||
435 | 90 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
436 | 91 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}) | ||
437 | 92 | }, | ||
438 | 93 | 'lava_scheduler_app.devicestatetransition': { | ||
439 | 94 | 'Meta': {'object_name': 'DeviceStateTransition'}, | ||
440 | 95 | 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
441 | 96 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
442 | 97 | 'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}), | ||
443 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
444 | 99 | 'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
445 | 100 | 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
446 | 101 | 'new_state': ('django.db.models.fields.IntegerField', [], {}), | ||
447 | 102 | 'old_state': ('django.db.models.fields.IntegerField', [], {}) | ||
448 | 103 | }, | ||
449 | 104 | 'lava_scheduler_app.devicetype': { | ||
450 | 105 | 'Meta': {'object_name': 'DeviceType'}, | ||
451 | 106 | 'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
452 | 107 | 'health_check_job': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), | ||
453 | 108 | 'name': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'primary_key': 'True'}) | ||
454 | 109 | }, | ||
455 | 110 | 'lava_scheduler_app.jobfailuretag': { | ||
456 | 111 | 'Meta': {'object_name': 'JobFailureTag'}, | ||
457 | 112 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
458 | 113 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
459 | 114 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}) | ||
460 | 115 | }, | ||
461 | 116 | 'lava_scheduler_app.tag': { | ||
462 | 117 | 'Meta': {'object_name': 'Tag'}, | ||
463 | 118 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
464 | 119 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
465 | 120 | 'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) | ||
466 | 121 | }, | ||
467 | 122 | 'lava_scheduler_app.testjob': { | ||
468 | 123 | 'Meta': {'object_name': 'TestJob'}, | ||
469 | 124 | '_results_bundle': ('django.db.models.fields.related.OneToOneField', [], {'null': 'True', 'db_column': "'results_bundle_id'", 'on_delete': 'models.SET_NULL', 'to': "orm['dashboard_app.Bundle']", 'blank': 'True', 'unique': 'True'}), | ||
470 | 125 | '_results_link': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '400', 'null': 'True', 'db_column': "'results_link'", 'blank': 'True'}), | ||
471 | 126 | 'actual_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
472 | 127 | 'definition': ('django.db.models.fields.TextField', [], {}), | ||
473 | 128 | 'description': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
474 | 129 | 'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
475 | 130 | 'failure_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
476 | 131 | 'failure_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'failure_tags'", 'blank': 'True', 'to': "orm['lava_scheduler_app.JobFailureTag']"}), | ||
477 | 132 | 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), | ||
478 | 133 | 'health_check': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
479 | 134 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
480 | 135 | 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
481 | 136 | 'log_file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
482 | 137 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}), | ||
483 | 138 | 'requested_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}), | ||
484 | 139 | 'requested_device_type': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.DeviceType']"}), | ||
485 | 140 | 'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
486 | 141 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
487 | 142 | 'sub_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
488 | 143 | 'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
489 | 144 | 'submit_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['linaro_django_xmlrpc.AuthToken']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
490 | 145 | 'submitter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), | ||
491 | 146 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}), | ||
492 | 147 | 'target_group': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), | ||
493 | 148 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) | ||
494 | 149 | }, | ||
495 | 150 | 'linaro_django_xmlrpc.authtoken': { | ||
496 | 151 | 'Meta': {'object_name': 'AuthToken'}, | ||
497 | 152 | 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
498 | 153 | 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), | ||
499 | 154 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
500 | 155 | 'last_used_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), | ||
501 | 156 | 'secret': ('django.db.models.fields.CharField', [], {'default': "'1n07jwp73fldk40sk0hshidru6nh5rqlrn40oq4hs5f9wx99o0wemwme43raxx008kyfsbahl56x8wyndgyclbapc43maycile201e1snt6p8a02n4hgyc506fda8umq'", 'unique': 'True', 'max_length': '128'}), | ||
502 | 157 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_tokens'", 'to': "orm['auth.User']"}) | ||
503 | 158 | } | ||
504 | 159 | } | ||
505 | 160 | |||
506 | 161 | complete_apps = ['lava_scheduler_app'] | ||
507 | 162 | \ No newline at end of file | 0 | \ No newline at end of file |
508 | 163 | 1 | ||
509 | === modified file 'lava_scheduler_app/models.py' | |||
510 | --- lava_scheduler_app/models.py 2013-06-25 06:11:41 +0000 | |||
511 | +++ lava_scheduler_app/models.py 2013-06-25 12:38:27 +0000 | |||
512 | @@ -262,7 +262,9 @@ | |||
513 | 262 | target_group = models.CharField( | 262 | target_group = models.CharField( |
514 | 263 | verbose_name = _(u"Target Group"), | 263 | verbose_name = _(u"Target Group"), |
515 | 264 | blank = True, | 264 | blank = True, |
517 | 265 | max_length = 64 | 265 | max_length = 64, |
518 | 266 | null = True, | ||
519 | 267 | default = None | ||
520 | 266 | ) | 268 | ) |
521 | 267 | 269 | ||
522 | 268 | submitter = models.ForeignKey( | 270 | submitter = models.ForeignKey( |
523 | @@ -523,8 +525,7 @@ | |||
524 | 523 | definition=json_data, submitter=submitter, | 525 | definition=json_data, submitter=submitter, |
525 | 524 | requested_device=target, requested_device_type=device_type, | 526 | requested_device=target, requested_device_type=device_type, |
526 | 525 | description=job_name, health_check=health_check, user=user, | 527 | description=job_name, health_check=health_check, user=user, |
529 | 526 | group=group, is_public=is_public, priority=priority, | 528 | group=group, is_public=is_public, priority=priority) |
528 | 527 | target_group=None) | ||
530 | 528 | job.save() | 529 | job.save() |
531 | 529 | return job.id | 530 | return job.id |
532 | 530 | 531 |
Approved