openstack
/
horizon
Code Issues Proposed changes

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
This commit is contained in:
Akihiro Motoki 2014-03-28 20:58:57 +09:00
parent d7f33e1fcb
commit ebf8a25eda
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/dashboards/admin/info/tables.py
View File

@ -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())

5
openstack_dashboard/dashboards/admin/projects/workflows.py
View File

@ -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"))