Removing verify_slice_nodes from create_sliver

because it deletes modified leases, which is already
done in verify_slice_leases.

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index d683e1f..c5e7a78 100644 (file)
--- 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 51379c2..ae9880d 100644 (file)
--- 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 177eaf7..910266b 100644 (file)
--- 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