diff options
| author | Rick Harris <rconradharris@gmail.com> | 2011-09-21 17:50:02 -0500 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2011-09-21 17:50:02 -0500 |
| commit | b1daaa0b216d341c69421e4d9666e73860eec68c (patch) | |
| tree | 8bf79da32357b52c7a6f1f57eb5f99cf49504177 /nova/api | |
| parent | 57a67cf27a51e6849bff6236f896ecbee6345250 (diff) | |
| parent | d865a2a97c013a811c2c6baad00fa1eb95406c8d (diff) | |
Merging trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 473dc9e7e..925668e56 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -137,11 +137,11 @@ class ViewBuilderV11(ViewBuilder): response = super(ViewBuilderV11, self)._build_detail(inst) response['server']['created'] = utils.isotime(inst['created_at']) response['server']['updated'] = utils.isotime(inst['updated_at']) - if 'status' in response['server']: - if response['server']['status'] == "ACTIVE": - response['server']['progress'] = 100 - elif response['server']['status'] == "BUILD": - response['server']['progress'] = 0 + + status = response['server'].get('status') + if status in ('ACTIVE', 'BUILD', 'REBUILD', 'RESIZE', + 'VERIFY_RESIZE'): + response['server']['progress'] = inst['progress'] or 0 response['server']['accessIPv4'] = inst.get('access_ip_v4') or "" response['server']['accessIPv6'] = inst.get('access_ip_v6') or "" |