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
This commit is contained in:
tinytmy 2015-02-03 11:35:55 +08:00
parent 094cb67846
commit bd1641c482

View File

@ -115,10 +115,10 @@ class UsageViewTests(test.BaseAdminViewTests):
<td class="sortable normal_column">%.2f</td>
</tr>
''' % (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):
<td class="sortable normal_column">%.2f</td>
</tr>
''' % (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)
)