From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 12 Nov 2013 10:18:48 +0000 (+0100)
Subject: Apply dbsession changes on Nitos driver
X-Git-Tag: sfa-3.1-1~42^2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1f6bb6c3db30a471ec13aaf6c4ffc722e35f21d2;p=sfa.git

Apply dbsession changes on Nitos driver
---

diff --git a/sfa/nitos/nitosdriver.py b/sfa/nitos/nitosdriver.py
index da35ca35..40db2a70 100644
--- a/sfa/nitos/nitosdriver.py
+++ b/sfa/nitos/nitosdriver.py
@@ -11,7 +11,6 @@ from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_hrn
 from sfa.util.cache import Cache
 
 # one would think the driver should not need to mess with the SFA db, but..
-from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord
 
 # used to be used in get_ticket
@@ -46,8 +45,9 @@ class NitosDriver (Driver):
     # the cache instance is a class member so it survives across incoming requests
     cache = None
 
-    def __init__ (self, config):
-        Driver.__init__ (self, config)
+    def __init__ (self, api):
+        Driver.__init__ (self, api)
+        config = api.config
         self.shell = NitosShell (config)
         self.cache=None
         self.testbedInfo = self.shell.getTestbedInfo()
@@ -367,7 +367,7 @@ class NitosDriver (Driver):
         
         # get the registry records
         user_list, users = [], {}
-        user_list = dbsession.query(RegRecord).filter(RegRecord.pointer.in_(user_ids)).all()
+        user_list = self.api.dbsession().query(RegRecord).filter(RegRecord.pointer.in_(user_ids)).all()
         # create a hrns keyed on the sfa record's pointer.
         # Its possible for multiple records to have the same pointer so
         # the dict's value will be a list of hrns.