From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 17 Jul 2012 14:38:55 +0000 (-0400)
Subject: add geni_expires to sliver_stauts result
X-Git-Tag: sfa-2.1-14~107
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4cee7cc458f976344db58de1c572a18a9d30cf40;p=sfa.git

add geni_expires to sliver_stauts result
---

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 638811e9..ee254916 100644
--- 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
-        result['plos_login'] = 'root' 
+        result['plos_login'] = 'root'
+        # do we need real dates here? 
         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.     
+            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