From: Sandrine Avakian Date: Mon, 3 Jun 2013 11:38:03 +0000 (+0200) Subject: Bug fix and testing. X-Git-Tag: sfa-2.1-26~8^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cb8d0b4bb0df173849cb41e99bc343481b01786a;p=sfa.git Bug fix and testing. --- diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py index 73c6571b..d995f2bd 100644 --- a/sfa/senslab/slabaggregate.py +++ b/sfa/senslab/slabaggregate.py @@ -173,7 +173,7 @@ class SlabAggregate: slice_nodes_list = [] logger.debug("SLABAGGREGATE api get_nodes slice_nodes_list %s "\ %(slices )) - if slices is not []: + if slices is not None: for one_slice in slices: try: slice_nodes_list = one_slice['node_ids'] diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 20270f7f..de1b42ac 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -416,7 +416,11 @@ class SlabDriver(Driver): :rtype: dictionary """ requested_lease_list = self._get_requested_leases_list(rspec) + logger.debug("SLABDRIVER _process_requested_jobs requested_lease_list \ + %s"%(requested_lease_list)) job_dict = self._group_leases_by_start_time(requested_lease_list) + logger.debug("SLABDRIVER _process_requested_jobs job_dict\ + %s"%(job_dict)) return job_dict