From a6cd12f24dacdd50900ffca365049aafe0fad96a Mon Sep 17 00:00:00 2001 From: Cindy Lu Date: Wed, 23 Jul 2014 16:09:43 -0700 Subject: [PATCH] Add missing Disk unit to Overview Usage Added unit to the Summary table and the csv report Change-Id: I91a0bdd13384098cd2e306413bfc103c99bbc418 Closes-Bug: #1346389 --- .../dashboards/admin/overview/templates/overview/usage.csv | 6 +++--- openstack_dashboard/dashboards/admin/overview/tests.py | 4 ++-- openstack_dashboard/dashboards/admin/projects/tests.py | 2 +- .../project/overview/templates/overview/usage.csv | 6 +++--- openstack_dashboard/dashboards/project/overview/views.py | 2 +- openstack_dashboard/usage/tables.py | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv index 3749ee2aff..17df7f6110 100644 --- a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv +++ b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv @@ -1,6 +1,6 @@ {% load i18n %}{% trans "Usage Report For Period" %}:,{{ usage.start|date:"b. d Y" }},{{ usage.end|date:"b. d Y" }} {% trans "Active Instances" %}:,{{ usage.summary.instances }} -{% trans "CPU-HRs Used" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }} +{% trans "Total VCPU Usage (Hours)" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }} {% trans "Total Active RAM (MB)" %}:,{{ usage.summary.memory_mb }} -{% trans "Total Disk Size" %}:,{{ usage.summary.local_gb }} -{% trans "Total Disk Usage" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }} +{% trans "Total Disk Size (GB)" %}:,{{ usage.summary.local_gb }} +{% trans "Total Disk Usage (Hours)" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }} diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index 3ffb7f1d79..d0c01d329b 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -111,7 +111,7 @@ class UsageViewTests(test.BaseAdminViewTests): %.2f ''' % (usage_list[0].vcpus, - usage_list[0].disk_gb_hours, + sizeformat.diskgbformat(usage_list[0].disk_gb_hours), sizeformat.mbformat(usage_list[0].memory_mb), usage_list[0].vcpu_hours, usage_list[0].total_local_gb_usage) @@ -128,7 +128,7 @@ class UsageViewTests(test.BaseAdminViewTests): %.2f ''' % (usage_list[1].vcpus, - usage_list[1].disk_gb_hours, + sizeformat.diskgbformat(usage_list[1].disk_gb_hours), sizeformat.mbformat(usage_list[1].memory_mb), usage_list[1].vcpu_hours, usage_list[1].total_local_gb_usage) diff --git a/openstack_dashboard/dashboards/admin/projects/tests.py b/openstack_dashboard/dashboards/admin/projects/tests.py index f44ebb24ab..69d18f86b1 100644 --- a/openstack_dashboard/dashboards/admin/projects/tests.py +++ b/openstack_dashboard/dashboards/admin/projects/tests.py @@ -1593,7 +1593,7 @@ class UsageViewTests(test.BaseAdminViewTests): self.assertTrue(isinstance(res.context['usage'], usage.ProjectUsage)) hdr = ('Instance Name,VCPUs,RAM (MB),Disk (GB),Usage (Hours),' - 'Uptime(Seconds),State') + 'Uptime (Seconds),State') self.assertContains(res, '%s\r\n' % hdr) diff --git a/openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv b/openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv index fd91477820..5f3bb906a0 100644 --- a/openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv +++ b/openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv @@ -1,7 +1,7 @@ {% load i18n %}{% trans "Usage Report For Period" %}:,{{ usage.start|date:"b. d Y" }},{{ usage.end|date:"b. d Y" }} {% trans "Project ID" %}:,{{ usage.project_id }} {% trans "Active Instances" %}:,{{ usage.summary.instances }} -{% trans "CPU-HRs Used" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }} +{% trans "Total VCPU Usage (Hours)" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }} {% trans "Total Active RAM (MB)" %}:,{{ usage.summary.memory_mb }} -{% trans "Total Disk Size" %}:,{{ usage.summary.local_gb }} -{% trans "Total Disk Usage" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }} +{% trans "Total Disk Size (GB)" %}:,{{ usage.summary.local_gb }} +{% trans "Total Disk Usage (Hours)" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }} diff --git a/openstack_dashboard/dashboards/project/overview/views.py b/openstack_dashboard/dashboards/project/overview/views.py index 122869f202..920c56296b 100644 --- a/openstack_dashboard/dashboards/project/overview/views.py +++ b/openstack_dashboard/dashboards/project/overview/views.py @@ -31,7 +31,7 @@ class ProjectUsageCsvRenderer(csvbase.BaseCsvResponse): columns = [_("Instance Name"), _("VCPUs"), _("RAM (MB)"), _("Disk (GB)"), _("Usage (Hours)"), - _("Uptime(Seconds)"), _("State")] + _("Uptime (Seconds)"), _("State")] def get_row_data(self): diff --git a/openstack_dashboard/usage/tables.py b/openstack_dashboard/usage/tables.py index acdcad8f85..4727fbb0ca 100644 --- a/openstack_dashboard/usage/tables.py +++ b/openstack_dashboard/usage/tables.py @@ -31,7 +31,8 @@ class CSVSummary(tables.LinkAction): class BaseUsageTable(tables.DataTable): vcpus = tables.Column('vcpus', verbose_name=_("VCPUs")) - disk = tables.Column('local_gb', verbose_name=_("Disk")) + disk = tables.Column('local_gb', verbose_name=_("Disk"), + filters=(sizeformat.diskgbformat,)) memory = tables.Column('memory_mb', verbose_name=_("RAM"), filters=(sizeformat.mbformat,),