diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-08-22 11:59:08 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-08-22 11:59:08 -0400 |
| commit | d60f813201df345507ce0aca7bed0f8b719aabfe (patch) | |
| tree | daeb7198132388f4174f82b3faab89a582eb7a11 /nova/api | |
| parent | a450c0f3bcc93fe3ec74939e49b109cb02624913 (diff) | |
| download | nova-d60f813201df345507ce0aca7bed0f8b719aabfe.tar.gz nova-d60f813201df345507ce0aca7bed0f8b719aabfe.tar.xz nova-d60f813201df345507ce0aca7bed0f8b719aabfe.zip | |
Fixes/updates to make test_cloud pass.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b7c7d2e12..8bddf3032 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -82,6 +82,7 @@ def _gen_key(context, user_id, key_name): # EC2 API: Valid Values: # pending | running | shutting-down | terminated | stopping | stopped _STATE_DESCRIPTION_MAP = { + None: 'pending', vm_states.ACTIVE: 'running', vm_states.BUILD: 'pending', vm_states.REBUILD: 'pending', |