From bd1641c4823f8f94ffd74c18e4fea439992e1b6e Mon Sep 17 00:00:00 2001 From: tinytmy Date: Tue, 3 Feb 2015 11:35:55 +0800 Subject: [PATCH] unite the property of usage test unite the property of usage test and fix local_gb instead of disk_gb_hours Change-Id: I049160f5a0665f03685c6c5a5f10fbb7b398d9c4 Closes-bug:#1416987 --- openstack_dashboard/dashboards/admin/overview/tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index 7873d65b7a..84704c6b3e 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -115,10 +115,10 @@ class UsageViewTests(test.BaseAdminViewTests): %.2f ''' % (usage_list[0].vcpus, - sizeformat.diskgbformat(usage_list[0].disk_gb_hours), + sizeformat.diskgbformat(usage_list[0].local_gb), sizeformat.mb_float_format(usage_list[0].memory_mb), usage_list[0].vcpu_hours, - usage_list[0].total_local_gb_usage, + usage_list[0].disk_gb_hours, usage_list[0].memory_mb_hours) ) @@ -134,10 +134,10 @@ class UsageViewTests(test.BaseAdminViewTests): %.2f ''' % (usage_list[1].vcpus, - sizeformat.diskgbformat(usage_list[1].disk_gb_hours), + sizeformat.diskgbformat(usage_list[1].local_gb), sizeformat.mb_float_format(usage_list[1].memory_mb), usage_list[1].vcpu_hours, - usage_list[1].total_local_gb_usage, + usage_list[1].disk_gb_hours, usage_list[1].memory_mb_hours) )