瀏覽代碼

HUE-1176 [jb] Properly list coordinators and bundles

Romain Rigaux 8 年之前
父節點
當前提交
d036de4
共有 2 個文件被更改,包括 20 次插入21 次删除
  1. 10 10
      apps/jobbrowser/src/jobbrowser/apis/bundle_api.py
  2. 10 11
      apps/jobbrowser/src/jobbrowser/apis/schedule_api.py

+ 10 - 10
apps/jobbrowser/src/jobbrowser/apis/bundle_api.py

@@ -24,7 +24,6 @@ from liboozie.oozie_api import get_oozie
 
 from jobbrowser.apis.base_api import Api, MockDjangoRequest
 from liboozie.utils import format_time
-from oozie.views.dashboard import get_oozie_job_log, massaged_bundle_actions_for_json
 
 
 LOG = logging.getLogger(__name__)
@@ -32,6 +31,7 @@ LOG = logging.getLogger(__name__)
 
 try:
   from oozie.conf import OOZIE_JOBS_COUNT
+  from oozie.views.dashboard import get_oozie_job_log, massaged_bundle_actions_for_json, massaged_oozie_jobs_for_json
 except Exception, e:
   LOG.exception('Some application are not enabled: %s' % e)
 
@@ -45,16 +45,16 @@ class BundleApi(Api):
 
     return {
       'apps':[{
-        'id': app.id,
-        'name': app.appName,
-        'status': app.status,
-        'apiStatus': self._api_status(app.status),
+        'id': app['id'],
+        'name': app['appName'],
+        'status': app['status'],
+        'apiStatus': self._api_status(app['status']),
         'type': 'bundle',
-        'user': app.user,
-        'progress': app.get_progress(),
-        'duration': 10 * 3600,
-        'submitted': 10 * 3600
-      } for app in jobs.jobs],
+        'user': app['user'],
+        'progress': app['progress'],
+        'duration': app['durationInMillis'],
+        'submitted': app['kickoffTimeInMillis']
+      } for app in massaged_oozie_jobs_for_json(jobs.jobs, self.user)['jobs']],
       'total': jobs.total
     }
 

+ 10 - 11
apps/jobbrowser/src/jobbrowser/apis/schedule_api.py

@@ -24,7 +24,6 @@ from liboozie.oozie_api import get_oozie
 
 from jobbrowser.apis.base_api import Api, MockDjangoRequest
 from liboozie.utils import format_time
-from oozie.views.dashboard import get_oozie_job_log
 
 
 LOG = logging.getLogger(__name__)
@@ -32,7 +31,7 @@ LOG = logging.getLogger(__name__)
 
 try:
   from oozie.conf import OOZIE_JOBS_COUNT
-  from oozie.views.dashboard import list_oozie_coordinator
+  from oozie.views.dashboard import list_oozie_coordinator, get_oozie_job_log, massaged_oozie_jobs_for_json
 except Exception, e:
   LOG.exception('Some application are not enabled: %s' % e)
 
@@ -46,16 +45,16 @@ class ScheduleApi(Api):
 
     return {
       'apps':[{
-        'id': app.id,
-        'name': app.appName,
-        'status': app.status,
-        'apiStatus': self._api_status(app.status),
+        'id': app['id'],
+        'name': app['appName'],
+        'status': app['status'],
+        'apiStatus': self._api_status(app['status']),
         'type': 'schedule',
-        'user': app.user,
-        'progress': app.get_progress(),
-        'duration': 10 * 3600,
-        'submitted': 10 * 3600
-      } for app in jobs.jobs],
+        'user': app['user'],
+        'progress': app['progress'],
+        'duration': app['durationInMillis'],
+        'submitted': app['startTimeInMillis']
+      } for app in massaged_oozie_jobs_for_json(jobs.jobs, self.user)['jobs']],
       'total': jobs.total
     }