diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 16:27:58 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 16:27:58 -0400 |
| commit | 8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb (patch) | |
| tree | 31bf1b04ae967021a76c0e4f2c3389eee5682b3a /nova/api | |
| parent | 89d818c621cf257495ceb07687be04152423086a (diff) | |
| parent | 65f05c403e852cebeb7b052e36bbd129aedf4d4f (diff) | |
merging trunk; resolving conflicts; fixing issue with ApiError test failing since r1043
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 0abb79f49..0be468edc 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -63,8 +63,8 @@ class ViewBuilder(object): power_state.BLOCKED: 'ACTIVE', power_state.SUSPENDED: 'SUSPENDED', power_state.PAUSED: 'PAUSED', - power_state.SHUTDOWN: 'ACTIVE', - power_state.SHUTOFF: 'ACTIVE', + power_state.SHUTDOWN: 'SHUTDOWN', + power_state.SHUTOFF: 'SHUTOFF', power_state.CRASHED: 'ERROR', power_state.FAILED: 'ERROR', power_state.BUILDING: 'BUILD', |