Merge branch 'master' into sqlalchemy

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

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 404021b..1d3eff3 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -18,6 +18,7 @@ from sfa.rspecs.rspec import RSpec
 # the driver interface, mostly provides default behaviours
 from sfa.managers.driver import Driver
 from sfa.openstack.nova_shell import NovaShell
+from sfa.openstack.euca_shell import EucaShell
 from sfa.openstack.osaggregate import OSAggregate
 from sfa.plc.plslices import PlSlices
 from sfa.util.osxrn import OSXrn
@@ -43,6 +44,7 @@ class NovaDriver (Driver):
     def __init__ (self, config):
         Driver.__init__ (self, config)
         self.shell = NovaShell (config)
+        self.euca_shell = EucaShell(config)
         self.cache=None
         if config.SFA_AGGREGATE_CACHING:
             if NovaDriver.cache is None:
@@ -244,49 +246,37 @@ class NovaDriver (Driver):
     
     def sliver_status (self, slice_urn, slice_hrn):
         # find out where this slice is currently running
-        slicename = hrn_to_pl_slicename(slice_hrn)
-        
-        slices = self.shell.GetSlices([slicename], ['slice_id', 'node_ids','person_ids','name','expires'])
-        if len(slices) == 0:        
-            raise SliverDoesNotExist("%s (used %s as slicename internally)" % (slice_hrn, slicename))
-        slice = slices[0]
-        
-        # report about the local nodes only
-        nodes = self.shell.GetNodes({'node_id':slice['node_ids'],'peer_id':None},
-                              ['node_id', 'hostname', 'site_id', 'boot_state', 'last_contact'])
-
-        if len(nodes) == 0:
+        project_name = Xrn(slice_urn).get_leaf()
+        project = self.shell.auth_manager.get_project(project_name)
+        instances = self.shell.db.instance_get_all_by_project(project_name)
+        if len(instances) == 0:
             raise SliverDoesNotExist("You have not allocated any slivers here") 
-
-        site_ids = [node['site_id'] for node in nodes]
-    
+        
         result = {}
         top_level_status = 'unknown'
-        if nodes:
+        if instances:
             top_level_status = 'ready'
         result['geni_urn'] = slice_urn
-        result['pl_login'] = slice['name']
-        result['pl_expires'] = datetime_to_string(utcparse(slice['expires']))
+        result['plos_login'] = 'root' 
+        result['plos_expires'] = None
         
         resources = []
-        for node in nodes:
+        for instance in instances:
             res = {}
-            res['pl_hostname'] = node['hostname']
-            res['pl_boot_state'] = node['boot_state']
-            res['pl_last_contact'] = node['last_contact']
-            if node['last_contact'] is not None:
-                
-                res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact']))
-            sliver_id = urn_to_sliver_id(slice_urn, slice['slice_id'], node['node_id']) 
+            # instances are accessed by ip, not hostname. We need to report the ip
+            # somewhere so users know where to ssh to.     
+            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_sliver_type'] = instance.instance_type.name 
+            sliver_id =  Xrn(slice_urn).get_sliver_id(instance.project_id, \
+                                                      instance.hostname, instance.id)
             res['geni_urn'] = sliver_id
-            if node['boot_state'] == 'boot':
-                res['geni_status'] = 'ready'
+
+            if instance.vm_state == 'running':
+                res['boot_state'] = 'ready';
             else:
-                res['geni_status'] = 'failed'
-                top_level_status = 'failed' 
-                
-            res['geni_error'] = ''
-    
+                res['boot_state'] = 'unknown'  
             resources.append(res)
             
         result['geni_status'] = top_level_status
@@ -301,13 +291,19 @@ class NovaDriver (Driver):
         # parse rspec
         rspec = RSpec(rspec_string)
         requested_attributes = rspec.version.get_slice_attributes()
+        pubkeys = []
+        for user in users:
+            pubkeys.extend(user['keys']) 
+        # assume that there is a key whos nane matches the caller's username.
+        project_key = Xrn(users[0]['urn']).get_leaf()    
         
+         
         # ensure slice record exists
-        slice = aggregate.verify_slice(slicename, users, options=options)
+        aggregate.create_project(slicename, users, options=options)
         # ensure person records exists
-        persons = aggregate.verify_slice_users(slicename, users, options=options)
+        aggregate.create_project_users(slicename, users, options=options)
         # add/remove slice from nodes
-        slices.verify_instances(slicename, rspec)    
+        aggregate.run_instances(slicename, rspec, project_key, pubkeys)    
    
         return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version)
 
@@ -316,8 +312,6 @@ class NovaDriver (Driver):
         slice = self.shell.project_get(name)
         if not slice:
             return 1
-        
-        self.shell.DeleteSliceFromNodes(slicename, slice['node_ids'])
         instances = self.shell.db.instance_get_all_by_project(name)
         for instance in instances:
             self.shell.db.instance_destroy(instance.instance_id)