summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/servers.py10
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 ""