summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry GUO <guo1017138@163.com>2018-05-10 08:09:58 +0000
committerGUO Larry <guo1017138@163.com>2018-06-05 05:25:17 +0000
commitb9f0afe73d5120b3467ba407ad2dc33033b5747e (patch)
tree5b41364315b974fb9a011173fad699f6e98851df
parentb7d890bb3cebd87b78d81fe94d3cbd0c5b54c937 (diff)
downloadhorizon-b9f0afe73d5120b3467ba407ad2dc33033b5747e.tar.gz
Add reserved status key word to horizon
Horizon don't have related change which align with the change in https://review.openstack.org/#/c/330285. With this fix, horizon can work as expected Change-Id: I5940c662a0bec2beaf4863e07f7244311ba51212 Closes-Bug: #1770326 Signed-off-by: GUO Larry <guo1017138@163.com> (cherry picked from commit 4776428cb69c57408745f75bd5c24228e8bdea44)
-rw-r--r--openstack_dashboard/dashboards/admin/volumes/forms.py2
-rw-r--r--openstack_dashboard/dashboards/project/volumes/tables.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/admin/volumes/forms.py b/openstack_dashboard/dashboards/admin/volumes/forms.py
index bf1ae25bb..08741f8e3 100644
--- a/openstack_dashboard/dashboards/admin/volumes/forms.py
+++ b/openstack_dashboard/dashboards/admin/volumes/forms.py
@@ -36,7 +36,7 @@ from openstack_dashboard.dashboards.project.volumes.tables \
# This set of states was pulled from cinder's admin_actions.py
SETTABLE_STATUSES = (
'attaching', 'available', 'creating', 'deleting', 'detaching', 'error',
- 'error_deleting', 'in-use', 'maintenance')
+ 'error_deleting', 'in-use', 'maintenance', 'reserved')
STATUS_CHOICES = tuple(
status for status in volumes_table.STATUS_DISPLAY_CHOICES
if status[0] in SETTABLE_STATUSES
diff --git a/openstack_dashboard/dashboards/project/volumes/tables.py b/openstack_dashboard/dashboards/project/volumes/tables.py
index d57cf37e4..2530f15bd 100644
--- a/openstack_dashboard/dashboards/project/volumes/tables.py
+++ b/openstack_dashboard/dashboards/project/volumes/tables.py
@@ -448,6 +448,8 @@ class VolumesTableBase(tables.DataTable):
u"Error Restoring")),
("maintenance", pgettext_lazy("Current status of a Volume",
u"Maintenance")),
+ ("reserved", pgettext_lazy("Current status of a Volume",
+ u"Reserved")),
)
name = tables.Column("name",
verbose_name=_("Name"),