From 2839f3b130cacd9ec81be3f09331fd3d9effd3fd Mon Sep 17 00:00:00 2001
From: Cindy Lu <clu@us.ibm.com>
Date: Mon, 26 Jan 2015 14:43:40 -0800
Subject: [PATCH] Add Unit column to Usage Report table

Change-Id: I8f96195d4fce2d64011e6ef71c8d70db2c9de877
Closes-Bug: #1411066
---
 .../dashboards/admin/metering/tables.py                |  1 +
 openstack_dashboard/dashboards/admin/metering/tabs.py  |  3 ++-
 openstack_dashboard/dashboards/admin/metering/views.py | 10 ++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/openstack_dashboard/dashboards/admin/metering/tables.py b/openstack_dashboard/dashboards/admin/metering/tables.py
index 583a44b092..14d497419c 100644
--- a/openstack_dashboard/dashboards/admin/metering/tables.py
+++ b/openstack_dashboard/dashboards/admin/metering/tables.py
@@ -46,6 +46,7 @@ class ReportTable(tables.DataTable):
                          filters=[show_date])
     value = tables.Column('value', verbose_name=_('Value (Avg)'),
                           filters=[humanize.intcomma])
+    unit = tables.Column('unit', verbose_name=_('Unit'))
 
     def get_object_id(self, obj):
         return "%s-%s-%s" % (obj['project'], obj['service'], obj['meter'])
diff --git a/openstack_dashboard/dashboards/admin/metering/tabs.py b/openstack_dashboard/dashboards/admin/metering/tabs.py
index eafe9d1251..f921779516 100644
--- a/openstack_dashboard/dashboards/admin/metering/tabs.py
+++ b/openstack_dashboard/dashboards/admin/metering/tabs.py
@@ -106,7 +106,8 @@ class UsageReportTab(tabs.TableTab):
                                "description": meter.description,
                                "service": service,
                                "time": value._apiresource.period_end,
-                               "value": value._apiresource.avg}
+                               "value": value._apiresource.avg,
+                               "unit": meter.unit}
                         report_rows.append(row)
         return report_rows
 
diff --git a/openstack_dashboard/dashboards/admin/metering/views.py b/openstack_dashboard/dashboards/admin/metering/views.py
index 4cfbf14ba2..665893f3c8 100644
--- a/openstack_dashboard/dashboards/admin/metering/views.py
+++ b/openstack_dashboard/dashboards/admin/metering/views.py
@@ -196,7 +196,7 @@ class CsvReportView(django.views.generic.View):
 class ReportCsvRenderer(csvbase.BaseCsvResponse):
 
     columns = [_("Project Name"), _("Meter"), _("Description"),
-               _("Service"), _("Time"), _("Value (Avg)")]
+               _("Service"), _("Time"), _("Value (Avg)"), _("Unit")]
 
     def get_row_data(self):
 
@@ -207,7 +207,8 @@ class ReportCsvRenderer(csvbase.BaseCsvResponse):
                        u["description"],
                        u["service"],
                        u["time"],
-                       u["value"])
+                       u["value"],
+                       u["unit"])
 
 
 def load_report_data(request):
@@ -230,7 +231,7 @@ def load_report_data(request):
                                                            date_to,
                                                            date_options)
     except Exception:
-        exceptions.handle(request, _('Dates cannot be recognised.'))
+        exceptions.handle(request, _('Dates cannot be recognized.'))
     try:
         project_aggregates = utils_metering.ProjectAggregatesQuery(request,
                                                                    date_from,
@@ -256,7 +257,8 @@ def load_report_data(request):
                            "description": meter.description,
                            "service": service,
                            "time": value._apiresource.period_end,
-                           "value": value._apiresource.avg}
+                           "value": value._apiresource.avg,
+                           "unit": meter.unit}
                     if r.id not in project_rows:
                         project_rows[r.id] = [row]
                     else: