humanize uptime

This commit is contained in:
Anthony Young
2011-06-18 23:41:19 -07:00
parent 3a3e16d077
commit 372d056483
2 changed files with 6 additions and 2 deletions

View File

@@ -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))

View File

@@ -75,7 +75,7 @@
<td>{{instance.ram_size}}</td>
<td>{{instance.disk_size}}</td>
<td>{{instance.flavor}}</td>
<td>{{instance.uptime|floatformat}}</td>
<td>{{instance.started_at|timeuntil}}</td>
<td>{{instance.state}}</td>
</tr>
{% endfor %}