Cleaning in slabapi. Trying a small fix to the sfi.py show
[sfa.git] / sfa / senslab / slabdriver.py
index fc50962..d7f3421 100644 (file)
-import sys
-import subprocess
+import os
 
 from datetime import datetime
-from dateutil import tz 
-from time import strftime,gmtime
 
-from sfa.util.faults import MissingSfaInfo , SliverDoesNotExist
+from sfa.util.faults import SliverDoesNotExist, UnknownSfaType
 from sfa.util.sfalogging import logger
-from sfa.util.defaultdict import defaultdict
-
-from sfa.storage.record import Record
 from sfa.storage.alchemy import dbsession
-from sfa.storage.model import RegRecord
+from sfa.storage.model import RegRecord, RegUser, RegSlice, RegKey
+from sqlalchemy.orm import joinedload
 
-from sfa.trust.credential import Credential
-from sfa.trust.gid import GID
+from sfa.trust.certificate import Keypair, convert_public_key
+from sfa.trust.gid import create_uuid
+from sfa.trust.hierarchy import Hierarchy
 
 from sfa.managers.driver import Driver
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
-from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id
-from sfa.planetlab.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
-
-## thierry: everything that is API-related (i.e. handling incoming requests) 
-# is taken care of 
-# SlabDriver should be really only about talking to the senslab testbed
-
+from sfa.util.xrn import Xrn, hrn_to_urn, get_authority
 
 from sfa.senslab.OARrestapi import  OARrestapi
 from sfa.senslab.LDAPapi import LDAPapi
 
-from sfa.senslab.slabpostgres import SlabDB, slab_dbsession,SliceSenslab
-from sfa.senslab.slabaggregate import SlabAggregate
+from sfa.senslab.slabpostgres import SlabDB, slab_dbsession, SenslabXP
+                                                     
+                                                                
+from sfa.senslab.slabaggregate import SlabAggregate, slab_xrn_to_hostname, \
+                                                            slab_xrn_object
 from sfa.senslab.slabslices import SlabSlices
 
 
+from sfa.senslab.slabapi import SlabTestbedAPI
 
-# thierry : note
-# this inheritance scheme is so that the driver object can receive
-# GetNodes or GetSites sorts of calls directly
-# and thus minimize the differences in the managers with the pl version
-class SlabDriver(Driver):
 
+     
+class SlabDriver(Driver):
+    """ Senslab Driver class inherited from Driver generic class.
+    
+    Contains methods compliant with the SFA standard and the testbed
+    infrastructure (calls to LDAP and OAR).
+    """
     def __init__(self, config):
         Driver.__init__ (self, config)
-        self.config=config
+        self.config = config
         self.hrn = config.SFA_INTERFACE_HRN
 
-        self.root_auth = config.SFA_REGISTRY_ROOT_AUTH
-
-        self.oar = OARrestapi()
-       self.ldap = LDAPapi()
-        self.time_format = "%Y-%m-%d %H:%M:%S"
-        self.db = SlabDB(config,debug = True)
-        self.cache=None
+        self.db = SlabDB(config, debug = False)
+        self.slab_api = SlabTestbedAPI(config)
+        self.cache = None
         
+    def augment_records_with_testbed_info (self, record_list ):
+        """ Adds specific testbed info to the records. """
+        return self.fill_record_info (record_list)
     
-    def sliver_status(self,slice_urn,slice_hrn):
+    def fill_record_info(self, record_list):
+        """
+        Given a SFA record, fill in the senslab specific and SFA specific
+        fields in the record. 
+        """
+                    
+        logger.debug("SLABDRIVER \tfill_record_info records %s " %(record_list))
+        if not isinstance(record_list, list):
+            record_list = [record_list]
+            
+        try:
+            for record in record_list:
+                #If the record is a SFA slice record, then add information 
+                #about the user of this slice. This kind of 
+                #information is in the Senslab's DB.
+                if str(record['type']) == 'slice':
+                    if 'reg_researchers' in record and \
+                    isinstance(record['reg_researchers'], list) :
+                        record['reg_researchers'] = record['reg_researchers'][0].__dict__
+                        record.update({'PI':[record['reg_researchers']['hrn']],
+                                'researcher': [record['reg_researchers']['hrn']],
+                                'name':record['hrn'], 
+                                'oar_job_id':[],
+                                'node_ids': [],
+                                'person_ids':[record['reg_researchers']['record_id']],
+                                'geni_urn':'',  #For client_helper.py compatibility
+                                'keys':'',  #For client_helper.py compatibility
+                                'key_ids':''})  #For client_helper.py compatibility
+                        
+                        
+                    #Get slab slice record and oar job id if any.
+                    recslice_list = self.slab_api.GetSlices(slice_filter = \
+                                                str(record['hrn']),\
+                                                slice_filter_type = 'slice_hrn')
+                    
+                   
+                    logger.debug("SLABDRIVER \tfill_record_info \
+                        TYPE SLICE RECUSER record['hrn'] %s ecord['oar_job_id']\
+                         %s " %(record['hrn'], record['oar_job_id']))
+                         del record['reg_researchers']
+                    try:
+                        for rec in recslice_list: 
+                            logger.debug("SLABDRIVER\r\n  \t  fill_record_info oar_job_id %s " %(rec['oar_job_id']))
+                            
+                            record['node_ids'] = [ self.slab_api.root_auth + hostname for hostname in rec['node_ids']]
+                    except KeyError:
+                        pass
+                        
+                    
+                    logger.debug( "SLABDRIVER.PY \t fill_record_info SLICE \
+                                    recslice_list  %s \r\n \t RECORD %s \r\n \
+                                    \r\n" %(recslice_list, record)) 
+                                    
+                if str(record['type']) == 'user':
+                    #The record is a SFA user record.
+                    #Get the information about his slice from Senslab's DB
+                    #and add it to the user record.
+                    recslice_list = self.slab_api.GetSlices(\
+                            slice_filter = record['record_id'],\
+                            slice_filter_type = 'record_id_user')
+                                            
+                    logger.debug( "SLABDRIVER.PY \t fill_record_info TYPE USER \
+                                                recslice_list %s \r\n \t RECORD %s \r\n" %(recslice_list , record)) 
+                    #Append slice record in records list, 
+                    #therefore fetches user and slice info again(one more loop)
+                    #Will update PIs and researcher for the slice
+                   
+                    recuser = recslice_list[0]['reg_researchers']
+                    logger.debug( "SLABDRIVER.PY \t fill_record_info USER  \
+                                                recuser %s \r\n \r\n" %(recuser)) 
+                    recslice = {}
+                    recslice = recslice_list[0]
+                    recslice.update({'PI':[recuser['hrn']],
+                        'researcher': [recuser['hrn']],
+                        'name':record['hrn'], 
+                        'node_ids': [],
+                        'oar_job_id': [],
+                        'person_ids':[recuser['record_id']]}) 
+                    try:
+                        for rec in recslice_list:
+                            recslice['oar_job_id'].append(rec['oar_job_id'])
+                    except KeyError:
+                        pass
+                            
+                    recslice.update({'type':'slice', \
+                                                'hrn':recslice_list[0]['hrn']})
+
+
+                    #GetPersons takes [] as filters 
+                    user_slab = self.slab_api.GetPersons([record])
+    
+                    
+                    record.update(user_slab[0])
+                    #For client_helper.py compatibility
+                    record.update( { 'geni_urn':'',
+                    'keys':'',
+                    'key_ids':'' })                
+                    record_list.append(recslice)
+                    
+                    logger.debug("SLABDRIVER.PY \tfill_record_info ADDING SLICE\
+                                INFO TO USER records %s" %(record_list)) 
+                  
+
+        except TypeError, error:
+            logger.log_exc("SLABDRIVER \t fill_record_info  EXCEPTION %s"\
+                                                                     %(error))
+                              
+        return
+                    
+                    
+    def sliver_status(self, slice_urn, slice_hrn):
         """Receive a status request for slice named urn/hrn 
         urn:publicid:IDN+senslab+nturro_slice hrn senslab.nturro_slice
         shall return a structure as described in
@@ -67,54 +172,75 @@ class SlabDriver(Driver):
         """
         
         #First get the slice with the slice hrn
-        sl = self.GetSlices(slice_filter = slice_hrn, slice_filter_type = 'slice_hrn')
-        if len(sl) is 0:
+        slice_list =  self.slab_api.GetSlices(slice_filter = slice_hrn, \
+                                    slice_filter_type = 'slice_hrn')
+        
+        if len(slice_list) is 0:
             raise SliverDoesNotExist("%s  slice_hrn" % (slice_hrn))
         
-        nodes_in_slice = sl['node_ids']
-        if len(nodes_in_slice) is 0:
-            raise SliverDoesNotExist("No slivers allocated ") 
+        #Used for fetching the user info witch comes along the slice info 
+        one_slice = slice_list[0] 
+
         
-        logger.debug("Slabdriver - sliver_status Sliver status urn %s hrn %s sl\
-                             %s \r\n " %(slice_urn,slice_hrn,sl) )
-                             
-        if sl['oar_job_id'] is not -1:
-            #A job is running on Senslab for this slice
-            # report about the local nodes that are in the slice only
-            
-            nodes_all = self.GetNodes({'hostname':nodes_in_slice},
-                            ['node_id', 'hostname','site','boot_state'])
-            nodeall_byhostname = dict([(n['hostname'], n) for n in nodes_all])
+        #Make a list of all the nodes hostnames  in use for this slice
+        slice_nodes_list = []
+        #for single_slice in slice_list:
+            #for node in single_slice['node_ids']:
+                #slice_nodes_list.append(node['hostname'])
+        for node in one_slice:
+            slice_nodes_list.append(node['hostname'])
             
+        #Get all the corresponding nodes details    
+        nodes_all = self.slab_api.GetNodes({'hostname':slice_nodes_list},
+                                ['node_id', 'hostname','site','boot_state'])
+        nodeall_byhostname = dict([(one_node['hostname'], one_node) \
+                                            for one_node in nodes_all])  
+          
+          
+          
+        for single_slice in slice_list:
 
+              #For compatibility
+            top_level_status = 'empty' 
             result = {}
-            top_level_status = 'unknown'
-            if nodes:
-                top_level_status = 'ready'
+            result.fromkeys(\
+                ['geni_urn','pl_login','geni_status','geni_resources'], None)
+            result['pl_login'] = one_slice['reg_researchers']['hrn']
+            logger.debug("Slabdriver - sliver_status Sliver status \
+                                        urn %s hrn %s single_slice  %s \r\n " \
+                                        %(slice_urn, slice_hrn, single_slice))
+                                        
+            if 'node_ids' not in single_slice:
+                #No job in the slice
+                result['geni_status'] = top_level_status
+                result['geni_resources'] = [] 
+                return result
+           
+            top_level_status = 'ready' 
+
+            #A job is running on Senslab for this slice
+            # report about the local nodes that are in the slice only
+         
             result['geni_urn'] = slice_urn
-            result['pl_login'] = sl['job_user'] #For compatibility
 
-            
-            timestamp = float(sl['startTime']) + float(sl['walltime']) 
-            result['pl_expires'] = strftime(self.time_format, \
-                                                    gmtime(float(timestamp)))
-            #result['slab_expires'] = strftime(self.time_format,\
-                                                     #gmtime(float(timestamp)))
-            
             resources = []
-            for node in nodes:
+            for node in single_slice['node_ids']:
                 res = {}
                 #res['slab_hostname'] = node['hostname']
                 #res['slab_boot_state'] = node['boot_state']
                 
-                res['pl_hostname'] = nodeall_byhostname[node]['hostname']
-                res['pl_boot_state'] = nodeall_byhostname[node]['boot_state']
-                res['pl_last_contact'] = strftime(self.time_format, \
-                                                    gmtime(float(timestamp)))
-                sliver_id = urn_to_sliver_id(slice_urn, sl['record_id_slice'], \
-                                            nodeall_byhostname[node]['node_id']) 
+                res['pl_hostname'] = node['hostname']
+                res['pl_boot_state'] = \
+                            nodeall_byhostname[node['hostname']]['boot_state']
+                #res['pl_last_contact'] = strftime(self.time_format, \
+                                                    #gmtime(float(timestamp)))
+                sliver_id =  Xrn(slice_urn, type='slice', \
+                        id=nodeall_byhostname[node['hostname']]['node_id'], \
+                        authority=self.hrn).urn
+    
                 res['geni_urn'] = sliver_id 
-                if nodeall_byhostname[node]['boot_state'] == 'Alive':
+                node_name  = node['hostname']
+                if nodeall_byhostname[node_name]['boot_state'] == 'Alive':
 
                     res['geni_status'] = 'ready'
                 else:
@@ -127,114 +253,229 @@ class SlabDriver(Driver):
                 
             result['geni_status'] = top_level_status
             result['geni_resources'] = resources 
-            print >>sys.stderr, "\r\n \r\n_____________ Sliver status resources %s res %s \r\n " %(resources,res)
-            return result        
-        
-        
-    def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options):
-        print>>sys.stderr, "\r\n \r\n \t=============================== SLABDRIVER.PY create_sliver "
+            logger.debug("SLABDRIVER \tsliver_statusresources %s res %s "\
+                                                    %(resources,res))
+            return result  
+                
+    @staticmethod                
+    def get_user_record( hrn):        
+        """ Returns the user record based on the hrn from the SFA DB """
+        return dbsession.query(RegRecord).filter_by(hrn = hrn).first() 
+         
+     
+    def testbed_name (self): 
+        return self.hrn
+         
+    # 'geni_request_rspec_versions' and 'geni_ad_rspec_versions' are mandatory
+    def aggregate_version (self):
+        version_manager = VersionManager()
+        ad_rspec_versions = []
+        request_rspec_versions = []
+        for rspec_version in version_manager.versions:
+            if rspec_version.content_type in ['*', 'ad']:
+                ad_rspec_versions.append(rspec_version.to_dict())
+            if rspec_version.content_type in ['*', 'request']:
+                request_rspec_versions.append(rspec_version.to_dict()) 
+        return {
+            'testbed':self.testbed_name(),
+            'geni_request_rspec_versions': request_rspec_versions,
+            'geni_ad_rspec_versions': ad_rspec_versions,
+            }  
+               
+               
+    def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, \
+                                                             users, options):
+        """  """
         aggregate = SlabAggregate(self)
         
         slices = SlabSlices(self)
         peer = slices.get_peer(slice_hrn)
         sfa_peer = slices.get_sfa_peer(slice_hrn)
-        slice_record=None 
+        slice_record = None 
  
         if not isinstance(creds, list):
             creds = [creds]
     
         if users:
-            slice_record = users[0].get('slice_record', {})
-    
+            slice_record = users[0].get('slice_record', {}) 
+            logger.debug("SLABDRIVER.PY \t ===============create_sliver \t\
+                                        creds %s \r\n \r\n users %s" \
+                                        %(creds, users))
+            slice_record['user'] = {'keys':users[0]['keys'], \
+                                    'email':users[0]['email'], \
+                                    'hrn':slice_record['reg-researchers'][0]}
         # parse rspec
         rspec = RSpec(rspec_string)
-        print>>sys.stderr, "\r\n \r\n \t=============================== SLABDRIVER.PY create_sliver  ============================rspec.version %s " %(rspec.version)
-        
-        
+        logger.debug("SLABDRIVER.PY \t create_sliver \trspec.version \
+                                        %s slice_record %s users %s" \
+                                        %(rspec.version,slice_record, users))
+                                            
+
         # ensure site record exists?
         # ensure slice record exists
-        slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer, options=options)
-        requested_attributes = rspec.version.get_slice_attributes()
-        
-        if requested_attributes:
-            for attrib_dict in requested_attributes:
-                if 'timeslot' in attrib_dict and attrib_dict['timeslot'] is not None:
-                    slice.update({'timeslot':attrib_dict['timeslot']})
-        print >>sys.stderr, "\r\n \r\n \t=============================== SLABDRIVER.PY create_sliver  ..... slice %s " %(slice)
+        #Removed options to verify_slice SA 14/08/12
+        sfa_slice = slices.verify_slice(slice_hrn, slice_record, peer, \
+                                                    sfa_peer)
+                                                    
         # ensure person records exists
-        persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer, options=options)
-        # ensure slice attributes exists?
+        #verify_persons returns added persons but since the return value
+        #is not used 
+        slices.verify_persons(slice_hrn, sfa_slice, users, peer, \
+                                                    sfa_peer, options=options)                                           
+        #requested_attributes returned by rspec.version.get_slice_attributes() 
+        #unused, removed SA 13/08/12
+        rspec.version.get_slice_attributes()
+
+        logger.debug("SLABDRIVER.PY create_sliver slice %s " %(sfa_slice))
 
-        
         # add/remove slice from nodes 
-        print >>sys.stderr, "\r\n \r\n \t=============================== SLABDRIVER.PY create_sliver  ..... " 
        
-        requested_slivers = [node.get('component_name') for node in rspec.version.get_nodes_with_slivers()]
-        print >>sys.stderr, "\r\n \r\n \t=============================== ........... requested_slivers ============================requested_slivers %s " %(requested_slivers)
-        nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) 
-    
+        requested_slivers = [node.get('component_id') \
+                            for node in rspec.version.get_nodes_with_slivers()\
+                            if node.get('authority_id') is self.slab_api.root_auth]
+        l = [ node for node in rspec.version.get_nodes_with_slivers() ]
+        logger.debug("SLADRIVER \tcreate_sliver requested_slivers \
+                                    requested_slivers %s  listnodes %s" \
+                                    %(requested_slivers,l))
+        #verify_slice_nodes returns nodes, but unused here. Removed SA 13/08/12.
+        #slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) 
         
-        return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version)
+        # add/remove leases
+        requested_lease_list = []
+
+
+
+        for lease in rspec.version.get_leases():
+            single_requested_lease = {}
+            logger.debug("SLABDRIVER.PY \tcreate_sliver lease %s " %(lease))
+            
+            if not lease.get('lease_id'):
+                if get_authority(lease['component_id']) == self.slab_api.root_auth:
+                    single_requested_lease['hostname'] = \
+                                        slab_xrn_to_hostname(\
+                                        lease.get('component_id').strip())
+                    single_requested_lease['start_time'] = \
+                                                        lease.get('start_time')
+                    single_requested_lease['duration'] = lease.get('duration')
+                    #Check the experiment's duration is valid before adding
+                    #the lease to the requested leases list
+                    duration_in_seconds = \
+                            int(single_requested_lease['duration'])*60
+                    if duration_in_seconds > self.slab_api.GetLeaseGranularity():
+                        requested_lease_list.append(single_requested_lease)
+                     
+        #Create dict of leases by start_time, regrouping nodes reserved
+        #at the same
+        #time, for the same amount of time = one job on OAR
+        requested_job_dict = {}
+        for lease in requested_lease_list:
+            
+            #In case it is an asap experiment start_time is empty
+            if lease['start_time'] == '':
+                lease['start_time'] = '0' 
+                
+            if lease['start_time'] not in requested_job_dict:
+                if isinstance(lease['hostname'], str):
+                    lease['hostname'] =  [lease['hostname']]
+                    
+                requested_job_dict[lease['start_time']] = lease
+                
+            else :
+                job_lease = requested_job_dict[lease['start_time']]
+                if lease['duration'] == job_lease['duration'] :
+                    job_lease['hostname'].append(lease['hostname'])
+                    
+          
+                
+                        
+        logger.debug("SLABDRIVER.PY \tcreate_sliver  requested_job_dict %s "\
+                                                     %(requested_job_dict))    
+        #verify_slice_leases returns the leases , but the return value is unused
+        #here. Removed SA 13/08/12           
+        slices.verify_slice_leases(sfa_slice, \
+                                    requested_job_dict, peer)
+        
+        return aggregate.get_rspec(slice_xrn=slice_urn, \
+                login=sfa_slice['login'], version=rspec.version)
         
         
     def delete_sliver (self, slice_urn, slice_hrn, creds, options):
         
-        slice = self.GetSlices(slice_filter= slice_hrn, slice_filter_type = 'slice_hrn')
-        print>>sys.stderr, "\r\n \r\n \t\t  SLABDRIVER.PY delete_sliver slice %s" %(slice)
-        if not slice:
+        sfa_slice_list  = self.slab_api.GetSlices(slice_filter = slice_hrn, \
+                                            slice_filter_type = 'slice_hrn')
+        
+        if not sfa_slice_list:
             return 1
-       
-        slices = SlabSlices(self)
-        # determine if this is a peer slice
-        # xxx I wonder if this would not need to use PlSlices.get_peer instead 
-        # in which case plc.peers could be deprecated as this here
-        # is the only/last call to this last method in plc.peers
-        peer = slices.get_peer(slice_hrn)
-        try:
-            if peer:
-                self.UnBindObjectFromPeer('slice', slice['record_id_slice'], peer)
-            self.DeleteSliceFromNodes(slice)
-        finally:
-            if peer:
-                self.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
-        return 1
-            
-            
-    def AddSlice(self, slice_record):
-        slab_slice = SliceSenslab( slice_hrn = slice_record['slice_hrn'],  record_id_slice= slice_record['record_id_slice'] , record_id_user= slice_record['record_id_user'], peer_authority = slice_record['peer_authority'])
-        print>>sys.stderr, "\r\n \r\n \t\t\t =======SLABDRIVER.PY AddSlice slice_record %s slab_slice %s" %(slice_record,slab_slice)
-        slab_dbsession.add(slab_slice)
-        slab_dbsession.commit()
-        return
         
+        #Delete all in the slice
+        for sfa_slice in sfa_slice_list:
+
+        
+            logger.debug("SLABDRIVER.PY delete_sliver slice %s" %(sfa_slice))
+            slices = SlabSlices(self)
+            # determine if this is a peer slice
+        
+            peer = slices.get_peer(slice_hrn) 
+            #TODO delete_sliver SA : UnBindObjectFromPeer should be 
+            #used when there is another 
+            #senslab testbed, which is not the case 14/08/12 . 
+            
+            logger.debug("SLABDRIVER.PY delete_sliver peer %s \r\n \t sfa_slice %s " %(peer, sfa_slice))
+            try:
+                #if peer:
+                    #self.slab_api.UnBindObjectFromPeer('slice', \
+                                            #sfa_slice['record_id_slice'], \
+                                            #peer, None)
+                self.slab_api.DeleteSliceFromNodes(sfa_slice)
+                return True
+            except :
+                return False
+            #finally:
+                #if peer:
+                    #self.slab_api.BindObjectToPeer('slice', \
+                                            #sfa_slice['record_id_slice'], \
+                                            #peer, sfa_slice['peer_slice_id'])
+            #return 1
+                
+    
     # first 2 args are None in case of resource discovery
     def list_resources (self, slice_urn, slice_hrn, creds, options):
         #cached_requested = options.get('cached', True) 
     
         version_manager = VersionManager()
         # get the rspec's return format from options
-        rspec_version = version_manager.get_version(options.get('geni_rspec_version'))
+        rspec_version = \
+                version_manager.get_version(options.get('geni_rspec_version'))
         version_string = "rspec_%s" % (rspec_version)
     
         #panos adding the info option to the caching key (can be improved)
         if options.get('info'):
-            version_string = version_string + "_"+options.get('info', 'default')
+            version_string = version_string + "_" + \
+                                        options.get('info', 'default')
+                                        
+        # Adding the list_leases option to the caching key
+        if options.get('list_leases'):
+            version_string = version_string + "_"+options.get('list_leases', 'default')
+            
+        # Adding geni_available to caching key
+        if options.get('geni_available'):
+            version_string = version_string + "_" + str(options.get('geni_available'))
     
         # look in cache first
         #if cached_requested and self.cache and not slice_hrn:
             #rspec = self.cache.get(version_string)
             #if rspec:
-                #logger.debug("SlabDriver.ListResources: returning cached advertisement")
+                #logger.debug("SlabDriver.ListResources: \
+                                    #returning cached advertisement")
                 #return rspec 
     
         #panos: passing user-defined options
-
         aggregate = SlabAggregate(self)
-        origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
-        options.update({'origin_hrn':origin_hrn})
-        rspec =  aggregate.get_rspec(slice_xrn=slice_urn, version=rspec_version, 
-                                     options=options)
-        print>>sys.stderr, " \r\n \r\n \t SLABDRIVER list_resources rspec " 
+        #origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
+        #options.update({'origin_hrn':origin_hrn})
+        rspec =  aggregate.get_rspec(slice_xrn=slice_urn, \
+                                        version=rspec_version, options=options)
+       
         # cache the result
         #if self.cache and not slice_hrn:
             #logger.debug("Slab.ListResources: stores advertisement in cache")
@@ -252,11 +493,14 @@ class SlabDriver(Driver):
                 #return slices
     
         # get data from db 
-        print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY list_slices"
-        slices = self.GetSlices()
-        slice_hrns = [slicename_to_hrn(self.hrn, slice['slice_hrn']) for slice in slices]
-        slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns]
-    
+
+        slices = self.slab_api.GetSlices()        
+        logger.debug("SLABDRIVER.PY \tlist_slices hrn %s \r\n \r\n" %(slices))        
+        slice_hrns = [slab_slice['hrn'] for slab_slice in slices]
+
+        slice_urns = [hrn_to_urn(slice_hrn, 'slice') \
+                                                for slice_hrn in slice_hrns]
+
         # cache the result
         #if self.cache:
             #logger.debug ("SlabDriver.list_slices stores value in cache")
@@ -264,72 +508,45 @@ class SlabDriver(Driver):
     
         return slice_urns
     
-    #No site or node register supported
+   
     def register (self, sfa_record, hrn, pub_key):
-        type = sfa_record['type']
-        slab_record = self.sfa_fields_to_slab_fields(type, hrn, sfa_record)
-    
-
-        if type == 'slice':
-            acceptable_fields=['url', 'instantiation', 'name', 'description']
-            for key in slab_record.keys():
-                if key not in acceptable_fields:
-                    slab_record.pop(key) 
-            print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY register"
-            slices = self.GetSlices(slice_filter =slab_record['hrn'], slice_filter_type = 'slice_hrn')
-            if not slices:
-                    pointer = self.AddSlice(slab_record)
-            else:
-                    pointer = slices[0]['slice_id']
-    
-        elif type == 'user':  
-            persons = self.GetPersons([sfa_record])
-            #persons = self.GetPersons([sfa_record['hrn']])
-            if not persons:
-                pointer = self.AddPerson(dict(sfa_record))
-                #add in LDAP 
-            else:
-                pointer = persons[0]['person_id']
-                
-            #Does this make sense to senslab ?
-            #if 'enabled' in sfa_record and sfa_record['enabled']:
-                #self.UpdatePerson(pointer, {'enabled': sfa_record['enabled']})
-                
-            # add this person to the site only if she is being added for the first
-            # time by sfa and doesont already exist in plc
-            if not persons or not persons[0]['site_ids']:
-                login_base = get_leaf(sfa_record['authority'])
-                self.AddPersonToSite(pointer, login_base)
-    
-            # What roles should this user have?
-            self.AddRoleToPerson('user', pointer)
-            # Add the user's key
-            if pub_key:
-                self.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key})
-                
-        #No node adding outside OAR
-
-        return pointer
+        """ 
+        Adding new user, slice, node or site should not be handled
+        by SFA.
+        
+        Adding nodes = OAR
+        Adding users = LDAP Senslab
+        Adding slice = Import from LDAP users
+        Adding site = OAR
+        """
+        return -1
             
-    #No site or node record update allowed       
+      
     def update (self, old_sfa_record, new_sfa_record, hrn, new_key):
+        """No site or node record update allowed in Senslab."""
+        
         pointer = old_sfa_record['pointer']
-        type = old_sfa_record['type']
+        old_sfa_record_type = old_sfa_record['type']
 
         # new_key implemented for users only
-        if new_key and type not in [ 'user' ]:
-            raise UnknownSfaType(type)
+        if new_key and old_sfa_record_type not in [ 'user' ]:
+            raise UnknownSfaType(old_sfa_record_type)
         
         #if (type == "authority"):
             #self.shell.UpdateSite(pointer, new_sfa_record)
     
-        if type == "slice":
-            slab_record=self.sfa_fields_to_slab_fields(type, hrn, new_sfa_record)
+        if old_sfa_record_type == "slice":
+            slab_record = self.slab_api.sfa_fields_to_slab_fields(old_sfa_record_type, \
+                                                hrn, new_sfa_record)
             if 'name' in slab_record:
                 slab_record.pop('name')
-                self.UpdateSlice(pointer, slab_record)
+                #Prototype should be UpdateSlice(self,
+                #auth, slice_id_or_name, slice_fields)
+                #Senslab cannot update slice since slice = job
+                #so we must delete and create another job
+                self.slab_api.UpdateSlice(pointer, slab_record)
     
-        elif type == "user":
+        elif old_sfa_record_type == "user":
             update_fields = {}
             all_fields = new_sfa_record
             for key in all_fields.keys():
@@ -337,45 +554,47 @@ class SlabDriver(Driver):
                            'password', 'phone', 'url', 'bio', 'accepted_aup',
                            'enabled']:
                     update_fields[key] = all_fields[key]
-            self.UpdatePerson(pointer, update_fields)
+            self.slab_api.UpdatePerson(pointer, update_fields)
     
             if new_key:
                 # must check this key against the previous one if it exists
-                persons = self.GetPersons([pointer], ['key_ids'])
+                persons = self.slab_api.GetPersons(['key_ids'])
                 person = persons[0]
                 keys = person['key_ids']
-                keys = self.GetKeys(person['key_ids'])
+                keys = self.slab_api.GetKeys(person['key_ids'])
                 
                 # Delete all stale keys
                 key_exists = False
                 for key in keys:
                     if new_key != key['key']:
-                        self.DeleteKey(key['key_id'])
+                        self.slab_api.DeleteKey(key['key_id'])
                     else:
                         key_exists = True
                 if not key_exists:
-                    self.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key})
+                    self.slab_api.AddPersonKey(pointer, {'key_type': 'ssh', \
+                                                    'key': new_key})
 
 
         return True
         
 
     def remove (self, sfa_record):
-        type=sfa_record['type']
-        hrn=sfa_record['hrn']
-        record_id= sfa_record['record_id']
-        if type == 'user':
-            username = hrn.split(".")[len(hrn.split(".")) -1]
-            #get user in ldap  
-            persons = self.GetPersons(sfa_record)
-            #persons = self.GetPersons(username)
-            # only delete this person if he has site ids. if he doesnt, it probably means
-            # he was just removed from a site, not actually deleted
-            if persons and persons[0]['site_ids']:
-                self.DeletePerson(username)
-        elif type == 'slice':
-            if self.GetSlices(slice_filter = hrn, slice_filter_type = 'slice_hrn'):
-                self.DeleteSlice(hrn)
+        sfa_record_type = sfa_record['type']
+        hrn = sfa_record['hrn']
+        if sfa_record_type == 'user':
+
+            #get user from senslab ldap  
+            person = self.slab_api.GetPersons(sfa_record)
+            #No registering at a given site in Senslab.
+            #Once registered to the LDAP, all senslab sites are
+            #accesible.
+            if person :
+                #Mark account as disabled in ldap
+                self.slab_api.DeletePerson(sfa_record)
+        elif sfa_record_type == 'slice':
+            if self.slab_api.GetSlices(slice_filter = hrn, \
+                                    slice_filter_type = 'slice_hrn'):
+                self.slab_api.DeleteSlice(sfa_record)
 
         #elif type == 'authority':
             #if self.GetSites(pointer):
@@ -383,695 +602,4 @@ class SlabDriver(Driver):
 
         return True
             
-    def GetPeers (self,auth = None, peer_filter=None, return_fields_list=None):
-
-        existing_records = {}
-        existing_hrns_by_types= {}
-        print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers auth = %s, peer_filter %s, return_field %s " %(auth , peer_filter, return_fields_list)
-        all_records = dbsession.query(RegRecord).filter(RegRecord.type.like('%authority%')).all()
-        for record in all_records:
-            existing_records[(record.hrn,record.type)] = record
-            if record.type not in existing_hrns_by_types:
-                existing_hrns_by_types[record.type] = [record.hrn]
-                print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t NOT IN existing_hrns_by_types %s " %( existing_hrns_by_types)
-            else:
-                
-                print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t INNN  type %s hrn %s " %( record.type,record.hrn )
-                existing_hrns_by_types[record.type].append(record.hrn)
-                print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t INNN existing_hrns_by_types %s " %( existing_hrns_by_types)
-                #existing_hrns_by_types.update({record.type:(existing_hrns_by_types[record.type].append(record.hrn))})
-                        
-        print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers        existing_hrns_by_types %s " %( existing_hrns_by_types)
-        records_list= [] 
-      
-        try: 
-            print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers  existing_hrns_by_types['authority+sa']  %s \t\t existing_records %s " %(existing_hrns_by_types['authority'],existing_records)
-            if peer_filter:
-               records_list.append(existing_records[(peer_filter,'authority')])
-            else :
-                for hrn in existing_hrns_by_types['authority']:
-                    records_list.append(existing_records[(hrn,'authority')])
-                    
-            print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers  records_list  %s " %(records_list)
-                
-        except:
-                pass
-                
-        return_records = records_list
-        if not peer_filter and not return_fields_list:
-            return records_list
-
-       
-        print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers   return_records %s " %(return_records)
-        return return_records
-        
-     
-    #TODO  : Handling OR request in make_ldap_filters_from_records instead of the for loop 
-    #over the records' list
-    def GetPersons(self, person_filter=None, return_fields_list=None):
-        """
-        person_filter should be a list of dictionnaries when not set to None.
-        Returns a list of users found.
-       
-        """
-        print>>sys.stderr, "\r\n \r\n \t\t\t GetPersons person_filter %s" %(person_filter)
-        person_list = []
-        if person_filter and isinstance(person_filter,list):
-        #If we are looking for a list of users (list of dict records)
-        #Usually the list contains only one user record
-            for f in person_filter:
-                person = self.ldap.LdapFindUser(f)
-                person_list.append(person)
-          
-        else:
-              person_list  = self.ldap.LdapFindUser()  
-                    
-        return person_list
-
-    def GetTimezone(self):
-        server_timestamp,server_tz = self.oar.parser.SendRequest("GET_timezone")
-        return server_timestamp,server_tz
-    
-
-    def DeleteJobs(self, job_id, slice_hrn):
-        if not job_id:
-            return
-        username  = slice_hrn.split(".")[-1].rstrip("_slice")
-        reqdict = {}
-        reqdict['method'] = "delete"
-        reqdict['strval'] = str(job_id)
-        answer = self.oar.POSTRequestToOARRestAPI('DELETE_jobs_id',reqdict,username)
-        print>>sys.stderr, "\r\n \r\n  jobid  DeleteJobs %s "  %(answer)
-        
-    def GetJobsId(self, job_id, username = None ):
-        """
-        Details about a specific job. 
-        Includes details about submission time, jot type, state, events, 
-        owner, assigned ressources, walltime etc...
-            
-        """
-        req = "GET_jobs_id"
-        node_list_k = 'assigned_network_address'
-        #Get job info from OAR    
-        job_info = self.oar.parser.SendRequest(req, job_id, username)
-
-        logger.debug("SLABDRIVER \t GetJobs  %s " %(job_info))
-        try:
-            if job_info['state'] == 'Terminated':
-                logger.debug("SLABDRIVER \t GetJobsId job %s TERMINATED"\
-                                                            %(job_id))
-                return None
-            if job_info['state'] == 'Error':
-                logger.debug("SLABDRIVER \t GetJobsId ERROR message %s "\
-                                                            %(job_info))
-                return None
-                                                            
-        except KeyError:
-            logger.error("SLABDRIVER \tGetJobsId KeyError")
-            return None 
-        
-        parsed_job_info  = self.get_info_on_reserved_nodes(job_info,node_list_k)
-        #Replaces the previous entry "assigned_network_address" / "reserved_resources"
-        #with "node_ids"
-        job_info.update({'node_ids':parsed_job_info[node_list_k]})
-        del job_info[node_list_k]
-        logger.debug(" \r\nSLABDRIVER \t GetJobsId job_info %s " %(job_info))
-        return job_info
-
-        
-    def GetJobsResources(self,job_id, username = None):
-        #job_resources=['reserved_resources', 'assigned_resources','job_id', 'job_uri', 'assigned_nodes',\
-        #'api_timestamp']
-        #assigned_res = ['resource_id', 'resource_uri']
-        #assigned_n = ['node', 'node_uri']
-
-        req = "GET_jobs_id_resources"
-        node_list_k = 'reserved_resources' 
-               
-        #Get job info from OAR    
-        job_info = self.oar.parser.SendRequest(req, job_id, username)
-        logger.debug("SLABDRIVER \t GetJobsResources  %s " %(job_info))
-        
-        parsed_job_info  = self.get_info_on_reserved_nodes(job_info,node_list_k)
-        #Replaces the previous entry "assigned_network_address" / "reserved_resources"
-        #with "node_ids"
-        job_info.update({'node_ids':parsed_job_info[node_list_k]})
-        del job_info[node_list_k]
-        return job_info
-
-            
-    def get_info_on_reserved_nodes(self,job_info,node_list_name):
-        #Get the list of the testbed nodes records and make a 
-        #dictionnary keyed on the hostname out of it
-        node_list_dict = self.GetNodes() 
-        #node_hostname_list = []
-        node_hostname_list = [node['hostname'] for node in node_list_dict] 
-        #for node in node_list_dict:
-            #node_hostname_list.append(node['hostname'])
-        node_dict = dict(zip(node_hostname_list,node_list_dict))
-        try :
-            reserved_node_hostname_list = []
-            for index in range(len(job_info[node_list_name])):
-               #job_info[node_list_name][k] = 
-                reserved_node_hostname_list[index] = \
-                            node_dict[job_info[node_list_name][index]]['hostname']
-                            
-            logger.debug("SLABDRIVER \t get_info_on_reserved_nodes \
-                        reserved_node_hostname_list %s" \
-                        %(reserved_node_hostname_list))
-        except KeyError:
-            logger.error("SLABDRIVER \t get_info_on_reserved_nodes KEYERROR " )
-            
-        return reserved_node_hostname_list  
-              
-    def GetReservedNodes(self):
-        # this function returns a list of all the nodes already involved in an oar job
-       jobs = self.oar.parser.SendRequest("GET_running_jobs") 
-       print>>sys.stderr, "\r\n \r\n GetReservedNodes jobs %s" %(jobs)
-       #jobs=self.oar.parser.SendRequest("GET_jobs_details") 
-       nodes = []
-       if jobs['total'] == 0:
-           return []
-      
-       for j in jobs :
-          nodes = j['assigned_network_address']+nodes
-       return nodes
-     
-    def GetNodes(self,node_filter_dict = None, return_fields_list = None):
-        """
-        node_filter_dict : dictionnary of lists
-        
-        """
-        node_dict_by_id = self.oar.parser.SendRequest("GET_resources_full")
-        node_dict_list = node_dict_by_id.values()
-        
-        #No  filtering needed return the list directly
-        if not (node_filter_dict or return_fields_list):
-            return node_dict_list
-        
-        return_node_list = []
-        if node_filter_dict:
-            for filter_key in node_filter_dict:
-                try:
-                    #Filter the node_dict_list by each value contained in the 
-                    #list node_filter_dict[filter_key]
-                    for value in node_filter_dict[filter_key]:
-                        for node in node_dict_list:
-                            if node[filter_key] == value:
-                                if return_fields_list :
-                                   tmp = {}
-                                   for k in return_fields_list:
-                                        tmp[k] = node[k]     
-                                   return_node_list.append(tmp)
-                                else:
-                                   return_node_list.append(node)
-                except KeyError:
-                    logger.log_exc("GetNodes KeyError")
-                    return
-
-
-        return return_node_list
-    
-  
-    def GetSites(self, site_filter_name = None, return_fields_list = None):
-        site_dict = self.oar.parser.SendRequest("GET_sites")
-        #site_dict : dict where the key is the sit ename
-        return_site_list = []
-        if not ( site_filter_name or return_fields_list):
-                return_site_list = site_dict.values()
-                return return_site_list
-        
-        if site_filter_name in site_dict:
-            if return_fields_list:
-                for field in return_fields_list:
-                    tmp = {}
-                    Create 
-                    try:
-                        tmp[field] = site_dict[site_filter_name][field]
-                    except KeyError:
-                        logger.error("GetSites KeyError %s "%(field))
-                        return None
-                return_site_list.append(tmp)
-            else:
-                return_site_list.append( site_dict[site_filter_name])
-            
-
-        return return_site_list
-        
-
-    def GetSlices(self, slice_filter = None, slice_filter_type = None, \
-                                            return_fields_list=None):
-        return_slice_list = []
-        slicerec  = {}
-        rec = {}
-        authorized_filter_types_list = ['slice_hrn', 'record_id_user']
-        print>>sys.stderr,"\r\n SLABDRIVER \tGetSlices authorized_filter_types_list %s" %(authorized_filter_types_list)
-        if slice_filter_type in authorized_filter_types_list:
-            if slice_filter_type == 'slice_hrn':
-                slicerec = slab_dbsession.query(SliceSenslab).\
-                                    filter_by(slice_hrn = slice_filter).first()
-                                        
-            if slice_filter_type == 'record_id_user':
-                slicerec = slab_dbsession.query(SliceSenslab).\
-                                filter_by(record_id_user = slice_filter).first()
-                
-            if slicerec:
-                rec = slicerec.dump_sqlalchemyobj_to_dict()
-                print>>sys.stderr,"\r\n SLABDRIVER \tGetSlices rec %s" %(rec)
-                #Get login 
-                login = slicerec.slice_hrn.split(".")[1].split("_")[0]
-                logger.debug("\r\n SLABDRIVER \tGetSlices login %s slice record %s"\
-                                                                %(login,rec))
-                if slicerec.oar_job_id is not -1:
-                    #Check with OAR the status of the job if a job id is in 
-                    #the slice record 
-                    #rslt = self.GetJobsResources(slicerec.oar_job_id,username = login)
-                    rslt = self.GetJobsId(slicerec.oar_job_id,username = login)
-                    if rslt :
-                        rec.update(rslt)
-                        rec.update({'hrn':str(rec['slice_hrn'])})
-                        #If GetJobsResources is empty, this means the job is now in the 'Terminated' state
-                        #Update the slice record
-                    else :
-                        self.db.update_job(slice_filter, job_id = -1)
-                        rec['oar_job_id'] = -1
-                        rec.update({'hrn':str(rec['slice_hrn'])})
-            
-                try:
-                    rec['node_ids'] = rec['node_list']
-                except KeyError:
-                    pass
-                
-                #print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY  GetSlices  rec  %s" %(rec)
-                              
-            return rec
-                
-                
-        else:
-            return_slice_list = slab_dbsession.query(SliceSenslab).all()
-
-        print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY  GetSlices  slices %s slice_filter %s " %(return_slice_list,slice_filter)
-        
-        #if return_fields_list:
-            #return_slice_list  = parse_filter(sliceslist, slice_filter,'slice', return_fields_list)
-        
-        
-                    
-        return return_slice_list
-        
-
-        
-    
-    def testbed_name (self): return "senslab2" 
-         
-    # 'geni_request_rspec_versions' and 'geni_ad_rspec_versions' are mandatory
-    def aggregate_version (self):
-        version_manager = VersionManager()
-        ad_rspec_versions = []
-        request_rspec_versions = []
-        for rspec_version in version_manager.versions:
-            if rspec_version.content_type in ['*', 'ad']:
-                ad_rspec_versions.append(rspec_version.to_dict())
-            if rspec_version.content_type in ['*', 'request']:
-                request_rspec_versions.append(rspec_version.to_dict()) 
-        return {
-            'testbed':self.testbed_name(),
-            'geni_request_rspec_versions': request_rspec_versions,
-            'geni_ad_rspec_versions': ad_rspec_versions,
-            }
-          
-          
-          
-          
-          
-          
-    ##
-    # Convert SFA fields to PLC fields for use when registering up updating
-    # registry record in the PLC database
-    #
-    # @param type type of record (user, slice, ...)
-    # @param hrn human readable name
-    # @param sfa_fields dictionary of SFA fields
-    # @param slab_fields dictionary of PLC fields (output)
-
-    def sfa_fields_to_slab_fields(self, type, hrn, record):
-
-        def convert_ints(tmpdict, int_fields):
-            for field in int_fields:
-                if field in tmpdict:
-                    tmpdict[field] = int(tmpdict[field])
-
-        slab_record = {}
-        #for field in record:
-        #    slab_record[field] = record[field]
-        if type == "slice":
-            #instantion used in get_slivers ? 
-            if not "instantiation" in slab_record:
-                slab_record["instantiation"] = "senslab-instantiated"
-            slab_record["hrn"] = hrn_to_pl_slicename(hrn)
-            print >>sys.stderr, "\r\n \r\n \t SLABDRIVER.PY sfa_fields_to_slab_fields slab_record %s hrn_to_pl_slicename(hrn) hrn %s " %(slab_record['hrn'], hrn)
-           if "url" in record:
-               slab_record["url"] = record["url"]
-           if "description" in record:
-               slab_record["description"] = record["description"]
-           if "expires" in record:
-               slab_record["expires"] = int(record["expires"])
-                
-        #nodes added by OAR only and then imported to SFA
-        #elif type == "node":
-            #if not "hostname" in slab_record:
-                #if not "hostname" in record:
-                    #raise MissingSfaInfo("hostname")
-                #slab_record["hostname"] = record["hostname"]
-            #if not "model" in slab_record:
-                #slab_record["model"] = "geni"
-                
-        #One authority only 
-        #elif type == "authority":
-            #slab_record["login_base"] = hrn_to_slab_login_base(hrn)
-
-            #if not "name" in slab_record:
-                #slab_record["name"] = hrn
-
-            #if not "abbreviated_name" in slab_record:
-                #slab_record["abbreviated_name"] = hrn
-
-            #if not "enabled" in slab_record:
-                #slab_record["enabled"] = True
-
-            #if not "is_public" in slab_record:
-                #slab_record["is_public"] = True
-
-        return slab_record
-
-                   
-    def LaunchExperimentOnOAR(self,  slice_dict, added_nodes, slice_user=None):
-       
-        site_list = []
-        nodeid_list =[]
-        resource = ""
-        reqdict = {}
-        slice_name = slice_dict['name']
-        try:
-            slot = slice_dict['timeslot'] 
-            logger.debug("SLABDRIVER.PY \tLaunchExperimentOnOAR slot %s" %(slot))
-        except KeyError:
-            #Running on default parameters
-            #XP immediate , 10 mins
-            slot = {'date':None,'start_time':None, 'timezone':None,'duration':None }#10 min 
-        
-        reqdict['workdir']= '/tmp'   
-        reqdict['resource'] ="{network_address in ("   
-        #reqdict['property'] ="network_address in ("
-        for node in added_nodes: 
-            print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR  node %s" %(node)
-
-            #Get the ID of the node : remove the root auth and put the site in a separate list
-            #s=node.split(".")
-            # NT: it's not clear for me if the nodenames will have the senslab prefix
-            # so lets take the last part only, for now.
-            #lastpart=s[-1]
-            #if s[0] == self.root_auth :
-            # Again here it's not clear if nodes will be prefixed with <site>_, lets split and tanke the last part for now.
-            #s=lastpart.split("_")
-            #nodeid=s[-1]
-            nodeid = node
-            reqdict['resource'] += "'"+ nodeid +"', "
-            nodeid_list.append(nodeid)
-
-
-        reqdict['resource'] =  reqdict['resource'][0: len( reqdict['resource'])-2] +")}/nodes=" + str(len(nodeid_list))
-        if slot['duration']:
-            walltime = slot['duration'].split(":")
-            # Fixing the walltime by adding a few delays. First put the walltime in seconds
-            # oarAdditionalDelay = 20; additional delay for /bin/sleep command to
-            # take in account  prologue and epilogue scripts execution
-            # int walltimeAdditionalDelay = 120;  additional delay
-
-            desired_walltime =  int(walltime[0])*3600 + int(walltime[1]) * 60 + int(walltime[2])
-            total_walltime = desired_walltime + 140 #+2 min 20
-            sleep_walltime = desired_walltime + 20 #+20 sec
-            print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR desired_walltime %s  total_walltime %s sleep_walltime %s  " %(desired_walltime,total_walltime,sleep_walltime)
-            #Put the walltime back in str form
-            #First get the hours
-            walltime[0] = str(total_walltime / 3600)
-            total_walltime = total_walltime - 3600 * int(walltime[0])
-            #Get the remaining minutes
-            walltime[1] = str(total_walltime / 60)
-            total_walltime =  total_walltime - 60 * int(walltime[1])
-            #Get the seconds
-            walltime[2] = str(total_walltime)
-            print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR  walltime %s " %(walltime)
-
-            reqdict['resource']+= ",walltime=" + str(walltime[0]) + ":" + str(walltime[1]) + ":" + str(walltime[2]) 
-            reqdict['script_path'] = "/bin/sleep " + str(sleep_walltime)
-        else:
-            reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20
-            reqdict['script_path'] = "/bin/sleep 620" #+20 sec    
-        #In case of a scheduled experiment (not immediate)
-        #To run an XP immediately, don't specify date and time in RSpec 
-        #They will be set to None. 
-        server_timestamp,server_tz = self.GetTimezone()
-        if slot['date'] and slot['start_time']:
-            if slot['timezone'] is '' or slot['timezone'] is None:
-                #assume it is server timezone
-                from_zone=tz.gettz(server_tz) 
-                print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR  timezone not specified  server_tz %s from_zone  %s" %(server_tz,from_zone) 
-            else:
-                #Get zone of the user from the reservation time given in the rspec
-                from_zone = tz.gettz(slot['timezone'])  
-                   
-            date = str(slot['date'])  + " " + str(slot['start_time'])
-            user_datetime = datetime.strptime(date, self.time_format)
-            user_datetime = user_datetime.replace(tzinfo = from_zone)
-            
-            #Convert to server zone
-            #to_zone = tz.tzutc()
-            to_zone = tz.gettz(server_tz)
-            reservation_date = user_datetime.astimezone(to_zone)
-            #Readable time accpeted by OAR
-            reqdict['reservation']= reservation_date.strftime(self.time_format)
-        
-            print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR  reqdict['reservation'] %s " %(reqdict['reservation'])
-            
-        else:
-            # Immediate XP
-            # reservations are performed in the oar server timebase, so :
-            # 1- we get the server time(in UTC tz )/server timezone
-            # 2- convert the server UTC time in its timezone
-            # 3- add a custom delay to this time
-            # 4- convert this time to a readable form and it for the reservation request.
-            server_timestamp,server_tz = self.GetTimezone()
-            s_tz=tz.gettz(server_tz)
-            UTC_zone = tz.gettz("UTC")
-            #weird... datetime.fromtimestamp should work since we do from datetime import datetime
-            utc_server= datetime.fromtimestamp(float(server_timestamp)+20,UTC_zone)
-            server_localtime=utc_server.astimezone(s_tz)
-    
-            print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR server_timestamp %s server_tz %s slice_name %s added_nodes %s username %s reqdict %s " %(server_timestamp,server_tz,slice_name,added_nodes,slice_user, reqdict )
-            readable_time = server_localtime.strftime(self.time_format)
-
-            print >>sys.stderr,"  \r\n \r\n \t\t\t\tAPRES ParseTimezone readable_time %s timestanp %s  " %(readable_time ,server_timestamp)
-            reqdict['reservation'] = readable_time
-        
-
-        reqdict['type'] = "deploy" 
-        reqdict['directory']= ""
-        reqdict['name']= "TestSandrine"
-       
-         
-        # first step : start the OAR job and update the job 
-        logger.debug("SLABDRIVER.PY \tLaunchExperimentOnOAR reqdict   %s \r\n site_list   %s"  %(reqdict,site_list) )  
-       
-        answer = self.oar.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user)
-        print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR jobid   %s "  %(answer)
-        try:       
-            jobid = answer['id']
-        except KeyError:
-             print>>sys.stderr, "\r\n AddSliceTonode Impossible to create job  %s "  %( answer)
-             return
-        
-        print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR jobid    %s added_nodes  %s slice_user %s"  %(jobid,added_nodes,slice_user)
-        self.db.update_job( slice_name, jobid ,added_nodes)
-        
-          
-        # second step : configure the experiment
-        # we need to store the nodes in a yaml (well...) file like this :
-        # [1,56,23,14,45,75] with name /tmp/sfa<jobid>.json
-        f=open('/tmp/sfa/'+str(jobid)+'.json','w')
-        f.write('[')
-        f.write(str(added_nodes[0].strip('node')))
-        for node in added_nodes[1:len(added_nodes)] :
-            f.write(','+node.strip('node'))
-        f.write(']')
-        f.close()
-        
-        # third step : call the senslab-experiment wrapper
-        #command= "java -jar target/sfa-1.0-jar-with-dependencies.jar "+str(jobid)+" "+slice_user
-        javacmdline="/usr/bin/java"
-        jarname="/opt/senslabexperimentwrapper/sfa-1.0-jar-with-dependencies.jar"
-        #ret=subprocess.check_output(["/usr/bin/java", "-jar", ", str(jobid), slice_user])
-        output = subprocess.Popen([javacmdline, "-jar", jarname, str(jobid), slice_user],stdout=subprocess.PIPE).communicate()[0]
-
-        print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR wrapper returns   %s "  %(output)
-        return 
-                 
-    #Delete the jobs and updates the job id in the senslab table
-    #to set it to -1  
-    #Does not clear the node list 
-    def DeleteSliceFromNodes(self, slice_record):
-         # Get user information
-       
-        self.DeleteJobs(slice_record['oar_job_id'], slice_record['hrn'])
-        self.db.update_job(slice_record['hrn'], job_id = -1)
-        return   
-    
-
-            
-    def augment_records_with_testbed_info (self, sfa_records):
-        return self.fill_record_info (sfa_records)
-    
-    def fill_record_info(self, record_list):
-        """
-        Given a SFA record, fill in the senslab specific and SFA specific
-        fields in the record. 
-        """
-                    
-        logger.debug("SLABDRIVER \tfill_record_info records %s " %(record_list))
-        if not isinstance(record_list, list):
-            record_list = [record_list]
             
-        try:
-            for record in record_list:
-                #If the record is a SFA slice record, then add information 
-                #about the user of this slice. This kind of information is in the 
-                #Senslab's DB.
-                if str(record['type']) == 'slice':
-                    #Get slab slice record.
-                    recslice = self.GetSlices(slice_filter = \
-                                                str(record['hrn']),\
-                                                slice_filter_type = 'slice_hrn')
-                    recuser = dbsession.query(RegRecord).filter_by(record_id = \
-                                            recslice['record_id_user']).first()
-                    logger.debug( "SLABDRIVER.PY \t fill_record_info SLICE \
-                                                rec %s \r\n \r\n" %(recslice)) 
-                    record.update({'PI':[recuser.hrn],
-                            'researcher': [recuser.hrn],
-                            'name':record['hrn'], 
-                            'oar_job_id':recslice['oar_job_id'],
-                            'node_ids': [],
-                            'person_ids':[recslice['record_id_user']],
-                            'geni_urn':'',  #For client_helper.py compatibility
-                            'keys':'',  #For client_helper.py compatibility
-                            'key_ids':''})  #For client_helper.py compatibility
-                    
-                elif str(record['type']) == 'user':
-                    #The record is a SFA user record.
-                    #Get the information about his slice from Senslab's DB
-                    #and add it to the user record.
-                    recslice = self.GetSlices(slice_filter = \
-                                            record['record_id'],\
-                                            slice_filter_type = 'record_id_user')
-                                            
-                    logger.debug( "SLABDRIVER.PY \t fill_record_info user \
-                                                rec %s \r\n \r\n" %(recslice)) 
-                    #Append slice record in records list, 
-                    #therefore fetches user and slice info again(one more loop)
-                    #Will update PIs and researcher for the slice
-                    recuser = dbsession.query(RegRecord).filter_by(record_id = \
-                                                 recslice['record_id_user']).first()
-                    recslice.update({'PI':[recuser.hrn],
-                    'researcher': [recuser.hrn],
-                    'name':record['hrn'], 
-                    'oar_job_id':recslice['oar_job_id'],
-                    'node_ids': [],
-                    'person_ids':[recslice['record_id_user']]})
-
-                    #GetPersons takes [] as filters 
-                    #user_slab = self.GetPersons([{'hrn':recuser.hrn}])
-                    user_slab = self.GetPersons([record])
-    
-                    recslice.update({'type':'slice','hrn':recslice['slice_hrn']})
-                    record.update(user_slab[0])
-                    #For client_helper.py compatibility
-                    record.update( { 'geni_urn':'',
-                    'keys':'',
-                    'key_ids':'' })                
-                    record_list.append(recslice)
-                    
-                    logger.debug("SLABDRIVER.PY \tfill_record_info ADDING SLICE\
-                                INFO TO USER records %s" %(record_list)) 
-                        
-
-        except TypeError,e:
-            logger.log_exc("SLABDRIVER \t fill_record_info  EXCEPTION %s" %(e))
-       
-        return
-        
-        #self.fill_record_slab_info(records)
-       ##print >>sys.stderr, "\r\n \t\t after fill_record_slab_info %s" %(records)     
-        #self.fill_record_sfa_info(records)
-       #print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info"
-       
-        
-
-    
-        
-    #def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
-        ## get a list of the HRNs tht are members of the old and new records
-        #if oldRecord:
-            #oldList = oldRecord.get(listName, [])
-        #else:
-            #oldList = []     
-        #newList = record.get(listName, [])
-
-        ## if the lists are the same, then we don't have to update anything
-        #if (oldList == newList):
-            #return
-
-        ## build a list of the new person ids, by looking up each person to get
-        ## their pointer
-        #newIdList = []
-        #table = SfaTable()
-        #records = table.find({'type': 'user', 'hrn': newList})
-        #for rec in records:
-            #newIdList.append(rec['pointer'])
-
-        ## build a list of the old person ids from the person_ids field 
-        #if oldRecord:
-            #oldIdList = oldRecord.get("person_ids", [])
-            #containerId = oldRecord.get_pointer()
-        #else:
-            ## if oldRecord==None, then we are doing a Register, instead of an
-            ## update.
-            #oldIdList = []
-            #containerId = record.get_pointer()
-
-    ## add people who are in the new list, but not the oldList
-        #for personId in newIdList:
-            #if not (personId in oldIdList):
-                #addFunc(self.plauth, personId, containerId)
-
-        ## remove people who are in the old list, but not the new list
-        #for personId in oldIdList:
-            #if not (personId in newIdList):
-                #delFunc(self.plauth, personId, containerId)
-
-    #def update_membership(self, oldRecord, record):
-        #print >>sys.stderr, " \r\n \r\n ***SLABDRIVER.PY update_membership record ", record
-        #if record.type == "slice":
-            #self.update_membership_list(oldRecord, record, 'researcher',
-                                        #self.users.AddPersonToSlice,
-                                        #self.users.DeletePersonFromSlice)
-        #elif record.type == "authority":
-            ## xxx TODO
-            #pass
-
-### thierry
-# I don't think you plan on running a component manager at this point
-# let me clean up the mess of ComponentAPI that is deprecated anyways