git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into senslab2
[sfa.git]
/
sfa
/
openstack
/
nova_driver.py
diff --git
a/sfa/openstack/nova_driver.py
b/sfa/openstack/nova_driver.py
index
f8aa84e
..
638811e
100644
(file)
--- a/
sfa/openstack/nova_driver.py
+++ b/
sfa/openstack/nova_driver.py
@@
-412,9
+412,11
@@
class NovaDriver(Driver):
res['geni_urn'] = sliver_id
if instance.vm_state == 'running':
res['geni_urn'] = sliver_id
if instance.vm_state == 'running':
- res['boot_state'] = 'ready';
+ res['boot_state'] = 'ready'
+ res['geni_status'] = 'ready'
else:
res['boot_state'] = 'unknown'
else:
res['boot_state'] = 'unknown'
+ res['geni_status'] = 'unknown'
resources.append(res)
result['geni_status'] = top_level_status
resources.append(res)
result['geni_status'] = top_level_status