diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 17:52:29 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 17:52:29 -0400 |
| commit | 07eb6b50c8b7ba30a5923976b66108f136f8628e (patch) | |
| tree | 70654c9f35355382de581d982aae421fcc9c97fa /nova/api | |
| parent | 4a1db744cc812c29ebaac3180bf32fc033029513 (diff) | |
| parent | 9f39ff070b5500a0ccb9a6454995f97342254381 (diff) | |
| download | nova-07eb6b50c8b7ba30a5923976b66108f136f8628e.tar.gz nova-07eb6b50c8b7ba30a5923976b66108f136f8628e.tar.xz nova-07eb6b50c8b7ba30a5923976b66108f136f8628e.zip | |
merging trunk; resolving conflicts
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/images.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py index 21f1b2d3e..8983b2957 100644 --- a/nova/api/openstack/views/images.py +++ b/nova/api/openstack/views/images.py @@ -37,17 +37,18 @@ class ViewBuilder(object): def _format_status(self, image): """Update the status field to standardize format.""" status_mapping = { - 'pending': 'QUEUED', - 'decrypting': 'PREPARING', - 'untarring': 'SAVING', - 'available': 'ACTIVE', - 'killed': 'FAILED', + 'active': 'ACTIVE', + 'queued': 'SAVING', + 'saving': 'SAVING', + 'deleted': 'DELETED', + 'pending_delete': 'DELETED', + 'killed': 'ERROR', } try: - image['status'] = status_mapping[image['status']].upper() + image['status'] = status_mapping[image['status']] except KeyError: - image['status'] = image['status'].upper() + image['status'] = 'UNKNOWN' def _build_server(self, image, image_obj): """Indicates that you must use a ViewBuilder subclass.""" |