From e55b20e51836f9c32c022bf96ce566215ac9068b Mon Sep 17 00:00:00 2001 From: jeffjapan Date: Mon, 25 Jul 2011 09:05:28 +0900 Subject: [PATCH 1/2] Correct missing import, used in services --- django-openstack/django_openstack/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/django-openstack/django_openstack/api.py b/django-openstack/django_openstack/api.py index 26579a202..1bfbba8b6 100644 --- a/django-openstack/django_openstack/api.py +++ b/django-openstack/django_openstack/api.py @@ -34,6 +34,7 @@ al. """ from django.conf import settings +from django.contrib import messages import cloudfiles import glance.client From ee97c86c5cfbbaf0be3077b07bbd943485e189fa Mon Sep 17 00:00:00 2001 From: jeffjapan Date: Mon, 25 Jul 2011 09:32:40 +0900 Subject: [PATCH 2/2] Found a few more errors in api.py's GlobalSummary class --- django-openstack/django_openstack/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/django-openstack/django_openstack/api.py b/django-openstack/django_openstack/api.py index 1bfbba8b6..6446909b7 100644 --- a/django-openstack/django_openstack/api.py +++ b/django-openstack/django_openstack/api.py @@ -630,6 +630,8 @@ class GlobalSummary(object): for info in GlobalSummary.node_resource_info: self.summary['total_' + info + rsrc] = 0 self.request = request + self.service_list = [] + self.usage_list = [] def service(self): for rsrc in GlobalSummary.node_resources: @@ -640,7 +642,7 @@ class GlobalSummary(object): except api_exceptions.ApiException, e: LOG.error('ApiException fetching service list in instance usage', exc_info=True) - messages.error(request, + messages.error(self.request, 'Unable to get service info: %s' % e.message) return @@ -659,7 +661,7 @@ class GlobalSummary(object): ' on date range "%s to %s"' % (datetime_start, datetime_end), 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 for usage in self.usage_list: