diff --git a/horizon/horizon/dashboards/nova/instances_and_volumes/instances/views.py b/horizon/horizon/dashboards/nova/instances_and_volumes/instances/views.py index 5a02b389469..d1afaf3e0f8 100644 --- a/horizon/horizon/dashboards/nova/instances_and_volumes/instances/views.py +++ b/horizon/horizon/dashboards/nova/instances_and_volumes/instances/views.py @@ -32,6 +32,7 @@ from django.utils.translation import ugettext as _ import openstackx.api.exceptions as api_exceptions +import horizon from horizon import api from horizon import forms from horizon import test @@ -164,6 +165,8 @@ def usage(request, tenant_id=None): template_name = 'nova/instances_and_volumes/instances/usage.html' mimetype = "text/html" + dash_url = horizon.get_dashboard('nova').get_absolute_url() + return shortcuts.render(request, template_name, { 'usage': usage, 'ram_unit': ram_unit, @@ -172,7 +175,8 @@ def usage(request, tenant_id=None): 'show_terminated': show_terminated, 'datetime_start': datetime_start, 'datetime_end': datetime_end, - 'instances': instances}, + 'instances': instances, + 'dash_url': dash_url}, content_type=mimetype) diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/usage.html b/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/usage.html index 53d632a62dd..01031ae63b7 100644 --- a/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/usage.html +++ b/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/usage.html @@ -35,21 +35,24 @@
{% trans "ID" %} | {% trans "Name" %} | {% trans "User" %} | -{% trans "VCPUs" %} | -{% trans "Ram Size" %} | -{% trans "Disk Size" %} | -{% trans "Flavor" %} | +{% trans "Size" %} | {% trans "Uptime" %} | -{% trans "Status" %} | +{% trans "State" %} |
---|---|---|---|---|---|---|---|---|---|---|
{{ instance.id }} | {{ instance.name }} | {{ instance.user_id }} | -{{ instance.vcpus }} | -{{ instance.ram_size|mbformat }} | -{{ instance.disk_size }}GB | -{{ instance.flavor }} | +{{ instance.ram_size|mbformat }} Ram | {{ instance.vcpus }} VCPU | {{ instance.disk_size }}GB Disk | {{ instance.uptime_at|timesince }} | {{ instance.state|lower|capfirst }} |