From 093c147a14059c60e6b787589398ee7d8f9792d9 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Wed, 25 Jan 2012 12:30:09 -0800 Subject: Fix uptime calculation in simple_usage * Fixes bug 921807 Change-Id: Ie6460adb95ef3b9cb0473023816c255aac707e99 --- nova/api/openstack/compute/contrib/simple_tenant_usage.py | 2 +- nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index 8e4201546..576f37fd8 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -159,7 +159,7 @@ class SimpleTenantUsageController(object): else: delta = now - info['started_at'] - info['uptime'] = delta.days * 24 * 60 + delta.seconds + info['uptime'] = delta.days * 24 * 3600 + delta.seconds if not info['tenant_id'] in rval: summary = {} diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index 812aac297..60ec7b8bb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -162,6 +162,9 @@ class SimpleTenantUsageTest(test.TestCase): servers = usage['server_usages'] self.assertEqual(len(usage['server_usages']), SERVERS) for j in xrange(SERVERS): + delta = STOP - START + uptime = delta.days * 24 * 3600 + delta.seconds + self.assertEqual(int(servers[j]['uptime']), uptime) self.assertEqual(int(servers[j]['hours']), HOURS) def test_verify_show_cant_view_other_tenant(self): -- cgit