From df48243970fac633586eb99c9baf3090123c681c Mon Sep 17 00:00:00 2001
From: Michael Wood <michael.g.wood@intel.com>
Date: Tue, 16 Jun 2015 16:00:26 +0100
Subject: [PATCH] bitbake: toaster: split orm app into it's own module and app

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.

(Bitbake rev: 8ca10764ffd6cfec12cbfeabf240d81213a07845)

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

diff --git a/bitbake/lib/toaster/bldcollector/__init__.py b/bitbake/lib/toaster/bldcollector/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bitbake/lib/toaster/orm/admin.py b/bitbake/lib/toaster/bldcollector/admin.py
similarity index 92%
rename from bitbake/lib/toaster/orm/admin.py
rename to bitbake/lib/toaster/bldcollector/admin.py
index 706e517e0e..c1f85d73d5 100644
--- a/bitbake/lib/toaster/orm/admin.py
+++ b/bitbake/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/bitbake/lib/toaster/orm/urls.py b/bitbake/lib/toaster/bldcollector/urls.py
similarity index 95%
rename from bitbake/lib/toaster/orm/urls.py
rename to bitbake/lib/toaster/bldcollector/urls.py
index 961bc19070..144387b56a 100644
--- a/bitbake/lib/toaster/orm/urls.py
+++ b/bitbake/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/bitbake/lib/toaster/orm/views.py b/bitbake/lib/toaster/bldcollector/views.py
similarity index 100%
rename from bitbake/lib/toaster/orm/views.py
rename to bitbake/lib/toaster/bldcollector/views.py
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 60e80de2f6..c72a90411b 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/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',
 )