From 6ceac9cf32e5c1035792324562f283646f0cac49 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 14 Nov 2013 14:42:56 +0100 Subject: [PATCH] bug fix in iotlabdriver. cleaning in iotlabshell. --- sfa/iotlab/iotlabdriver.py | 14 +++++++------- sfa/iotlab/iotlabshell.py | 24 ------------------------ 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py index e5b79c68..a5703d4b 100644 --- a/sfa/iotlab/iotlabdriver.py +++ b/sfa/iotlab/iotlabdriver.py @@ -396,25 +396,25 @@ class IotlabDriver(Driver): """ - requested_job_dict = {} + requested_xp_dict = {} for lease in requested_lease_list: #In case it is an asap experiment start_time is empty if lease['start_time'] == '': lease['start_time'] = '0' - if lease['start_time'] not in requested_job_dict: + if lease['start_time'] not in requested_xp_dict: if isinstance(lease['hostname'], str): lease['hostname'] = [lease['hostname']] - requested_job_dict[lease['start_time']] = lease + requested_xp_dict[lease['start_time']] = lease else: - job_lease = requested_job_dict[lease['start_time']] + job_lease = requested_xp_dict[lease['start_time']] if lease['duration'] == job_lease['duration']: job_lease['hostname'].append(lease['hostname']) - return requested_job_dict + return requested_xp_dict def _process_requested_xp_dict(self, rspec): """ @@ -514,11 +514,11 @@ class IotlabDriver(Driver): requested_xp_dict = self._process_requested_xp_dict(rspec) logger.debug("IOTLABDRIVER.PY \tcreate_sliver requested_xp_dict %s " - % (requested_job_dict)) + % (requested_xp_dict)) #verify_slice_leases returns the leases , but the return value is unused #here. Removed SA 13/08/12 slices.verify_slice_leases(sfa_slice, - requested_job_dict, peer) + requested_xp_dict, peer) return aggregate.get_rspec(slice_xrn=slice_urn, login=sfa_slice['login'], diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py index 8dd4d650..1bed89c8 100644 --- a/sfa/iotlab/iotlabshell.py +++ b/sfa/iotlab/iotlabshell.py @@ -897,30 +897,6 @@ class IotlabShell(): return self.grain - # @staticmethod - # def update_experiments_in_additional_sfa_db( job_oar_list, jobs_psql): - # """ Cleans the iotlab db by deleting expired and cancelled jobs. - # Compares the list of job ids given by OAR with the job ids that - # are already in the database, deletes the jobs that are no longer in - # the OAR job id list. - # :param job_oar_list: list of job ids coming from OAR - # :type job_oar_list: list - # :param job_psql: list of job ids cfrom the database. - # type job_psql: list - # """ - # #Turn the list into a set - # set_jobs_psql = set(jobs_psql) - - # kept_jobs = set(job_oar_list).intersection(set_jobs_psql) - # logger.debug ( "\r\n \t\ update_experiments_in_additional_sfa_db jobs_psql %s \r\n \t \ - # job_oar_list %s kept_jobs %s "%(set_jobs_psql, job_oar_list, kept_jobs)) - # deleted_jobs = set_jobs_psql.difference(kept_jobs) - # deleted_jobs = list(deleted_jobs) - # if len(deleted_jobs) > 0: - # self.iotlab_db.testbed_session.query(LeaseTableXP).filter(LeaseTableXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch') - # self.iotlab_db.testbed_session.commit() - - # return @staticmethod def filter_lease_name(reservation_list, filter_value): -- 2.43.0