summaryrefslogtreecommitdiff
path: root/glance/domain/__init__.py
diff options
context:
space:
mode:
authorBrian Rosmaita <rosmaita.fossdev@gmail.com>2017-08-15 19:14:22 -0400
committerBrian Rosmaita <rosmaita.fossdev@gmail.com>2017-08-15 19:17:09 -0400
commite17a349306e1a4ae287ce69cae0a545acfcf6b27 (patch)
tree6602d53714616a5770c9ff06779235ea7c4cb689 /glance/domain/__init__.py
parentd009e188a238d7c6ddac55a13fb64adc7db9a79a (diff)
downloadglance-e17a349306e1a4ae287ce69cae0a545acfcf6b27.tar.gz
Fix 500 error from image-stage call
Adds a RequestDeserializer for the stage and adjusts the image status transitions so that they can handle the 'uploading' status of an image with data in the stage. Closes-bug: #1710958 Change-Id: I6f1cfe44a01542bc93a43cbd518956686adb366d
Diffstat (limited to 'glance/domain/__init__.py')
-rw-r--r--glance/domain/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
index c6d5ded20..7e78f9bba 100644
--- a/glance/domain/__init__.py
+++ b/glance/domain/__init__.py
@@ -101,8 +101,9 @@ class Image(object):
# NOTE(flwang): In v2, we are deprecating the 'killed' status, so it's
# allowed to restore image from 'saving' to 'queued' so that upload
# can be retried.
- 'queued': ('saving', 'importing', 'active', 'deleted'),
+ 'queued': ('saving', 'uploading', 'importing', 'active', 'deleted'),
'saving': ('active', 'killed', 'deleted', 'queued'),
+ 'uploading': ('importing', 'queued', 'deleted'),
'importing': ('active', 'deleted', 'queued'),
'active': ('pending_delete', 'deleted', 'deactivated'),
'killed': ('deleted',),