diff --git a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv index 57f50b99a..b13fcc023 100644 --- a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv +++ b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv @@ -6,4 +6,5 @@ Total Disk Size:,{{ usage.summary.local_gb }} Total Disk Usage:,{{ usage.summary.disk_gb_hours }} Tenant,VCPUs,RamMB,DiskGB,Usage(Hours) -{% for u in usage.usage_list %}{{ u.tenant_id|addslashes }},{{ u.vcpus|addslashes }},{{ u.memory_mb|addslashes }},{{ u.local_gb|addslashes }},{{ u.vcpu_hours}}{% endfor %} +{% for u in usage.usage_list %}{{ u.tenant_id|addslashes }},{{ u.vcpus|addslashes }},{{ u.memory_mb|addslashes }},{{u.local_gb|addslashes }},{{ u.vcpu_hours|floatformat:2}} +{% endfor %} diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index c3f06df3b..dc9b380e2 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -82,17 +82,17 @@ class UsageViewTests(test.BaseAdminViewTests): api.usage_list(IsA(http.HttpRequest), datetime.datetime(now.year, now.month, 1, 0, 0, 0), Func(usage.almost_now)) \ - .AndReturn([usage_obj]) + .AndReturn([usage_obj, usage_obj]) quotas.tenant_quota_usages(IsA(http.HttpRequest)).AndReturn(quota_data) self.mox.ReplayAll() csv_url = reverse('horizon:admin:overview:index') + "?format=csv" res = self.client.get(csv_url) self.assertTemplateUsed(res, 'admin/overview/usage.csv') self.assertTrue(isinstance(res.context['usage'], usage.GlobalUsage)) - self.assertContains(res, 'Tenant,VCPUs,RamMB,DiskGB,Usage(Hours)\n' - '%s,%s,%s,%s,%f' % - (usage_obj.tenant_id, - usage_obj.vcpus, - usage_obj.memory_mb, - usage_obj.disk_gb_hours, - usage_obj.vcpu_hours)) + hdr = 'Tenant,VCPUs,RamMB,DiskGB,Usage(Hours)' + row = '%s,%s,%s,%s,%.2f' % (usage_obj.tenant_id, + usage_obj.vcpus, + usage_obj.memory_mb, + usage_obj.disk_gb_hours, + usage_obj.vcpu_hours) + self.assertContains(res, '%s\n%s\n%s\n' % (hdr, row, row))