From: Tony Mack Date: Thu, 30 Aug 2012 19:10:43 +0000 (-0400) Subject: fix aggregate status X-Git-Tag: sfa-2.1-14~25^2~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=e81581343ef38c8b1644becb432c3f38eef56357;p=sfa.git fix aggregate status --- diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index fe405b32..32dd0440 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -399,9 +399,7 @@ class NovaDriver(Driver): raise SliverDoesNotExist("You have not allocated any slivers here") result = {} - top_level_status = 'unknown' - if instances: - top_level_status = 'ready' + top_level_status = 'ready' result['geni_urn'] = slice_urn result['plos_login'] = 'root' # do we need real dates here? @@ -426,6 +424,7 @@ class NovaDriver(Driver): else: res['boot_state'] = 'unknown' res['geni_status'] = 'unknown' + top_level_status = 'unknown' resources.append(res) result['geni_status'] = top_level_status