From 20179b1f0b991a2bac449298a16d0f953a677940 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 23 Oct 2012 15:55:07 +0200 Subject: [PATCH] Removing verify_slice_nodes from create_sliver because it deletes modified leases, which is already done in verify_slice_leases. --- sfa/senslab/slabdriver.py | 2 +- sfa/senslab/slabslices.py | 4 ++-- sfa/senslab/tests/TestSuite.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index d683e1fa..c5e7a787 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -209,7 +209,7 @@ class SlabDriver(Driver): requested_slivers %s listnodes %s" \ %(requested_slivers,l)) #verify_slice_nodes returns nodes, but unused here. Removed SA 13/08/12. - slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) + #slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) # add/remove leases requested_lease_list = [] diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py index 51379c29..ae9880de 100644 --- a/sfa/senslab/slabslices.py +++ b/sfa/senslab/slabslices.py @@ -163,7 +163,7 @@ class SlabSlices: if reschedule_jobs_dict : - for start_time in reschedule : + for start_time in reschedule_jobs_dict: job = reschedule_jobs_dict[start_time] self.driver.AddLeases(job['hostname'], \ sfa_slice, int(job['start_time']), \ @@ -186,7 +186,7 @@ class SlabSlices: #added_nodes = list(set(requested_slivers).\ #difference(current_slivers)) - #Update the table with the nodes that populate the slice + logger.debug("SLABSLICES \tverify_slice_nodes slice %s\ \r\n \r\n deleted_nodes %s"\ %(sfa_slice, deleted_nodes)) diff --git a/sfa/senslab/tests/TestSuite.py b/sfa/senslab/tests/TestSuite.py index 177eaf70..910266b1 100644 --- a/sfa/senslab/tests/TestSuite.py +++ b/sfa/senslab/tests/TestSuite.py @@ -199,12 +199,14 @@ def get_stuff(oar, uri): -def TestOAR(job_id ): +def TestOAR(job_id = None): if isinstance(job_id,list) and len(job_id) == 1: job_id = job_id[0] - print " JOB ID : " ,job_id + if job_id is None : + job_id = 1 + oar = OARrestapi() jobs = oar.parser.SendRequest("GET_reserved_nodes", username = 'avakian') print "\r\n OAR GET_reserved_nodes ",jobs -- 2.43.0