From 3ab63779c147f2147428f9ffe9e2683feb6bc4cd Mon Sep 17 00:00:00 2001 From: Andy Chong Date: Thu, 15 Mar 2012 16:03:23 +0800 Subject: [PATCH] allow errored volume to be deleted since nova api allows it now * fixes bug 955704 * related nova changes at https://review.openstack.org/5342 Change-Id: I10aa598a3bfbc63bade757972c09db43377a737b --- .../nova/instances_and_volumes/volumes/tables.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py index 5d0decb1f9e..ed4618910c8 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py @@ -43,15 +43,6 @@ def allowed(self, request, volume=None): return volume.status in DELETABLE_STATES return True - def update(self, request, volume=None): - # TODO(gabriel): This can be removed once the Nova Volume API supports - # deleting volumes in error states. - if volume and getattr(volume, "status", None) == "error": - self.classes += ("disabled",) - self.attrs['disabled'] = 'disabled' - self.attrs['title'] = _("Volumes in error states cannot be " - "deleted via the Nova API.") - class CreateVolume(tables.LinkAction): name = "create"