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:
3c3d13f
)
add geni_expires to sliver_stauts result
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 17 Jul 2012 14:38:55 +0000
(10:38 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 17 Jul 2012 14:38:55 +0000
(10:38 -0400)
sfa/openstack/nova_driver.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/nova_driver.py
b/sfa/openstack/nova_driver.py
index
638811e
..
ee25491
100644
(file)
--- a/
sfa/openstack/nova_driver.py
+++ b/
sfa/openstack/nova_driver.py
@@
-395,14
+395,17
@@
class NovaDriver(Driver):
if instances:
top_level_status = 'ready'
result['geni_urn'] = slice_urn
if instances:
top_level_status = 'ready'
result['geni_urn'] = slice_urn
- result['plos_login'] = 'root'
+ result['plos_login'] = 'root'
+ # do we need real dates here?
result['plos_expires'] = None
result['plos_expires'] = None
+ result['geni_expires'] = None
resources = []
for instance in instances:
res = {}
# instances are accessed by ip, not hostname. We need to report the ip
# somewhere so users know where to ssh to.
resources = []
for instance in instances:
res = {}
# instances are accessed by ip, not hostname. We need to report the ip
# somewhere so users know where to ssh to.
+ res['geni_expires'] = None
res['plos_hostname'] = instance.hostname
res['plos_created_at'] = datetime_to_string(utcparse(instance.created_at))
res['plos_boot_state'] = instance.vm_state
res['plos_hostname'] = instance.hostname
res['plos_created_at'] = datetime_to_string(utcparse(instance.created_at))
res['plos_boot_state'] = instance.vm_state