From da3970fe231f2fe54147a548cb05ad547fc30971 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 16 Jan 2012 17:07:29 +0100 Subject: [PATCH] Fixed problem from merge from master. Added list slice functionnality from sfi.py. Todo : Fix hrn problem when listing slice. --- sfa/senslab/slabaggregate.py | 4 ++-- sfa/senslab/slabdriver.py | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py index 2adf474e..f913df79 100644 --- a/sfa/senslab/slabaggregate.py +++ b/sfa/senslab/slabaggregate.py @@ -28,7 +28,7 @@ from sfa.rspecs.elements.node import Node from sfa.rspecs.version_manager import VersionManager #from sfa.plc.vlink import get_tc_rate -from sfa.util.sfatime import epochparse +from sfa.util.sfatime import datetime_to_epoch def hostname_to_hrn(root_auth,login_base,hostname): return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn() @@ -200,7 +200,7 @@ class SlabAggregate: slice, slivers = self.get_slice_and_slivers(slice_xrn) rspec = RSpec(version=rspec_version, user_options=options) #if slice and 'expires' in slice: - #rspec.xml.set('expires', epochparse(slice['expires'])) + #rspec.xml.set('expires', datetime_to_epoch(slice['expires'])) # add sliver defaults #nodes, links = self.get_nodes_and_links(slice, slivers) nodes = self.get_nodes() diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index b4c3e971..1d6ded8b 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -187,8 +187,8 @@ class SlabDriver(Driver): #return slices # get data from db - slices = self.GetSlices({'peer_id': None}, ['name']) - slice_hrns = [slicename_to_hrn(self.hrn, slice['name']) for slice in slices] + slices = self.GetSlices() + slice_hrns = [slicename_to_hrn(self.hrn, slice['slice_hrn']) for slice in slices] slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns] # cache the result @@ -332,13 +332,9 @@ class SlabDriver(Driver): def GetPeers (self,auth = None, peer_filter=None, return_fields=None): table = SfaTable() return_records = [] - print>>sys.stderr, " \r\n 1GetPeers " records_list = table.findObjects({'type':'authority+sa'}) - print>>sys.stderr, " \r\n 2GetPeers peer_filter %s return_fields %s records_list %s "%(peer_filter,return_fields,records_list) if not peer_filter and not return_fields: - print>>sys.stderr, " \r\n GetPeers pHEYYYYY " return records_list - return_records = parse_filter(records_list,peer_filter, 'peers', return_fields) return return_records @@ -412,14 +408,15 @@ class SlabDriver(Driver): if not (slice_filter or return_fields) and sliceslist: for sl in sliceslist: - if sl['oar_job_id'] is not '-1': + if sl['oar_job_id'] is not -1: + print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices sl %s" %(sl) self.GetJobs( sl['oar_job_id'],resources=False) return_slice_list = sliceslist return return_slice_list return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields) for sl in return_slice_list: - if sl['oar_job_id'] is not '-1': + if sl['oar_job_id'] is not -1: self.GetJobs( sl['oar_job_id'],resources=False) #print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list) return return_slice_list -- 2.43.0