Removing useless prints and correcting attribute in api.

diff --git a/sfa/iotlab/iotlabapi.py b/sfa/iotlab/iotlabapi.py
index dd7300e..82017a0 100644 (file)
--- a/sfa/iotlab/iotlabapi.py
+++ b/sfa/iotlab/iotlabapi.py
@@ -793,8 +793,8 @@ class IotlabTestbedAPI():
 
         logger.debug("IOTLABDRIVER \r\n \r\n \t AddLeases iotlab_ex_row %s" \
                 %(iotlab_ex_row))
 
         logger.debug("IOTLABDRIVER \r\n \r\n \t AddLeases iotlab_ex_row %s" \
                 %(iotlab_ex_row))

-        self.iotlab_db.iotlab_dbsession.add(iotlab_ex_row)
-        self.iotlab_db.iotlab_dbsession.commit()
+        self.iotlab_db.iotlab_session.add(iotlab_ex_row)
+        self.iotlab_db.iotlab_session.commit()

 
         logger.debug("IOTLABDRIVER \t AddLeases hostname_list start_time %s " \
                 %(start_time))
 
         logger.debug("IOTLABDRIVER \t AddLeases hostname_list start_time %s " \
                 %(start_time))


@@ -858,8 +858,8 @@ class IotlabTestbedAPI():
         deleted_jobs = set_jobs_psql.difference(kept_jobs)
         deleted_jobs = list(deleted_jobs)
         if len(deleted_jobs) > 0:
         deleted_jobs = set_jobs_psql.difference(kept_jobs)
         deleted_jobs = list(deleted_jobs)
         if len(deleted_jobs) > 0:

-            self.iotlab_db.iotlab_dbsession.query(IotlabXP).filter(IotlabXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch')
-            self.iotlab_db.iotlab_dbsession.commit()
+            self.iotlab_db.iotlab_session.query(IotlabXP).filter(IotlabXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch')
+            self.iotlab_db.iotlab_session.commit()

 
         return
 
 
         return
 


@@ -890,7 +890,7 @@ class IotlabTestbedAPI():
         #the same user in LDAP SA 27/07/12
         job_oar_list = []
 
         #the same user in LDAP SA 27/07/12
         job_oar_list = []
 

-        jobs_psql_query = self.iotlab_db.iotlab_dbsession.query(IotlabXP).all()
+        jobs_psql_query = self.iotlab_db.iotlab_session.query(IotlabXP).all()

         jobs_psql_dict = dict([(row.job_id, row.__dict__ ) for row in jobs_psql_query ])
         #jobs_psql_dict = jobs_psql_dict)
         logger.debug("IOTLABDRIVER \tGetLeases jobs_psql_dict %s"\
         jobs_psql_dict = dict([(row.job_id, row.__dict__ ) for row in jobs_psql_query ])
         #jobs_psql_dict = jobs_psql_dict)
         logger.debug("IOTLABDRIVER \tGetLeases jobs_psql_dict %s"\


@@ -1018,8 +1018,8 @@ class IotlabTestbedAPI():
 
         #"""
         ##new_row = FederatedToIotlab(iotlab_hrn, federated_hrn)
 
         #"""
         ##new_row = FederatedToIotlab(iotlab_hrn, federated_hrn)

-        ##self.iotlab_db.iotlab_dbsession.add(new_row)
-        ##self.iotlab_db.iotlab_dbsession.commit()
+        ##self.iotlab_db.iotlab_session.add(new_row)
+        ##self.iotlab_db.iotlab_session.commit()

 
         #logger.debug("IOTLABDRIVER UpdatePerson EMPTY - DO NOTHING \r\n ")
         #return
 
         #logger.debug("IOTLABDRIVER UpdatePerson EMPTY - DO NOTHING \r\n ")
         #return

diff --git a/sfa/iotlab/iotlabpostgres.py b/sfa/iotlab/iotlabpostgres.py
index 684ed10..154d970 100644 (file)
--- a/sfa/iotlab/iotlabpostgres.py
+++ b/sfa/iotlab/iotlabpostgres.py
@@ -114,7 +114,6 @@ class IotlabDB(object):
                 (config.SFA_DB_USER, config.SFA_DB_PASSWORD, config.SFA_DB_HOST, \
                                         config.SFA_DB_PORT, IotlabDB._dbname)
 
                 (config.SFA_DB_USER, config.SFA_DB_PASSWORD, config.SFA_DB_HOST, \
                                         config.SFA_DB_PORT, IotlabDB._dbname)
 

-            print "URL", tcp_url , unix_url

             for url in [ unix_url, tcp_url ] :
                 try:
                     self.iotlab_engine = create_engine (url, echo_pool =
             for url in [ unix_url, tcp_url ] :
                 try:
                     self.iotlab_engine = create_engine (url, echo_pool =


@@ -147,7 +146,6 @@ class IotlabDB(object):
             if self.iotlab_session is None:
                 Session = sessionmaker()
                 self.iotlab_session = Session(bind = self.iotlab_engine)
             if self.iotlab_session is None:
                 Session = sessionmaker()
                 self.iotlab_session = Session(bind = self.iotlab_engine)

-                print "\r\n \r\n \r\n OOOOOOOOOHHHHHHHHH YEEEEEEEEEEEEEAH"

             return self.iotlab_session
 
         def close_session(self):
             return self.iotlab_session
 
         def close_session(self):