a4e583cffb
Added a csv writer using the 'csv' library to format properly exported data - escaping, encoding etc. Added a HttpResponse-based class to handle csv generation Added translation for the CSV columns and template. Improved consistency for exported data - now passing project name instead of project id for csv export. Also added both project name/id in the header of a project usage export. Fix bug #1158383 Renamed few occurencies of 'tenant' to project. Also added a new 'project' in nova_data.py, which required some refactoring of few tests, that didn't consider the current project for project-based calls. Note: I've added a StreamingHttpResponse example, which is introduced in Django 1.5+ and being advised in the ticket. However, my opinion is that at the moment we don't need this - it is too complicated for the current usage. Change-Id: Ic00626b273921fa5c6c89704b3a9e08b252aaeb0
102 lines
4.6 KiB
Python
102 lines
4.6 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Copyright 2012 Nebula, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import datetime
|
|
|
|
from django import http
|
|
from django.core.urlresolvers import reverse
|
|
from django.utils import timezone
|
|
|
|
from mox import IsA, Func
|
|
|
|
from horizon.templatetags.sizeformat import mbformat
|
|
|
|
from openstack_dashboard import api
|
|
from openstack_dashboard import usage
|
|
from openstack_dashboard.test import helpers as test
|
|
from openstack_dashboard.usage import quotas
|
|
|
|
|
|
INDEX_URL = reverse('horizon:project:overview:index')
|
|
|
|
|
|
class UsageViewTests(test.BaseAdminViewTests):
|
|
|
|
@test.create_stubs({api.nova: ('usage_list',),
|
|
quotas: ('tenant_quota_usages',),
|
|
api.keystone: ('tenant_list',)})
|
|
def test_usage(self):
|
|
now = timezone.now()
|
|
usage_obj = api.nova.NovaUsage(self.usages.first())
|
|
quota_data = self.quota_usages.first()
|
|
api.keystone.tenant_list(IsA(http.HttpRequest)) \
|
|
.AndReturn(self.tenants.list())
|
|
api.nova.usage_list(IsA(http.HttpRequest),
|
|
datetime.datetime(now.year, now.month, 1, 0, 0, 0),
|
|
Func(usage.almost_now)) \
|
|
.AndReturn([usage_obj])
|
|
quotas.tenant_quota_usages(IsA(http.HttpRequest)).AndReturn(quota_data)
|
|
self.mox.ReplayAll()
|
|
res = self.client.get(reverse('horizon:admin:overview:index'))
|
|
self.assertTemplateUsed(res, 'admin/overview/usage.html')
|
|
self.assertTrue(isinstance(res.context['usage'], usage.GlobalUsage))
|
|
self.assertContains(res,
|
|
'<td class="sortable normal_column">test_tenant'
|
|
'</td>'
|
|
'<td class="sortable normal_column">%s</td>'
|
|
'<td class="sortable normal_column">%s</td>'
|
|
'<td class="sortable normal_column">%s</td>'
|
|
'<td class="sortable normal_column">%.2f</td>'
|
|
'<td class="sortable normal_column">%.2f</td>' %
|
|
(usage_obj.vcpus,
|
|
usage_obj.disk_gb_hours,
|
|
mbformat(usage_obj.memory_mb),
|
|
usage_obj.vcpu_hours,
|
|
usage_obj.total_local_gb_usage))
|
|
|
|
@test.create_stubs({api.nova: ('usage_list',),
|
|
quotas: ('tenant_quota_usages',),
|
|
api.keystone: ('tenant_list',)})
|
|
def test_usage_csv(self):
|
|
now = timezone.now()
|
|
usage_obj = [api.nova.NovaUsage(u) for u in self.usages.list()]
|
|
quota_data = self.quota_usages.first()
|
|
api.keystone.tenant_list(IsA(http.HttpRequest)) \
|
|
.AndReturn(self.tenants.list())
|
|
api.nova.usage_list(IsA(http.HttpRequest),
|
|
datetime.datetime(now.year, now.month, 1, 0, 0, 0),
|
|
Func(usage.almost_now)) \
|
|
.AndReturn(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))
|
|
hdr = 'Project Name,VCPUs,Ram (MB),Disk (GB),Usage (Hours)'
|
|
self.assertContains(res, '%s\r\n' % (hdr))
|
|
for obj in usage_obj:
|
|
row = u'{0},{1},{2},{3},{4:.2f}\r\n'.format(obj.project_name,
|
|
obj.vcpus,
|
|
obj.memory_mb,
|
|
obj.disk_gb_hours,
|
|
obj.vcpu_hours)
|
|
self.assertContains(res, row)
|