add geni_expires to sliver_stauts result

[sfa.git] / sfa / openstack / nova_driver.py

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 98a6723..ee25491 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -118,7 +118,8 @@ class NovaDriver(Driver):
             self.shell.auth_manager.roles.add_user_role(user, slice_tenant, 'user')
         keys = sfa_records.get('keys', [])
         for key in keys:
-            self.shell.nova_client.keypairs.create(name, key)
+            keyname = OSXrn(xrn=hrn, type='user').get_slicename()
+            self.shell.nova_client.keypairs.create(keyname, key)
         return user
 
     def register_authority(self, sfa_record, hrn):
@@ -394,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
@@ -411,9 +415,11 @@ class NovaDriver(Driver):
             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'  
+                res['geni_status'] = 'unknown'
             resources.append(res)
             
         result['geni_status'] = top_level_status