diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-25 23:01:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-25 23:01:37 +0000 |
| commit | 9e9d271fe876b0231e947a14d8c2cee8ecc706da (patch) | |
| tree | 7440688dba469880dcf2babab10af9c100639b2a | |
| parent | 07eebdfdef069945d04cf6ca1bb45a68ea32766b (diff) | |
| parent | 093c147a14059c60e6b787589398ee7d8f9792d9 (diff) | |
Merge "Fix uptime calculation in simple_usage"
| -rw-r--r-- | nova/api/openstack/compute/contrib/simple_tenant_usage.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py | 3 |
2 files changed, 4 insertions, 1 deletions
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): |