From 705aef0ef5b655e471b21cefef04fe3094365992 Mon Sep 17 00:00:00 2001 From: Matt Joyce Date: Wed, 15 Aug 2012 14:54:26 -0700 Subject: [PATCH] Bug #1018560 Adding quota display to Overview template Change-Id: I8b7d5070dade4f0caae0ca9794a169cfc15b985f --- .../nova/overview/templates/overview/usage.html | 1 + .../templates/horizon/common/_quota_summary.html | 13 +++++++++++++ horizon/usage/base.py | 4 ++++ 3 files changed, 18 insertions(+) create mode 100644 horizon/templates/horizon/common/_quota_summary.html diff --git a/horizon/dashboards/nova/overview/templates/overview/usage.html b/horizon/dashboards/nova/overview/templates/overview/usage.html index 6073279724..ecc7d68447 100644 --- a/horizon/dashboards/nova/overview/templates/overview/usage.html +++ b/horizon/dashboards/nova/overview/templates/overview/usage.html @@ -7,6 +7,7 @@ {% endblock page_header %} {% block main %} + {% include "horizon/common/_quota_summary.html" %} {% include "horizon/common/_usage_summary.html" %} {{ table.render }} {% endblock %} diff --git a/horizon/templates/horizon/common/_quota_summary.html b/horizon/templates/horizon/common/_quota_summary.html new file mode 100644 index 0000000000..b4ad64bf3e --- /dev/null +++ b/horizon/templates/horizon/common/_quota_summary.html @@ -0,0 +1,13 @@ +{% load i18n horizon humanize sizeformat %} + +
+

{% trans "Quota Summary" %}

+ {% trans "Used" %} {{ usage.quota.instances.used|intcomma }} {% trans "of" %} {{ usage.quota.instances.quota|intcomma }} {% trans "Available Instances" %} + {% horizon_progress_bar usage.quota.instances.used usage.quota.instances.quota %} + + {% trans "Used" %} {{ usage.quota.cores.used|intcomma }} {% trans "of" %} {{ usage.quota.cores.quota|intcomma }} {% trans "Available vCPUs" %} + {% horizon_progress_bar usage.quota.cores.used usage.quota.cores.quota %} + + {% trans "Used" %} {{ usage.quota.ram.used|intcomma }} MB {% trans "of" %} {{ usage.quota.ram.quota|intcomma }} MB {% trans "Available Memory" %} + {% horizon_progress_bar usage.quota.ram.used usage.quota.ram.quota %} +
diff --git a/horizon/usage/base.py b/horizon/usage/base.py index 1bfb3dd709..d9b54ac504 100644 --- a/horizon/usage/base.py +++ b/horizon/usage/base.py @@ -104,6 +104,10 @@ class BaseUsage(object): self.summary.setdefault(key, 0) self.summary[key] += value + def quota(self): + quotas = api.nova.tenant_quota_usages(self.request) + return quotas + def csv_link(self): form = self.get_form() if hasattr(form, "cleaned_data"):