openstack/nova
Code Issues Proposed changes

Merge "Fix simple_tenant_usage's handing of future end times"

Browse Source
This commit is contained in:
Jenkins 2012-09-05 22:09:22 +00:00 committed by Gerrit Code Review
commit 06dec8ec1e
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/contrib/simple_tenant_usage.py
View File

@ -218,6 +218,9 @@ class SimpleTenantUsageController(object):
authorize_list(context)
(period_start, period_stop, detailed) = self._get_datetime_range(req)
now = timeutils.utcnow()
if period_stop > now:
period_stop = now
usages = self._tenant_usages_for_period(context,
period_start,
period_stop,
@ -233,6 +236,9 @@ class SimpleTenantUsageController(object):
authorize_show(context, {'project_id': tenant_id})
(period_start, period_stop, ignore) = self._get_datetime_range(req)
now = timeutils.utcnow()
if period_stop > now:
period_stop = now
usage = self._tenant_usages_for_period(context,
period_start,
period_stop,

27
nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
View File

@ -41,8 +41,9 @@ ROOT_GB = 10
EPHEMERAL_GB = 20
MEMORY_MB = 1024
VCPUS = 2
STOP = timeutils.utcnow()
START = STOP - datetime.timedelta(hours=HOURS)
NOW = timeutils.utcnow()
START = NOW - datetime.timedelta(hours=HOURS)
STOP = NOW
def fake_instance_type_get(self, context, instance_type_id):
@ -93,10 +94,10 @@ class SimpleTenantUsageTest(test.TestCase):
'faketenant_1',
is_admin=False)
def test_verify_index(self):
def _test_verify_index(self, start, stop):
req = webob.Request.blank(
'/v2/faketenant_0/os-simple-tenant-usage?start=%s&end=%s' %
(START.isoformat(), STOP.isoformat()))
(start.isoformat(), stop.isoformat()))
req.method = "GET"
req.headers["content-type"] = "application/json"
@ -117,6 +118,20 @@ class SimpleTenantUsageTest(test.TestCase):
SERVERS * VCPUS * HOURS)
self.assertFalse(usages[i].get('server_usages'))
def test_verify_index(self):
self._test_verify_index(START, STOP)
def test_verify_index_futrue_end_time(self):
future = NOW + datetime.timedelta(hours=HOURS)
self._test_verify_index(START, future)
def test_verify_show(self):
self._test_verify_show(START, STOP)
def test_verify_show_futrue_end_time(self):
future = NOW + datetime.timedelta(hours=HOURS)
self._test_verify_show(START, future)
def _get_tenant_usages(self, detailed=''):
req = webob.Request.blank(
'/v2/faketenant_0/os-simple-tenant-usage?'
@ -149,12 +164,12 @@ class SimpleTenantUsageTest(test.TestCase):
for i in xrange(TENANTS):
self.assertEqual(usages[i].get('server_usages'), None)
def test_verify_show(self):
def _test_verify_show(self, start, stop):
tenant_id = 0
req = webob.Request.blank(
'/v2/faketenant_0/os-simple-tenant-usage/'
'faketenant_%s?start=%s&end=%s' %
(tenant_id, START.isoformat(), STOP.isoformat()))
(tenant_id, start.isoformat(), stop.isoformat()))
req.method = "GET"
req.headers["content-type"] = "application/json"