[bitbake-devel] [PATCH 22/23] toaster: split orm app into it's own module and app

[Alex DAMIAN]

From: Michael Wood <michael.g.wood at intel.com>

The orm application was also the django application to collect the build
information. Splitting this module up into it's functional parts. orm
for the data module and bldcollector for build collection data.

Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
 lib/toaster/bldcollector/__init__.py       | 0
 lib/toaster/{orm => bldcollector}/admin.py | 3 +--
 lib/toaster/{orm => bldcollector}/urls.py  | 3 +--
 lib/toaster/{orm => bldcollector}/views.py | 0
 lib/toaster/toastermain/settings.py        | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 lib/toaster/bldcollector/__init__.py
 rename lib/toaster/{orm => bldcollector}/admin.py (92%)
 rename lib/toaster/{orm => bldcollector}/urls.py (95%)
 rename lib/toaster/{orm => bldcollector}/views.py (100%)

diff --git a/lib/toaster/bldcollector/__init__.py b/lib/toaster/bldcollector/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/toaster/orm/admin.py b/lib/toaster/bldcollector/admin.py
similarity index 92%
rename from lib/toaster/orm/admin.py
rename to lib/toaster/bldcollector/admin.py
index 706e517..c1f85d7 100644
--- a/lib/toaster/orm/admin.py
+++ b/lib/toaster/bldcollector/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.admin.filters import RelatedFieldListFilter
-from .models import BitbakeVersion, Release, LayerSource, ToasterSetting
+from orm.models import BitbakeVersion, Release, LayerSource, ToasterSetting
 from django.forms.widgets import Textarea
 from django import forms
 import django.db.models as models
@@ -31,4 +31,3 @@ admin.site.register(LayerSource, LayerSourceAdmin)
 admin.site.register(BitbakeVersion, BitbakeVersionAdmin)
 admin.site.register(Release, ReleaseAdmin)
 admin.site.register(ToasterSetting, ToasterSettingAdmin)
-
diff --git a/lib/toaster/orm/urls.py b/lib/toaster/bldcollector/urls.py
similarity index 95%
rename from lib/toaster/orm/urls.py
rename to lib/toaster/bldcollector/urls.py
index 961bc19..144387b 100644
--- a/lib/toaster/orm/urls.py
+++ b/lib/toaster/bldcollector/urls.py
@@ -20,8 +20,7 @@
 from django.conf.urls import patterns, include, url
 from django.views.generic import RedirectView
 
-urlpatterns = patterns('orm.views',
+urlpatterns = patterns('bldcollector.views',
         # landing point for pushing a bitbake_eventlog.json file to this toaster instace
         url(r'^eventfile$', 'eventfile', name='eventfile'),
         )
-
diff --git a/lib/toaster/orm/views.py b/lib/toaster/bldcollector/views.py
similarity index 100%
rename from lib/toaster/orm/views.py
rename to lib/toaster/bldcollector/views.py
diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py
index 60e80de..c72a904 100644
--- a/lib/toaster/toastermain/settings.py
+++ b/lib/toaster/toastermain/settings.py
@@ -268,7 +268,7 @@ INSTALLED_APPS = (
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
-    'orm',
+    'bldcollector',
     'toastermain',
     'south',
 )
-- 
1.9.1