From ebf8a25edaa74bd85a7da58651ec2ac00f9d8aa3 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 28 Mar 2014 20:58:57 +0900 Subject: [PATCH] Make "Gigabytes" quotas description more meaningful "Gigabytes" quota entry comes from Cinder, but Horizon displays quotas from various projects and "Gigabytes" is hard to understand. This commit changes it to "Total Size of Volumes and Snapshots (GB)". From the same reason, "Snapshots" is renamed to "Volume Snapshots". LUKS Volume quotas are also renamed for consistency. Change-Id: I7289783b75d324980c0ca80b71835ab602efc354 Closes-Bug: #1298934 --- openstack_dashboard/dashboards/admin/info/tables.py | 9 +++++---- .../dashboards/admin/projects/workflows.py | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/info/tables.py b/openstack_dashboard/dashboards/admin/info/tables.py index 9efe023a55..6905d358ca 100644 --- a/openstack_dashboard/dashboards/admin/info/tables.py +++ b/openstack_dashboard/dashboards/admin/info/tables.py @@ -167,8 +167,8 @@ def get_quota_name(quota): 'instances': _('Instances'), 'injected_files': _('Injected Files'), 'volumes': _('Volumes'), - 'snapshots': _('Snapshots'), - 'gigabytes': _('Gigabytes'), + 'snapshots': _('Volume Snapshots'), + 'gigabytes': _('Total Size of Volumes and Snapshots (GB)'), 'ram': _('RAM (MB)'), 'floating_ips': _('Floating IPs'), 'security_groups': _('Security Groups'), @@ -176,8 +176,9 @@ def get_quota_name(quota): 'key_pairs': _('Key Pairs'), 'fixed_ips': _('Fixed IPs'), 'volumes_volume_luks': _('LUKS Volumes'), - 'snapshots_volume_luks': _('LUKS Volumes Snapshots'), - 'gigabytes_volume_luks': _('LUKS Volumes Size (GB)'), + 'snapshots_volume_luks': _('LUKS Volume Snapshots'), + 'gigabytes_volume_luks': + _('Total Size of LUKS Volumes and Snapshots (GB)'), 'dm-crypt': _('dm-crypt'), } return QUOTA_NAMES.get(quota.name, quota.name.replace("_", " ").title()) diff --git a/openstack_dashboard/dashboards/admin/projects/workflows.py b/openstack_dashboard/dashboards/admin/projects/workflows.py index 9102e31524..e0b7120879 100644 --- a/openstack_dashboard/dashboards/admin/projects/workflows.py +++ b/openstack_dashboard/dashboards/admin/projects/workflows.py @@ -53,8 +53,9 @@ class UpdateProjectQuotaAction(workflows.Action): injected_file_content_bytes = forms.IntegerField(min_value=-1, label=ifcb_label) volumes = forms.IntegerField(min_value=-1, label=_("Volumes")) - snapshots = forms.IntegerField(min_value=-1, label=_("Snapshots")) - gigabytes = forms.IntegerField(min_value=-1, label=_("Gigabytes")) + snapshots = forms.IntegerField(min_value=-1, label=_("Volume Snapshots")) + gigabytes = forms.IntegerField( + min_value=-1, label=_("Total Size of Volumes and Snapshots (GB)")) ram = forms.IntegerField(min_value=-1, label=_("RAM (MB)")) floating_ips = forms.IntegerField(min_value=-1, label=_("Floating IPs")) fixed_ips = forms.IntegerField(min_value=-1, label=_("Fixed IPs"))