diff --git a/django-openstack/src/django_openstack/dash/views/instances.py b/django-openstack/src/django_openstack/dash/views/instances.py index d55d10576..bd5bd5769 100644 --- a/django-openstack/src/django_openstack/dash/views/instances.py +++ b/django-openstack/src/django_openstack/dash/views/instances.py @@ -116,13 +116,17 @@ def usage(request, tenant_id=None): if not tenant_id: tenant_id = request.user.tenant - try: usage = api.extras_api(request).usage.get(tenant_id, datetime_start, datetime_end) except api_exceptions.ApiException, e: messages.error(request, 'Unable to get usage info: %s' % e.message) + for instance in usage.instances: + instance['started_at'] = datetime.datetime.strptime( + instance['started_at'], + "%Y-%m-%d %H:%M:%S.%f") + return render_to_response('dash_usage.html', { 'usage': usage, }, context_instance=template.RequestContext(request)) diff --git a/openstack-dashboard/dashboard/templates/dash_usage.html b/openstack-dashboard/dashboard/templates/dash_usage.html index 6bca8526e..cecfb70fd 100644 --- a/openstack-dashboard/dashboard/templates/dash_usage.html +++ b/openstack-dashboard/dashboard/templates/dash_usage.html @@ -75,7 +75,7 @@