From e0cf82323ab19bbcbad88aa75045b3e55692f071 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Wed, 14 Sep 2011 23:11:03 +0000 Subject: Adding progress --- nova/api/openstack/views/servers.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 473dc9e7e..6640be810 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -137,11 +137,10 @@ 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'): + 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 "" -- cgit From 10f7128079942b14e7627fa34b93e2e0ae05058f Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Fri, 16 Sep 2011 18:06:27 +0000 Subject: Adding migration progress --- nova/api/openstack/views/servers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 6640be810..925668e56 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -139,7 +139,8 @@ class ViewBuilderV11(ViewBuilder): response['server']['updated'] = utils.isotime(inst['updated_at']) status = response['server'].get('status') - if status in ('ACTIVE', 'BUILD', 'REBUILD'): + 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 "" -- cgit