x/tuskar-ui
Code Issues Proposed changes

Merge pull request #73 from jeffjapan/master

Browse Source 
Missing import in api.py throws exception
This commit is contained in:
Devin Carlen 2011-07-24 19:08:13 -07:00
commit cf310588ae
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django-openstack/django_openstack/api.py
View File

@ -34,6 +34,7 @@ al.
""" """
from django.conf import settings from django.conf import settings
from django.contrib import messages
import cloudfiles import cloudfiles
import glance.client import glance.client
@ -629,6 +630,8 @@ class GlobalSummary(object):
for info in GlobalSummary.node_resource_info: for info in GlobalSummary.node_resource_info:
self.summary['total_' + info + rsrc] = 0 self.summary['total_' + info + rsrc] = 0
self.request = request self.request = request
self.service_list = []
self.usage_list = []
def service(self): def service(self):
for rsrc in GlobalSummary.node_resources: for rsrc in GlobalSummary.node_resources:
@ -639,7 +642,7 @@ class GlobalSummary(object):
except api_exceptions.ApiException, e: except api_exceptions.ApiException, e:
LOG.error('ApiException fetching service list in instance usage', LOG.error('ApiException fetching service list in instance usage',
exc_info=True) exc_info=True)
messages.error(request, messages.error(self.request,
'Unable to get service info: %s' % e.message) 'Unable to get service info: %s' % e.message)
return return
@ -658,7 +661,7 @@ class GlobalSummary(object):
' on date range "%s to %s"' % (datetime_start, ' on date range "%s to %s"' % (datetime_start,
datetime_end), datetime_end),
exc_info=True) exc_info=True)
messages.error(request, 'Unable to get usage info: %s' % e.message) messages.error(self.request, 'Unable to get usage info: %s' % e.message)
return return
for usage in self.usage_list: for usage in self.usage_list: