x/tuskar-ui
Code Issues Proposed changes

Add newline between rows of Admin usage.csv

Browse Source 
For some reason, we must also specify precision for vcpu hours
in this change. Adding the newline caused the default behavior
to change.

Fix bug 1073677

Change-Id: Id9a90e787de50f775ed17b15f185273cebba64e8
This commit is contained in:
Brian Waldon 2012-10-31 12:34:42 -07:00
parent 069c3f545a
commit 70ac5bd4a7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv
View File

@ -6,4 +6,5 @@ Total Disk Size:,{{ usage.summary.local_gb }}
Total Disk Usage:,{{ usage.summary.disk_gb_hours }} Total Disk Usage:,{{ usage.summary.disk_gb_hours }}
Tenant,VCPUs,RamMB,DiskGB,Usage(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 %}

Can't render this file because it contains an unexpected character in line 1 and column 46.

10
openstack_dashboard/dashboards/admin/overview/tests.py
View File

@ -82,17 +82,17 @@ class UsageViewTests(test.BaseAdminViewTests):
api.usage_list(IsA(http.HttpRequest), api.usage_list(IsA(http.HttpRequest),
datetime.datetime(now.year, now.month, 1, 0, 0, 0), datetime.datetime(now.year, now.month, 1, 0, 0, 0),
Func(usage.almost_now)) \ Func(usage.almost_now)) \
.AndReturn([usage_obj]) .AndReturn([usage_obj, usage_obj])
quotas.tenant_quota_usages(IsA(http.HttpRequest)).AndReturn(quota_data) quotas.tenant_quota_usages(IsA(http.HttpRequest)).AndReturn(quota_data)
self.mox.ReplayAll() self.mox.ReplayAll()
csv_url = reverse('horizon:admin:overview:index') + "?format=csv" csv_url = reverse('horizon:admin:overview:index') + "?format=csv"
res = self.client.get(csv_url) res = self.client.get(csv_url)
self.assertTemplateUsed(res, 'admin/overview/usage.csv') self.assertTemplateUsed(res, 'admin/overview/usage.csv')
self.assertTrue(isinstance(res.context['usage'], usage.GlobalUsage)) self.assertTrue(isinstance(res.context['usage'], usage.GlobalUsage))
self.assertContains(res, 'Tenant,VCPUs,RamMB,DiskGB,Usage(Hours)\n' hdr = 'Tenant,VCPUs,RamMB,DiskGB,Usage(Hours)'
'%s,%s,%s,%s,%f' % row = '%s,%s,%s,%s,%.2f' % (usage_obj.tenant_id,
(usage_obj.tenant_id,
usage_obj.vcpus, usage_obj.vcpus,
usage_obj.memory_mb, usage_obj.memory_mb,
usage_obj.disk_gb_hours, usage_obj.disk_gb_hours,
usage_obj.vcpu_hours)) usage_obj.vcpu_hours)
self.assertContains(res, '%s\n%s\n%s\n' % (hdr, row, row))