From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 15 Nov 2013 13:48:13 +0000 (+0100)
Subject: one remaining staticmethod in iotlabdriver needs dbsession
X-Git-Tag: sfa-3.1-1~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=0d3d092c97cdfb14d61b04cc640466f28a4f42c5;p=sfa.git

one remaining staticmethod in iotlabdriver needs dbsession
updated this one, + comments on how to do this properly
---

diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py
index 910804e2..ef920a56 100644
--- a/sfa/iotlab/iotlabdriver.py
+++ b/sfa/iotlab/iotlabdriver.py
@@ -3,7 +3,6 @@ Implements what a driver should provide for SFA to work.
 """
 from sfa.util.faults import SliverDoesNotExist, UnknownSfaType
 from sfa.util.sfalogging import logger
-from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord
 
 from sfa.managers.driver import Driver
@@ -310,7 +309,11 @@ class IotlabDriver(Driver):
         :rtype: RegUser
 
         """
-        return dbsession.query(RegRecord).filter_by(hrn=hrn).first()
+        # xxx this method should not be static
+        from sfa.storage.alchemy import global_dbsession
+        return global_dbsession.query(RegRecord).filter_by(hrn=hrn).first()
+        # code should read instead (if this method was not static, that is)
+        #return self.api.dbsession().query(RegRecord).filter_by(hrn=hrn).first()
 
     def testbed_name(self):
         """