git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e7a41f
)
Propagating clast changes.
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Thu, 17 Oct 2013 13:40:08 +0000
(15:40 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Wed, 23 Oct 2013 13:12:53 +0000
(15:12 +0200)
sfa/iotlab/iotlabapi.py
patch
|
blob
|
history
diff --git
a/sfa/iotlab/iotlabapi.py
b/sfa/iotlab/iotlabapi.py
index
de5d00d
..
4f8bcfe
100644
(file)
--- a/
sfa/iotlab/iotlabapi.py
+++ b/
sfa/iotlab/iotlabapi.py
@@
-11,7
+11,7
@@
from sfa.util.sfalogging import logger
from sfa.storage.alchemy import dbsession
from sqlalchemy.orm import joinedload
from sfa.storage.model import RegRecord, RegUser, RegSlice, RegKey
from sfa.storage.alchemy import dbsession
from sqlalchemy.orm import joinedload
from sfa.storage.model import RegRecord, RegUser, RegSlice, RegKey
-from sfa.iotlab.iotlabpostgres import TestbedAdditionalSfaDB,
Testbed
XP
+from sfa.iotlab.iotlabpostgres import TestbedAdditionalSfaDB,
LeaseTable
XP
from sfa.iotlab.OARrestapi import OARrestapi
from sfa.iotlab.LDAPapi import LDAPapi
from sfa.iotlab.OARrestapi import OARrestapi
from sfa.iotlab.LDAPapi import LDAPapi
@@
-836,7
+836,7
@@
class IotlabTestbedAPI():
logger.debug("IOTLAB_API \r\n \r\n \t AddLeases %s %s %s " \
%(type(slice_record['hrn']), type(job_id), type(end_time)))
logger.debug("IOTLAB_API \r\n \r\n \t AddLeases %s %s %s " \
%(type(slice_record['hrn']), type(job_id), type(end_time)))
- iotlab_ex_row =
Testbed
XP(slice_hrn = slice_record['hrn'], job_id=job_id,
+ iotlab_ex_row =
LeaseTable
XP(slice_hrn = slice_record['hrn'], job_id=job_id,
end_time= end_time)
logger.debug("IOTLAB_API \r\n \r\n \t AddLeases iotlab_ex_row %s" \
end_time= end_time)
logger.debug("IOTLAB_API \r\n \r\n \t AddLeases iotlab_ex_row %s" \
@@
-911,7
+911,7
@@
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.testbed_session.query(
TestbedXP).filter(Testbed
XP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch')
+ # self.iotlab_db.testbed_session.query(
LeaseTableXP).filter(LeaseTable
XP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch')
# self.iotlab_db.testbed_session.commit()
# return
# self.iotlab_db.testbed_session.commit()
# return
@@
-971,7
+971,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.testbed_session.query(
Testbed
XP).all()
+ jobs_psql_query = self.iotlab_db.testbed_session.query(
LeaseTable
XP).all()
jobs_psql_dict = dict([(row.job_id, row.__dict__)
for row in jobs_psql_query])
#jobs_psql_dict = jobs_psql_dict)
jobs_psql_dict = dict([(row.job_id, row.__dict__)
for row in jobs_psql_query])
#jobs_psql_dict = jobs_psql_dict)