Merge "Allow shelving instance for SHUTOFF/PAUSED/SUSPENDED statuses" into stable/ocata
This commit is contained in:
commit
d011d85926
|
@ -50,6 +50,7 @@ LOG = logging.getLogger(__name__)
|
||||||
ACTIVE_STATES = ("ACTIVE",)
|
ACTIVE_STATES = ("ACTIVE",)
|
||||||
VOLUME_ATTACH_READY_STATES = ("ACTIVE", "SHUTOFF")
|
VOLUME_ATTACH_READY_STATES = ("ACTIVE", "SHUTOFF")
|
||||||
SNAPSHOT_READY_STATES = ("ACTIVE", "SHUTOFF", "PAUSED", "SUSPENDED")
|
SNAPSHOT_READY_STATES = ("ACTIVE", "SHUTOFF", "PAUSED", "SUSPENDED")
|
||||||
|
SHELVE_READY_STATES = ("ACTIVE", "SHUTOFF", "PAUSED", "SUSPENDED")
|
||||||
|
|
||||||
POWER_STATES = {
|
POWER_STATES = {
|
||||||
0: "NO STATE",
|
0: "NO STATE",
|
||||||
|
@ -361,7 +362,7 @@ class ToggleShelve(tables.BatchAction):
|
||||||
target={'project_id': getattr(instance, 'tenant_id', None)})
|
target={'project_id': getattr(instance, 'tenant_id', None)})
|
||||||
|
|
||||||
return (has_permission
|
return (has_permission
|
||||||
and (instance.status in ACTIVE_STATES or self.shelved)
|
and (instance.status in SHELVE_READY_STATES or self.shelved)
|
||||||
and not is_deleting(instance))
|
and not is_deleting(instance))
|
||||||
|
|
||||||
def action(self, request, obj_id):
|
def action(self, request, obj_id):
|
||||||
|
|
Loading…
Reference in New Issue