← Back to branch summary

~rackspace-titan/nova/instance_states

« back to all changes in this revision

Viewing changes to nova/api/ec2/cloud.py

  • Committer: Brian Lamar
  • Date: 2011-08-25 21:27:10 UTC
  • Revision ID: brian.lamar@rackspace.com-20110825212710-v2wbvegiuze5p1g6
review feedback

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/cloud.py
92
92
    vm_states.STOPPED: 'stopped',
93
93
    vm_states.MIGRATING: 'migrate',
94
94
    vm_states.RESIZING: 'resize',
95
 
    vm_states.VERIFY_RESIZE: 'verify_resize',
96
95
    vm_states.PAUSED: 'pause',
97
96
    vm_states.SUSPENDED: 'suspend',
98
97
    vm_states.RESCUED: 'rescue',
101
100
 
102
101
def state_description_from_vm_state(vm_state):
103
102
    """Map the vm state to the server status string"""
104
 
    return _STATE_DESCRIPTION_MAP[vm_state]
 
103
    return _STATE_DESCRIPTION_MAP.get(vm_state, vm_state)
105
104
 
106
105
 
107
106
# TODO(yamahata): hypervisor dependent default device name