diff options
Diffstat (limited to 'bitbake/lib/toaster/orm')
3 files changed, 489 insertions, 33 deletions
diff --git a/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py b/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py new file mode 100644 index 0000000000..6685b55640 --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py | |||
@@ -0,0 +1,396 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | from south.utils import datetime_utils as datetime | ||
3 | from south.db import db | ||
4 | from south.v2 import SchemaMigration | ||
5 | from django.db import models | ||
6 | |||
7 | |||
8 | class Migration(SchemaMigration): | ||
9 | |||
10 | def forwards(self, orm): | ||
11 | # Deleting model 'ToasterSettingDefaultLayer' | ||
12 | db.delete_table(u'orm_toastersettingdefaultlayer') | ||
13 | |||
14 | # Adding model 'ReleaseLayerSourcePriority' | ||
15 | db.create_table(u'orm_releaselayersourcepriority', ( | ||
16 | (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
17 | ('release', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['orm.Release'])), | ||
18 | ('layer_source', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['orm.LayerSource'])), | ||
19 | ('priority', self.gf('django.db.models.fields.IntegerField')(default=0)), | ||
20 | )) | ||
21 | db.send_create_signal(u'orm', ['ReleaseLayerSourcePriority']) | ||
22 | |||
23 | # Adding unique constraint on 'ReleaseLayerSourcePriority', fields ['release', 'layer_source'] | ||
24 | db.create_unique(u'orm_releaselayersourcepriority', ['release_id', 'layer_source_id']) | ||
25 | |||
26 | # Deleting field 'Release.branch' | ||
27 | db.delete_column(u'orm_release', 'branch_id') | ||
28 | |||
29 | # Adding field 'Release.branch_name' | ||
30 | db.add_column(u'orm_release', 'branch_name', | ||
31 | self.gf('django.db.models.fields.CharField')(default='', max_length=50), | ||
32 | keep_default=False) | ||
33 | |||
34 | # Adding unique constraint on 'LayerSource', fields ['name'] | ||
35 | db.create_unique(u'orm_layersource', ['name']) | ||
36 | |||
37 | # Deleting field 'ReleaseDefaultLayer.layer' | ||
38 | db.delete_column(u'orm_releasedefaultlayer', 'layer_id') | ||
39 | |||
40 | # Adding field 'ReleaseDefaultLayer.layer_name' | ||
41 | db.add_column(u'orm_releasedefaultlayer', 'layer_name', | ||
42 | self.gf('django.db.models.fields.CharField')(default='', max_length=100), | ||
43 | keep_default=False) | ||
44 | |||
45 | |||
46 | def backwards(self, orm): | ||
47 | # Removing unique constraint on 'LayerSource', fields ['name'] | ||
48 | db.delete_unique(u'orm_layersource', ['name']) | ||
49 | |||
50 | # Removing unique constraint on 'ReleaseLayerSourcePriority', fields ['release', 'layer_source'] | ||
51 | db.delete_unique(u'orm_releaselayersourcepriority', ['release_id', 'layer_source_id']) | ||
52 | |||
53 | # Adding model 'ToasterSettingDefaultLayer' | ||
54 | db.create_table(u'orm_toastersettingdefaultlayer', ( | ||
55 | (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
56 | ('layer_version', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['orm.Layer_Version'])), | ||
57 | )) | ||
58 | db.send_create_signal(u'orm', ['ToasterSettingDefaultLayer']) | ||
59 | |||
60 | # Deleting model 'ReleaseLayerSourcePriority' | ||
61 | db.delete_table(u'orm_releaselayersourcepriority') | ||
62 | |||
63 | |||
64 | # User chose to not deal with backwards NULL issues for 'Release.branch' | ||
65 | raise RuntimeError("Cannot reverse this migration. 'Release.branch' and its values cannot be restored.") | ||
66 | |||
67 | # The following code is provided here to aid in writing a correct migration # Adding field 'Release.branch' | ||
68 | db.add_column(u'orm_release', 'branch', | ||
69 | self.gf('django.db.models.fields.related.ForeignKey')(to=orm['orm.Branch']), | ||
70 | keep_default=False) | ||
71 | |||
72 | # Deleting field 'Release.branch_name' | ||
73 | db.delete_column(u'orm_release', 'branch_name') | ||
74 | |||
75 | |||
76 | # User chose to not deal with backwards NULL issues for 'ReleaseDefaultLayer.layer' | ||
77 | raise RuntimeError("Cannot reverse this migration. 'ReleaseDefaultLayer.layer' and its values cannot be restored.") | ||
78 | |||
79 | # The following code is provided here to aid in writing a correct migration # Adding field 'ReleaseDefaultLayer.layer' | ||
80 | db.add_column(u'orm_releasedefaultlayer', 'layer', | ||
81 | self.gf('django.db.models.fields.related.ForeignKey')(to=orm['orm.Layer']), | ||
82 | keep_default=False) | ||
83 | |||
84 | # Deleting field 'ReleaseDefaultLayer.layer_name' | ||
85 | db.delete_column(u'orm_releasedefaultlayer', 'layer_name') | ||
86 | |||
87 | |||
88 | models = { | ||
89 | u'orm.bitbakeversion': { | ||
90 | 'Meta': {'object_name': 'BitbakeVersion'}, | ||
91 | 'branch': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
92 | 'dirpath': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
93 | 'giturl': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
94 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
95 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) | ||
96 | }, | ||
97 | u'orm.branch': { | ||
98 | 'Meta': {'unique_together': "(('layer_source', 'name'), ('layer_source', 'up_id'))", 'object_name': 'Branch'}, | ||
99 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
100 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'True', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
101 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
102 | 'short_description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
103 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
104 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
105 | }, | ||
106 | u'orm.build': { | ||
107 | 'Meta': {'object_name': 'Build'}, | ||
108 | 'bitbake_version': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
109 | 'build_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
110 | 'completed_on': ('django.db.models.fields.DateTimeField', [], {}), | ||
111 | 'cooker_log_path': ('django.db.models.fields.CharField', [], {'max_length': '500'}), | ||
112 | 'distro': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
113 | 'distro_version': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
114 | 'errors_no': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
115 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
116 | 'machine': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
117 | 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '2'}), | ||
118 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']", 'null': 'True'}), | ||
119 | 'started_on': ('django.db.models.fields.DateTimeField', [], {}), | ||
120 | 'timespent': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
121 | 'warnings_no': ('django.db.models.fields.IntegerField', [], {'default': '0'}) | ||
122 | }, | ||
123 | u'orm.helptext': { | ||
124 | 'Meta': {'object_name': 'HelpText'}, | ||
125 | 'area': ('django.db.models.fields.IntegerField', [], {}), | ||
126 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'helptext_build'", 'to': u"orm['orm.Build']"}), | ||
127 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
128 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
129 | 'text': ('django.db.models.fields.TextField', [], {}) | ||
130 | }, | ||
131 | u'orm.layer': { | ||
132 | 'Meta': {'unique_together': "(('layer_source', 'up_id'), ('layer_source', 'name'))", 'object_name': 'Layer'}, | ||
133 | 'description': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True'}), | ||
134 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
135 | 'layer_index_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
136 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
137 | 'local_path': ('django.db.models.fields.FilePathField', [], {'default': 'None', 'max_length': '255', 'null': 'True'}), | ||
138 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
139 | 'summary': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True'}), | ||
140 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
141 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}), | ||
142 | 'vcs_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
143 | 'vcs_web_file_base_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
144 | 'vcs_web_tree_base_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
145 | 'vcs_web_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}) | ||
146 | }, | ||
147 | u'orm.layer_version': { | ||
148 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'Layer_Version'}, | ||
149 | 'branch': ('django.db.models.fields.CharField', [], {'max_length': '80'}), | ||
150 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'layer_version_build'", 'null': 'True', 'to': u"orm['orm.Build']"}), | ||
151 | 'commit': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
152 | 'dirpath': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True'}), | ||
153 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
154 | 'layer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'layer_version_layer'", 'to': u"orm['orm.Layer']"}), | ||
155 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
156 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
157 | 'up_branch': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.Branch']", 'null': 'True'}), | ||
158 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
159 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
160 | }, | ||
161 | u'orm.layersource': { | ||
162 | 'Meta': {'unique_together': "(('sourcetype', 'apiurl'),)", 'object_name': 'LayerSource'}, | ||
163 | 'apiurl': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True'}), | ||
164 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
165 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '63'}), | ||
166 | 'sourcetype': ('django.db.models.fields.IntegerField', [], {}) | ||
167 | }, | ||
168 | u'orm.layerversiondependency': { | ||
169 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'LayerVersionDependency'}, | ||
170 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dependees'", 'to': u"orm['orm.Layer_Version']"}), | ||
171 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
172 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
173 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dependencies'", 'to': u"orm['orm.Layer_Version']"}), | ||
174 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
175 | }, | ||
176 | u'orm.logmessage': { | ||
177 | 'Meta': {'object_name': 'LogMessage'}, | ||
178 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
179 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
180 | 'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
181 | 'lineno': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
182 | 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), | ||
183 | 'pathname': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
184 | 'task': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Task']", 'null': 'True', 'blank': 'True'}) | ||
185 | }, | ||
186 | u'orm.machine': { | ||
187 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'Machine'}, | ||
188 | 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
189 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
190 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
191 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Layer_Version']"}), | ||
192 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
193 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
194 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
195 | }, | ||
196 | u'orm.package': { | ||
197 | 'Meta': {'object_name': 'Package'}, | ||
198 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
199 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
200 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
201 | 'installed_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), | ||
202 | 'installed_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
203 | 'license': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
204 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
205 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Recipe']", 'null': 'True'}), | ||
206 | 'revision': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), | ||
207 | 'section': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
208 | 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
209 | 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
210 | 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) | ||
211 | }, | ||
212 | u'orm.package_dependency': { | ||
213 | 'Meta': {'object_name': 'Package_Dependency'}, | ||
214 | 'dep_type': ('django.db.models.fields.IntegerField', [], {}), | ||
215 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_target'", 'to': u"orm['orm.Package']"}), | ||
216 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
217 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_source'", 'to': u"orm['orm.Package']"}), | ||
218 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']", 'null': 'True'}) | ||
219 | }, | ||
220 | u'orm.package_file': { | ||
221 | 'Meta': {'object_name': 'Package_File'}, | ||
222 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
223 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildfilelist_package'", 'to': u"orm['orm.Package']"}), | ||
224 | 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
225 | 'size': ('django.db.models.fields.IntegerField', [], {}) | ||
226 | }, | ||
227 | u'orm.project': { | ||
228 | 'Meta': {'object_name': 'Project'}, | ||
229 | 'bitbake_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.BitbakeVersion']"}), | ||
230 | 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
231 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
232 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
233 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']"}), | ||
234 | 'short_description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
235 | 'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
236 | 'user_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}) | ||
237 | }, | ||
238 | u'orm.projectlayer': { | ||
239 | 'Meta': {'unique_together': "(('project', 'layercommit'),)", 'object_name': 'ProjectLayer'}, | ||
240 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
241 | 'layercommit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Layer_Version']", 'null': 'True'}), | ||
242 | 'optional': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
243 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}) | ||
244 | }, | ||
245 | u'orm.projecttarget': { | ||
246 | 'Meta': {'object_name': 'ProjectTarget'}, | ||
247 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
248 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), | ||
249 | 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
250 | 'task': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}) | ||
251 | }, | ||
252 | u'orm.projectvariable': { | ||
253 | 'Meta': {'object_name': 'ProjectVariable'}, | ||
254 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
255 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
256 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), | ||
257 | 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) | ||
258 | }, | ||
259 | u'orm.recipe': { | ||
260 | 'Meta': {'unique_together': "(('layer_version', 'file_path'),)", 'object_name': 'Recipe'}, | ||
261 | 'bugtracker': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
262 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
263 | 'file_path': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), | ||
264 | 'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
265 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
266 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
267 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'recipe_layer_version'", 'to': u"orm['orm.Layer_Version']"}), | ||
268 | 'license': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
269 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
270 | 'section': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
271 | 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
272 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
273 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}), | ||
274 | 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) | ||
275 | }, | ||
276 | u'orm.recipe_dependency': { | ||
277 | 'Meta': {'object_name': 'Recipe_Dependency'}, | ||
278 | 'dep_type': ('django.db.models.fields.IntegerField', [], {}), | ||
279 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_depends'", 'to': u"orm['orm.Recipe']"}), | ||
280 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
281 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_recipe'", 'to': u"orm['orm.Recipe']"}) | ||
282 | }, | ||
283 | u'orm.release': { | ||
284 | 'Meta': {'object_name': 'Release'}, | ||
285 | 'bitbake_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.BitbakeVersion']"}), | ||
286 | 'branch_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50'}), | ||
287 | 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
288 | 'helptext': ('django.db.models.fields.TextField', [], {'null': 'True'}), | ||
289 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
290 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) | ||
291 | }, | ||
292 | u'orm.releasedefaultlayer': { | ||
293 | 'Meta': {'object_name': 'ReleaseDefaultLayer'}, | ||
294 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
295 | 'layer_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), | ||
296 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']"}) | ||
297 | }, | ||
298 | u'orm.releaselayersourcepriority': { | ||
299 | 'Meta': {'unique_together': "(('release', 'layer_source'),)", 'object_name': 'ReleaseLayerSourcePriority'}, | ||
300 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
301 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.LayerSource']"}), | ||
302 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
303 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']"}) | ||
304 | }, | ||
305 | u'orm.target': { | ||
306 | 'Meta': {'object_name': 'Target'}, | ||
307 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
308 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
309 | 'image_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
310 | 'is_image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
311 | 'license_manifest_path': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), | ||
312 | 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
313 | }, | ||
314 | u'orm.target_file': { | ||
315 | 'Meta': {'object_name': 'Target_File'}, | ||
316 | 'directory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'directory_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), | ||
317 | 'group': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
318 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
319 | 'inodetype': ('django.db.models.fields.IntegerField', [], {}), | ||
320 | 'owner': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
321 | 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '100'}), | ||
322 | 'permission': ('django.db.models.fields.CharField', [], {'max_length': '16'}), | ||
323 | 'size': ('django.db.models.fields.IntegerField', [], {}), | ||
324 | 'sym_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'symlink_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), | ||
325 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
326 | }, | ||
327 | u'orm.target_image_file': { | ||
328 | 'Meta': {'object_name': 'Target_Image_File'}, | ||
329 | 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '254'}), | ||
330 | 'file_size': ('django.db.models.fields.IntegerField', [], {}), | ||
331 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
332 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
333 | }, | ||
334 | u'orm.target_installed_package': { | ||
335 | 'Meta': {'object_name': 'Target_Installed_Package'}, | ||
336 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
337 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildtargetlist_package'", 'to': u"orm['orm.Package']"}), | ||
338 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
339 | }, | ||
340 | u'orm.task': { | ||
341 | 'Meta': {'ordering': "('order', 'recipe')", 'unique_together': "(('build', 'recipe', 'task_name'),)", 'object_name': 'Task'}, | ||
342 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_build'", 'to': u"orm['orm.Build']"}), | ||
343 | 'cpu_usage': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2'}), | ||
344 | 'disk_io': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
345 | 'elapsed_time': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2'}), | ||
346 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
347 | 'line_number': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
348 | 'logfile': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
349 | 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), | ||
350 | 'order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
351 | 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), | ||
352 | 'path_to_sstate_obj': ('django.db.models.fields.FilePathField', [], {'max_length': '500', 'blank': 'True'}), | ||
353 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'build_recipe'", 'to': u"orm['orm.Recipe']"}), | ||
354 | 'script_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
355 | 'source_url': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
356 | 'sstate_checksum': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
357 | 'sstate_result': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
358 | 'task_executed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
359 | 'task_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
360 | 'work_directory': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}) | ||
361 | }, | ||
362 | u'orm.task_dependency': { | ||
363 | 'Meta': {'object_name': 'Task_Dependency'}, | ||
364 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_depends'", 'to': u"orm['orm.Task']"}), | ||
365 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
366 | 'task': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_task'", 'to': u"orm['orm.Task']"}) | ||
367 | }, | ||
368 | u'orm.toastersetting': { | ||
369 | 'Meta': {'object_name': 'ToasterSetting'}, | ||
370 | 'helptext': ('django.db.models.fields.TextField', [], {}), | ||
371 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
372 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '63'}), | ||
373 | 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) | ||
374 | }, | ||
375 | u'orm.variable': { | ||
376 | 'Meta': {'object_name': 'Variable'}, | ||
377 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'variable_build'", 'to': u"orm['orm.Build']"}), | ||
378 | 'changed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
379 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
380 | 'human_readable_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), | ||
381 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
382 | 'variable_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
383 | 'variable_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) | ||
384 | }, | ||
385 | u'orm.variablehistory': { | ||
386 | 'Meta': {'object_name': 'VariableHistory'}, | ||
387 | 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), | ||
388 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
389 | 'line_number': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
390 | 'operation': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
391 | 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
392 | 'variable': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vhistory'", 'to': u"orm['orm.Variable']"}) | ||
393 | } | ||
394 | } | ||
395 | |||
396 | complete_apps = ['orm'] \ No newline at end of file | ||
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index d99a4c2129..c90e047caf 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | from django.db import models | 22 | from django.db import models |
23 | from django.db.models import F | 23 | from django.db.models import F |
24 | from django.utils.encoding import python_2_unicode_compatible | ||
25 | from django.utils import timezone | 24 | from django.utils import timezone |
26 | 25 | ||
27 | 26 | ||
@@ -54,9 +53,6 @@ class ToasterSetting(models.Model): | |||
54 | def __unicode__(self): | 53 | def __unicode__(self): |
55 | return "Setting %s" % self.name | 54 | return "Setting %s" % self.name |
56 | 55 | ||
57 | class ToasterSettingDefaultLayer(models.Model): | ||
58 | layer_version = models.ForeignKey('Layer_Version') | ||
59 | |||
60 | class ProjectManager(models.Manager): | 56 | class ProjectManager(models.Manager): |
61 | def create_project(self, name, release): | 57 | def create_project(self, name, release): |
62 | prj = self.model(name = name, bitbake_version = release.bitbake_version, release = release) | 58 | prj = self.model(name = name, bitbake_version = release.bitbake_version, release = release) |
@@ -68,10 +64,10 @@ class ProjectManager(models.Manager): | |||
68 | name = name, | 64 | name = name, |
69 | value = defaultconf.value) | 65 | value = defaultconf.value) |
70 | 66 | ||
71 | for layer in map(lambda x: x.layer, ReleaseDefaultLayer.objects.filter(release = release)): | 67 | |
72 | for branches in Branch.objects.filter(name = release.branch): | 68 | for rdl in release.releasedefaultlayer_set.all(): |
73 | for lv in Layer_Version.objects.filter(layer = layer, up_branch = branches ): | 69 | lv = Layer_Version.objects.filter(layer__name = rdl.layer_name, up_branch__name = release.branch_name)[0].get_equivalents_wpriority(prj)[0] |
74 | ProjectLayer.objects.create( project = prj, | 70 | ProjectLayer.objects.create( project = prj, |
75 | layercommit = lv, | 71 | layercommit = lv, |
76 | optional = False ) | 72 | optional = False ) |
77 | 73 | ||
@@ -84,6 +80,7 @@ class ProjectManager(models.Manager): | |||
84 | raise Exception("Invalid call to Project.objects.get_or_create. Use Project.objects.create_project() to create a project") | 80 | raise Exception("Invalid call to Project.objects.get_or_create. Use Project.objects.create_project() to create a project") |
85 | 81 | ||
86 | class Project(models.Model): | 82 | class Project(models.Model): |
83 | search_allowed_fields = ['name', 'short_description', 'release__name', 'release__branch_name'] | ||
87 | name = models.CharField(max_length=100) | 84 | name = models.CharField(max_length=100) |
88 | short_description = models.CharField(max_length=50, blank=True) | 85 | short_description = models.CharField(max_length=50, blank=True) |
89 | bitbake_version = models.ForeignKey('BitbakeVersion') | 86 | bitbake_version = models.ForeignKey('BitbakeVersion') |
@@ -97,6 +94,8 @@ class Project(models.Model): | |||
97 | user_id = models.IntegerField(null = True) | 94 | user_id = models.IntegerField(null = True) |
98 | objects = ProjectManager() | 95 | objects = ProjectManager() |
99 | 96 | ||
97 | def __unicode__(self): | ||
98 | return "%s (%s, %s)" % (self.name, self.release, self.bitbake_version) | ||
100 | 99 | ||
101 | def schedule_build(self): | 100 | def schedule_build(self): |
102 | from bldcontrol.models import BuildRequest, BRTarget, BRLayer, BRVariable, BRBitbake | 101 | from bldcontrol.models import BuildRequest, BRTarget, BRLayer, BRVariable, BRBitbake |
@@ -184,7 +183,6 @@ class ProjectTarget(models.Model): | |||
184 | target = models.CharField(max_length=100) | 183 | target = models.CharField(max_length=100) |
185 | task = models.CharField(max_length=100, null=True) | 184 | task = models.CharField(max_length=100, null=True) |
186 | 185 | ||
187 | @python_2_unicode_compatible | ||
188 | class Target(models.Model): | 186 | class Target(models.Model): |
189 | search_allowed_fields = ['target', 'file_name'] | 187 | search_allowed_fields = ['target', 'file_name'] |
190 | build = models.ForeignKey(Build) | 188 | build = models.ForeignKey(Build) |
@@ -196,7 +194,7 @@ class Target(models.Model): | |||
196 | def package_count(self): | 194 | def package_count(self): |
197 | return Target_Installed_Package.objects.filter(target_id__exact=self.id).count() | 195 | return Target_Installed_Package.objects.filter(target_id__exact=self.id).count() |
198 | 196 | ||
199 | def __str__(self): | 197 | def __unicode__(self): |
200 | return self.target | 198 | return self.target |
201 | 199 | ||
202 | class Target_Image_File(models.Model): | 200 | class Target_Image_File(models.Model): |
@@ -391,10 +389,10 @@ class Package_Dependency(models.Model): | |||
391 | (TYPE_RREPLACES, "replaces"), | 389 | (TYPE_RREPLACES, "replaces"), |
392 | (TYPE_RCONFLICTS, "conflicts"), | 390 | (TYPE_RCONFLICTS, "conflicts"), |
393 | ) | 391 | ) |
394 | ''' Indexed by dep_type, in view order, key for short name and help | 392 | """ Indexed by dep_type, in view order, key for short name and help |
395 | description which when viewed will be printf'd with the | 393 | description which when viewed will be printf'd with the |
396 | package name. | 394 | package name. |
397 | ''' | 395 | """ |
398 | DEPENDS_DICT = { | 396 | DEPENDS_DICT = { |
399 | TYPE_RDEPENDS : ("depends", "%s is required to run %s"), | 397 | TYPE_RDEPENDS : ("depends", "%s is required to run %s"), |
400 | TYPE_TRDEPENDS : ("depends", "%s is required to run %s"), | 398 | TYPE_TRDEPENDS : ("depends", "%s is required to run %s"), |
@@ -509,33 +507,47 @@ class LayerSource(models.Model): | |||
509 | 507 | ||
510 | TYPE_LOCAL = 0 | 508 | TYPE_LOCAL = 0 |
511 | TYPE_LAYERINDEX = 1 | 509 | TYPE_LAYERINDEX = 1 |
510 | TYPE_IMPORTED = 2 | ||
512 | SOURCE_TYPE = ( | 511 | SOURCE_TYPE = ( |
513 | (TYPE_LOCAL, "local"), | 512 | (TYPE_LOCAL, "local"), |
514 | (TYPE_LAYERINDEX, "layerindex"), | 513 | (TYPE_LAYERINDEX, "layerindex"), |
514 | (TYPE_IMPORTED, "imported"), | ||
515 | ) | 515 | ) |
516 | 516 | ||
517 | name = models.CharField(max_length=63) | 517 | name = models.CharField(max_length=63, unique = True) |
518 | sourcetype = models.IntegerField(choices=SOURCE_TYPE) | 518 | sourcetype = models.IntegerField(choices=SOURCE_TYPE) |
519 | apiurl = models.CharField(max_length=255, null=True, default=None) | 519 | apiurl = models.CharField(max_length=255, null=True, default=None) |
520 | 520 | ||
521 | def update(self): | ||
522 | """ | ||
523 | Updates the local database information from the upstream layer source | ||
524 | """ | ||
525 | raise Exception("Abstract, update() must be implemented by all LayerSource-derived classes (object is %s)" % str(vars(self))) | ||
526 | |||
521 | def save(self, *args, **kwargs): | 527 | def save(self, *args, **kwargs): |
522 | if isinstance(self, LocalLayerSource): | 528 | if isinstance(self, LocalLayerSource): |
523 | self.sourcetype = LayerSource.TYPE_LOCAL | 529 | self.sourcetype = LayerSource.TYPE_LOCAL |
524 | elif isinstance(self, LayerIndexLayerSource): | 530 | elif isinstance(self, LayerIndexLayerSource): |
525 | self.sourcetype = LayerSource.TYPE_LAYERINDEX | 531 | self.sourcetype = LayerSource.TYPE_LAYERINDEX |
532 | elif isinstance(self, ImportedLayerSource): | ||
533 | self.sourcetype = LayerSource.TYPE_IMPORTED | ||
526 | elif self.sourcetype == None: | 534 | elif self.sourcetype == None: |
527 | raise Exception("Invalid LayerSource type") | 535 | raise Exception("Unknown LayerSource-derived class. If you added a new layer source type, fill out all code stubs.") |
528 | return super(LayerSource, self).save(*args, **kwargs) | 536 | return super(LayerSource, self).save(*args, **kwargs) |
529 | 537 | ||
530 | def get_object(self): | 538 | def get_object(self): |
531 | if self.sourcetype is not None: | 539 | if self.sourcetype == LayerSource.TYPE_LOCAL: |
532 | if self.sourcetype == LayerSource.TYPE_LOCAL: | 540 | self.__class__ = LocalLayerSource |
533 | self.__class__ = LocalLayerSource | 541 | elif self.sourcetype == LayerSource.TYPE_LAYERINDEX: |
534 | if self.sourcetype == LayerSource.TYPE_LAYERINDEX: | 542 | self.__class__ = LayerIndexLayerSource |
535 | self.__class__ = LayerIndexLayerSource | 543 | elif self.sourcetype == LayerSource.TYPE_IMPORTED: |
544 | self.__class__ = ImportedLayerSource | ||
545 | else: | ||
546 | raise Exception("Unknown LayerSource type. If you added a new layer source type, fill out all code stubs.") | ||
536 | return self | 547 | return self |
537 | 548 | ||
538 | return "LS " + self.sourcetype + " " + self.name | 549 | def __unicode__(self): |
550 | return "%s (%s)" % (self.name, self.sourcetype) | ||
539 | 551 | ||
540 | 552 | ||
541 | class LocalLayerSource(LayerSource): | 553 | class LocalLayerSource(LayerSource): |
@@ -547,11 +559,26 @@ class LocalLayerSource(LayerSource): | |||
547 | self.sourcetype = LayerSource.TYPE_LOCAL | 559 | self.sourcetype = LayerSource.TYPE_LOCAL |
548 | 560 | ||
549 | def update(self): | 561 | def update(self): |
550 | ''' | 562 | """ |
563 | Fetches layer, recipe and machine information from local repository | ||
564 | """ | ||
565 | pass | ||
566 | |||
567 | class ImportedLayerSource(LayerSource): | ||
568 | class Meta(LayerSource._meta.__class__): | ||
569 | proxy = True | ||
570 | |||
571 | def __init__(self, *args, **kwargs): | ||
572 | super(ImportedLayerSource, self).__init__(args, kwargs) | ||
573 | self.sourcetype = LayerSource.TYPE_IMPORTED | ||
574 | |||
575 | def update(self): | ||
576 | """ | ||
551 | Fetches layer, recipe and machine information from local repository | 577 | Fetches layer, recipe and machine information from local repository |
552 | ''' | 578 | """ |
553 | pass | 579 | pass |
554 | 580 | ||
581 | |||
555 | class LayerIndexLayerSource(LayerSource): | 582 | class LayerIndexLayerSource(LayerSource): |
556 | class Meta(LayerSource._meta.__class__): | 583 | class Meta(LayerSource._meta.__class__): |
557 | proxy = True | 584 | proxy = True |
@@ -566,9 +593,9 @@ class LayerIndexLayerSource(LayerSource): | |||
566 | return self.apiurl + "../branch/" + branch.name + "/" + objectype + "/?q=" + str(upid) | 593 | return self.apiurl + "../branch/" + branch.name + "/" + objectype + "/?q=" + str(upid) |
567 | 594 | ||
568 | def update(self): | 595 | def update(self): |
569 | ''' | 596 | """ |
570 | Fetches layer, recipe and machine information from remote repository | 597 | Fetches layer, recipe and machine information from remote repository |
571 | ''' | 598 | """ |
572 | assert self.apiurl is not None | 599 | assert self.apiurl is not None |
573 | from django.db import IntegrityError | 600 | from django.db import IntegrityError |
574 | 601 | ||
@@ -601,7 +628,7 @@ class LayerIndexLayerSource(LayerSource): | |||
601 | return | 628 | return |
602 | 629 | ||
603 | # update branches; only those that we already have names listed in the Releases table | 630 | # update branches; only those that we already have names listed in the Releases table |
604 | whitelist_branch_names = map(lambda x: x.branch.name, Release.objects.all()) | 631 | whitelist_branch_names = map(lambda x: x.branch_name, Release.objects.all()) |
605 | 632 | ||
606 | branches_info = _get_json_response(apilinks['branches'] | 633 | branches_info = _get_json_response(apilinks['branches'] |
607 | + "?filter=name:%s" % "OR".join(whitelist_branch_names)) | 634 | + "?filter=name:%s" % "OR".join(whitelist_branch_names)) |
@@ -713,16 +740,31 @@ class BitbakeVersion(models.Model): | |||
713 | 740 | ||
714 | 741 | ||
715 | class Release(models.Model): | 742 | class Release(models.Model): |
743 | """ A release is a project template, used to pre-populate Project settings with a configuration set """ | ||
716 | name = models.CharField(max_length=32, unique = True) | 744 | name = models.CharField(max_length=32, unique = True) |
717 | description = models.CharField(max_length=255) | 745 | description = models.CharField(max_length=255) |
718 | bitbake_version = models.ForeignKey(BitbakeVersion) | 746 | bitbake_version = models.ForeignKey(BitbakeVersion) |
719 | branch = models.ForeignKey('Branch') | 747 | branch_name = models.CharField(max_length=50, default = "") |
720 | helptext = models.TextField(null=True) | 748 | helptext = models.TextField(null=True) |
721 | 749 | ||
750 | def __unicode__(self): | ||
751 | return "%s (%s)" % (self.name, self.branch_name) | ||
752 | |||
753 | class ReleaseLayerSourcePriority(models.Model): | ||
754 | """ Each release selects layers from the set up layer sources, ordered by priority """ | ||
755 | release = models.ForeignKey("Release") | ||
756 | layer_source = models.ForeignKey("LayerSource") | ||
757 | priority = models.IntegerField(default = 0) | ||
758 | |||
759 | def __unicode__(self): | ||
760 | return "%s-%s:%d" % (self.release.name, self.layer_source.name, self.priority) | ||
761 | class Meta: | ||
762 | unique_together = (('release', 'layer_source'),) | ||
763 | |||
722 | 764 | ||
723 | class ReleaseDefaultLayer(models.Model): | 765 | class ReleaseDefaultLayer(models.Model): |
724 | release = models.ForeignKey(Release) | 766 | release = models.ForeignKey(Release) |
725 | layer = models.ForeignKey('Layer') | 767 | layer_name = models.CharField(max_length=100, default="") |
726 | 768 | ||
727 | 769 | ||
728 | # Branch class is synced with layerindex.Branch, branches can only come from remote layer indexes | 770 | # Branch class is synced with layerindex.Branch, branches can only come from remote layer indexes |
@@ -760,7 +802,7 @@ class Layer(models.Model): | |||
760 | description = models.TextField(null = True, default = None) | 802 | description = models.TextField(null = True, default = None) |
761 | 803 | ||
762 | def __unicode__(self): | 804 | def __unicode__(self): |
763 | return "L " + self.name | 805 | return "%s / %s " % (self.name, self.layer_source) |
764 | 806 | ||
765 | class Meta: | 807 | class Meta: |
766 | unique_together = (("layer_source", "up_id"), ("layer_source", "name")) | 808 | unique_together = (("layer_source", "up_id"), ("layer_source", "name")) |
@@ -831,9 +873,21 @@ class Layer_Version(models.Model): | |||
831 | return None | 873 | return None |
832 | return self._handle_url_path(self.layer.vcs_web_tree_base_url, '') | 874 | return self._handle_url_path(self.layer.vcs_web_tree_base_url, '') |
833 | 875 | ||
876 | def get_equivalents_wpriority(self, project): | ||
877 | """ Returns an ordered layerversion list that satisfies a LayerVersionDependency using the layer name and the current Project Releases' LayerSource priority """ | ||
878 | def _get_ls_priority(ls): | ||
879 | try: | ||
880 | return ls.releaselayersourcepriority_set.get(release=project.release).priority | ||
881 | except ReleaseLayerSourcePriority.DoesNotExist: | ||
882 | raise | ||
883 | return sorted( | ||
884 | Layer_Version.objects.filter( layer__name = self.layer.name, up_branch__name = self.up_branch.name ), | ||
885 | key = lambda x: _get_ls_priority(x.layer_source), | ||
886 | reverse = False) | ||
887 | |||
834 | 888 | ||
835 | def __unicode__(self): | 889 | def __unicode__(self): |
836 | return "LV " + str(self.layer) + " " + self.commit | 890 | return str(self.layer) + " (" + self.commit +")" |
837 | 891 | ||
838 | class Meta: | 892 | class Meta: |
839 | unique_together = ("layer_source", "up_id") | 893 | unique_together = ("layer_source", "up_id") |
@@ -853,6 +907,9 @@ class ProjectLayer(models.Model): | |||
853 | layercommit = models.ForeignKey(Layer_Version, null=True) | 907 | layercommit = models.ForeignKey(Layer_Version, null=True) |
854 | optional = models.BooleanField(default = True) | 908 | optional = models.BooleanField(default = True) |
855 | 909 | ||
910 | def __unicode__(self): | ||
911 | return "%s, %s" % (self.project.name, self.layercommit) | ||
912 | |||
856 | class Meta: | 913 | class Meta: |
857 | unique_together = (("project", "layercommit"),) | 914 | unique_together = (("project", "layercommit"),) |
858 | 915 | ||
diff --git a/bitbake/lib/toaster/orm/tests.py b/bitbake/lib/toaster/orm/tests.py index f2f561bff9..b965d8e50e 100644 --- a/bitbake/lib/toaster/orm/tests.py +++ b/bitbake/lib/toaster/orm/tests.py | |||
@@ -1,16 +1,19 @@ | |||
1 | from django.test import TestCase | 1 | from django.test import TestCase |
2 | from orm.models import LocalLayerSource, LayerIndexLayerSource, LayerSource | 2 | from orm.models import LocalLayerSource, LayerIndexLayerSource, ImportedLayerSource, LayerSource |
3 | from orm.models import Branch | 3 | from orm.models import Branch |
4 | 4 | ||
5 | class LayerSourceVerifyInheritanceSaveLoad(TestCase): | 5 | class LayerSourceVerifyInheritanceSaveLoad(TestCase): |
6 | def test_object_creation(self): | 6 | def test_object_creation(self): |
7 | lls = LayerSource.objects.create(name = "a1", sourcetype = LayerSource.TYPE_LOCAL, apiurl = "") | 7 | lls = LayerSource.objects.create(name = "a1", sourcetype = LayerSource.TYPE_LOCAL, apiurl = "") |
8 | lils = LayerSource.objects.create(name = "a1", sourcetype = LayerSource.TYPE_LAYERINDEX, apiurl = "") | 8 | lils = LayerSource.objects.create(name = "a2", sourcetype = LayerSource.TYPE_LAYERINDEX, apiurl = "") |
9 | imls = LayerSource.objects.create(name = "a3", sourcetype = LayerSource.TYPE_IMPORTED, apiurl = "") | ||
9 | 10 | ||
10 | print LayerSource.objects.all() | 11 | import pprint |
12 | pprint.pprint([(x.__class__,vars(x)) for x in LayerSource.objects.all()]) | ||
11 | 13 | ||
12 | self.assertTrue(True in map(lambda x: isinstance(x, LocalLayerSource), LayerSource.objects.all())) | 14 | self.assertTrue(True in map(lambda x: isinstance(x, LocalLayerSource), LayerSource.objects.all())) |
13 | self.assertTrue(True in map(lambda x: isinstance(x, LayerIndexLayerSource), LayerSource.objects.all())) | 15 | self.assertTrue(True in map(lambda x: isinstance(x, LayerIndexLayerSource), LayerSource.objects.all())) |
16 | self.assertTrue(True in map(lambda x: isinstance(x, ImportedLayerSource), LayerSource.objects.all())) | ||
14 | 17 | ||
15 | def test_duplicate_error(self): | 18 | def test_duplicate_error(self): |
16 | def duplicate(): | 19 | def duplicate(): |
@@ -18,7 +21,7 @@ class LayerSourceVerifyInheritanceSaveLoad(TestCase): | |||
18 | LayerSource.objects.create(name = "a1", sourcetype = LayerSource.TYPE_LOCAL, apiurl = "") | 21 | LayerSource.objects.create(name = "a1", sourcetype = LayerSource.TYPE_LOCAL, apiurl = "") |
19 | 22 | ||
20 | self.assertRaises(Exception, duplicate) | 23 | self.assertRaises(Exception, duplicate) |
21 | 24 | ||
22 | 25 | ||
23 | 26 | ||
24 | class LILSUpdateTestCase(TestCase): | 27 | class LILSUpdateTestCase(TestCase): |