: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"
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))
# 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
#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])
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"
#"""
##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
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.
: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"
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))
#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)
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))
#"""
##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