git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f638d34
)
fix aggregate status
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 30 Aug 2012 19:10:43 +0000
(15:10 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 30 Aug 2012 19:11:35 +0000
(15:11 -0400)
sfa/openstack/nova_driver.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/nova_driver.py
b/sfa/openstack/nova_driver.py
index
fe405b3
..
32dd044
100644
(file)
--- 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