X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=e4b95b07087fb9975b89d13ba0e2ada060d25b2e;hb=0f90da7f05fbe3d07e56790c10f6ecc877b33754;hp=89dafaac21e27de3711175a13c38a33c6cf4ef4e;hpb=82f031015f66cc66499b2a4655f26110f60364ff;p=sfa.git

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 89dafaac..e4b95b07 100644
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -2,13 +2,15 @@ import time
 import datetime
 
 from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \
-    RecordNotFound, SfaNotImplemented, SliverDoesNotExist
+    RecordNotFound, SfaNotImplemented, SliverDoesNotExist, \
+    SfaInvalidArgument
 
 from sfa.util.sfalogging import logger
 from sfa.util.defaultdict import defaultdict
 from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
 from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id
 from sfa.util.cache import Cache
+from sfa.trust.credential import Credential
 # used to be used in get_ticket
 #from sfa.trust.sfaticket import SfaTicket
 
@@ -20,7 +22,7 @@ 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.planetlab.plslices import PlSlices
 from sfa.util.osxrn import OSXrn
 
 
@@ -66,33 +68,74 @@ class NovaDriver (Driver):
     ########## 
     def register (self, sfa_record, hrn, pub_key):
         type = sfa_record['type']
-        pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record)
-
+        
+        #pl_record = self.sfa_fields_to_pl_fields(type     dd , hrn, sfa_record)
+           
         if type == 'slice':
-            acceptable_fields=['url', 'instantiation', 'name', 'description']
             # add slice description, name, researchers, PI 
-            pass
+            name = Xrn(hrn).get_leaf()
+            researchers = sfa_record.get('researchers', [])
+            pis = sfa_record.get('pis', [])
+            project_manager = None
+            description = sfa_record.get('description', None)
+            if pis:
+                project_manager = Xrn(pis[0], 'user').get_leaf()
+            elif researchers:
+                project_manager = Xrn(researchers[0], 'user').get_leaf()
+            if not project_manager:
+                err_string = "Cannot create a project without a project manager. " + \
+                             "Please specify at least one PI or researcher for project: " + \
+                             name    
+                raise SfaInvalidArgument(err_string)
+
+            users = [Xrn(user, 'user').get_leaf() for user in \
+                     pis + researchers]
+            self.shell.auth_manager.create_project(name, project_manager, description, users)
 
         elif type == 'user':
             # add person roles, projects and keys
-            pass
-        return pointer
+            name = Xrn(hrn).get_leaf()
+            self.shell.auth_manager.create_user(name)
+            projects = sfa_records.get('slices', [])
+            for project in projects:
+                project_name = Xrn(project).get_leaf()
+                self.shell.auth_manager.add_to_project(name, project_name)
+            keys = sfa_records.get('keys', [])
+            for key in keys:
+                key_dict = {
+                    'user_id': name,
+                    'name': name,
+                    'public': key,
+                }
+                self.shell.db.key_pair_create(key_dict)       
+                  
+        return name
         
     ##########
     # xxx actually old_sfa_record comes filled with plc stuff as well in the original code
     def update (self, old_sfa_record, new_sfa_record, hrn, new_key):
-        pointer = old_sfa_record['pointer']
-        type = old_sfa_record['type']
-
+        type = new_sfa_record['type'] 
+        
         # new_key implemented for users only
         if new_key and type not in [ 'user' ]:
             raise UnknownSfaType(type)
 
         elif type == "slice":
-            # can update description, researchers and PI
-            pass 
+            # can update project manager and description
+            name = Xrn(hrn).get_leaf()
+            researchers = sfa_record.get('researchers', [])
+            pis = sfa_record.get('pis', [])
+            project_manager = None
+            description = sfa_record.get('description', None)
+            if pis:
+                project_manager = Xrn(pis[0], 'user').get_leaf()
+            elif researchers:
+                project_manager = Xrn(researchers[0], 'user').get_leaf()
+            self.shell.auth_manager.modify_project(name, project_manager, description)
+
         elif type == "user":
-            # can update  slices, keys and roles
+            # can techinally update access_key and secret_key,
+            # but that is not in our scope, so we do nothing.  
             pass
         return True
         
@@ -306,23 +349,17 @@ class NovaDriver (Driver):
                 user_keys = self.shell.db.key_pair_get_all_by_user(username)
                 if user_keys:
                     project_key = user_keys[0].name
-                    self.euca_shell._init_ctx(username, project_name)
-        
-        # use the first keypair we find
-        for user in users:
-            username = Xrn(user['urn']).get_leaf()
-            user_keys = self.shell.db.key_pair_get_all_by_user(username)
-            if user_keys:
-                #project_key = user_keys[0].id
-                project_key = user_keys[0].name
-                
-        
-        # ensure person records exists  
+                     
+        # ensure person records exists
+        self.euca_shell.init_context(project_name)  
         aggregate.run_instances(project_name, rspec_string, project_key, pubkeys)    
    
         return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version)
 
     def delete_sliver (self, slice_urn, slice_hrn, creds, options):
+        # we need to do this using the context of one of the slice users
+        project_name = Xrn(slice_urn).get_leaf()
+        self.euca_shell.init_context(project_name) 
         name = OSXrn(xrn=slice_urn).name
         aggregate = OSAggregate(self)
         return aggregate.delete_instances(name)