git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renaming variable holding a reference to the iotlab database.
[sfa.git]
/
sfa
/
iotlab
/
iotlabshell.py
diff --git
a/sfa/iotlab/iotlabshell.py
b/sfa/iotlab/iotlabshell.py
index
579f98b
..
f1efa73
100644
(file)
--- 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
"""
: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"
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))
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))
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 = []
#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)
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
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))
logger.debug(" IOTLAB_API.PY \tGetLeases reservation_list %s"
% (reservation_list))
@@
-1099,8
+1099,8
@@
class IotlabShell():
#"""
##new_row = FederatedToIotlab(iotlab_hrn, federated_hrn)
#"""
##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
#logger.debug("IOTLAB_API UpdatePerson EMPTY - DO NOTHING \r\n ")
#return