From 2519bc206096d403aae87c1c8f4b351d4e16e444 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 14 Nov 2013 16:26:12 +0100 Subject: [PATCH] Renaming variable holding a reference to the iotlab database. --- sfa/cortexlab/cortexlabshell.py | 18 +++++++++--------- sfa/importer/iotlabimporter.py | 6 +++--- sfa/iotlab/iotlabshell.py | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sfa/cortexlab/cortexlabshell.py b/sfa/cortexlab/cortexlabshell.py index 4ce16ee6..d0f58346 100644 --- a/sfa/cortexlab/cortexlabshell.py +++ b/sfa/cortexlab/cortexlabshell.py @@ -37,7 +37,7 @@ class CortexlabShell(): :param config: configuration object from sfa.util.config :type config: Config object """ - self.cortexlab_leases_db = TestbedAdditionalSfaDB(config) + self.leases_db = TestbedAdditionalSfaDB(config) self.query_sites = CortexlabQueryNodes() self.ldap = LDAPapi() self.time_format = "%Y-%m-%d %H:%M:%S" @@ -676,8 +676,8 @@ class CortexlabShell(): logger.debug("CORTEXLAB_API \r\n \r\n \t AddLeases testbed_xp_row %s" \ %(testbed_xp_row)) - self.cortexlab_leases_db.testbed_session.add(testbed_xp_row) - self.cortexlab_leases_db.testbed_session.commit() + self.leases_db.testbed_session.add(testbed_xp_row) + self.leases_db.testbed_session.commit() logger.debug("CORTEXLAB_API \t AddLeases hostname_list start_time %s " \ %(start_time)) @@ -774,8 +774,8 @@ class CortexlabShell(): # deleted_jobs = set_jobs_psql.difference(kept_jobs) # deleted_jobs = list(deleted_jobs) # if len(deleted_jobs) > 0: - # self.cortexlab_leases_db.testbed_session.query(LeaseTableXP).filter(LeaseTableXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch') - # self.cortexlab_leases_db.testbed_session.commit() + # self.leases_db.testbed_session.query(LeaseTableXP).filter(LeaseTableXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch') + # self.leases_db.testbed_session.commit() # return @@ -889,7 +889,7 @@ class CortexlabShell(): #the same user in LDAP SA 27/07/12 - db_xp_query = self.cortexlab_leases_db.testbed_session.query(LeaseTableXP).all() + db_xp_query = self.leases_db.testbed_session.query(LeaseTableXP).all() db_xp_dict = dict([(row.experiment_id, row.__dict__) for row in db_xp_query]) @@ -935,7 +935,7 @@ class CortexlabShell(): if lease_filter_dict is None: reservation_list = unfiltered_reservation_list - self.cortexlab_leases_db.update_experiments_in_additional_sfa_db( + self.leases_db.update_experiments_in_additional_sfa_db( testbed_xp_list, db_xp_id_list) logger.debug(" CORTEXLAB_API.PY \tGetLeases reservation_list %s" @@ -1017,8 +1017,8 @@ class CortexlabShell(): #""" ##new_row = FederatedToIotlab(iotlab_hrn, federated_hrn) - ##self.cortexlab_leases_db.testbed_session.add(new_row) - ##self.cortexlab_leases_db.testbed_session.commit() + ##self.leases_db.testbed_session.add(new_row) + ##self.leases_db.testbed_session.commit() #logger.debug("CORTEXLAB_API UpdatePerson EMPTY - DO NOTHING \r\n ") #return diff --git a/sfa/importer/iotlabimporter.py b/sfa/importer/iotlabimporter.py index 74fe76ed..db8246ef 100644 --- a/sfa/importer/iotlabimporter.py +++ b/sfa/importer/iotlabimporter.py @@ -515,11 +515,11 @@ class IotlabImporter: config = Config() iotlabdriver = IotlabDriver(config) - iotlab_db = TestbedAdditionalSfaDB(config) + leases_db = TestbedAdditionalSfaDB(config) #Create special slice table for iotlab - if not iotlab_db.exists('testbed_xp'): - iotlab_db.createtable() + if not leases_db.exists('testbed_xp'): + leases_db.createtable() self.logger.info("IotlabImporter.run: testbed_xp table created ") # import site and node records in site into the SFA db. diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py index 579f98b6..f1efa73f 100644 --- a/sfa/iotlab/iotlabshell.py +++ b/sfa/iotlab/iotlabshell.py @@ -37,7 +37,7 @@ class IotlabShell(): :param config: configuration object from sfa.util.config :type config: Config object """ - self.iotlab_db = TestbedAdditionalSfaDB(config) + self.leases_db = TestbedAdditionalSfaDB(config) self.oar = OARrestapi() self.ldap = LDAPapi() self.time_format = "%Y-%m-%d %H:%M:%S" @@ -845,8 +845,8 @@ class IotlabShell(): logger.debug("IOTLAB_API \r\n \r\n \t AddLeases iotlab_ex_row %s" \ %(iotlab_ex_row)) - self.iotlab_db.testbed_session.add(iotlab_ex_row) - self.iotlab_db.testbed_session.commit() + self.leases_db.testbed_session.add(iotlab_ex_row) + self.leases_db.testbed_session.commit() logger.debug("IOTLAB_API \t AddLeases hostname_list start_time %s " \ %(start_time)) @@ -952,7 +952,7 @@ class IotlabShell(): #the same user in LDAP SA 27/07/12 job_oar_list = [] - jobs_psql_query = self.iotlab_db.testbed_session.query(LeaseTableXP).all() + jobs_psql_query = self.leases_db.testbed_session.query(LeaseTableXP).all() jobs_psql_dict = dict([(row.experiment_id, row.__dict__) for row in jobs_psql_query]) #jobs_psql_dict = jobs_psql_dict) @@ -1018,7 +1018,7 @@ class IotlabShell(): if lease_filter_dict is None: reservation_list = unfiltered_reservation_list - self.iotlab_db.update_experiments_in_additional_sfa_db(job_oar_list, jobs_psql_id_list) + self.leases_db.update_experiments_in_additional_sfa_db(job_oar_list, jobs_psql_id_list) logger.debug(" IOTLAB_API.PY \tGetLeases reservation_list %s" % (reservation_list)) @@ -1099,8 +1099,8 @@ class IotlabShell(): #""" ##new_row = FederatedToIotlab(iotlab_hrn, federated_hrn) - ##self.iotlab_db.testbed_session.add(new_row) - ##self.iotlab_db.testbed_session.commit() + ##self.leases_db.testbed_session.add(new_row) + ##self.leases_db.testbed_session.commit() #logger.debug("IOTLAB_API UpdatePerson EMPTY - DO NOTHING \r\n ") #return -- 2.43.0