git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c731bf
)
ListResources uses sfa.rspecs.sfa_rspec.SfaRSpec
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Apr 2011 02:25:17 +0000
(22:25 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Apr 2011 02:25:17 +0000
(22:25 -0400)
sfa/managers/slice_manager_pl.py
patch
|
blob
|
history
diff --git
a/sfa/managers/slice_manager_pl.py
b/sfa/managers/slice_manager_pl.py
index
7f0a754
..
dc16a05
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-15,6
+15,7
@@
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.record import SfaRecord
from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.record import SfaRecord
+from sfa.rspecs.sfa_rspec import SfaRSpec
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
from sfa.util.sfaticket import *
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
from sfa.util.sfaticket import *
@@
-94,9
+95,11
@@
def CreateSliver(api, xrn, creds, rspec, users, call_id):
server = api.aggregates[aggregate]
threads.run(server.CreateSliver, xrn, credential, rspec, users, call_id)
server = api.aggregates[aggregate]
threads.run(server.CreateSliver, xrn, credential, rspec, users, call_id)
- results = threads.get_results()
- merged_rspec = merge_rspecs(results)
- return merged_rspec
+ results = threads.get_results()
+ rspec = SfaRSpec()
+ for result in results:
+ rspec.merge(result)
+ return rspec
def RenewSliver(api, xrn, creds, expiration_time, call_id):
if Callids().already_handled(call_id): return True
def RenewSliver(api, xrn, creds, expiration_time, call_id):
if Callids().already_handled(call_id): return True
@@
-372,13
+375,15
@@
def ListResources(api, creds, options, call_id):
#threads.run(server.get_resources, cred, xrn, origin_hrn)
results = threads.get_results()
#threads.run(server.get_resources, cred, xrn, origin_hrn)
results = threads.get_results()
- merged_rspec = merge_rspecs(results)
+ rspec = SfaRSpec()
+ for result in results:
+ rspec.merge(result)
# cache the result
if caching and api.cache and not xrn:
# cache the result
if caching and api.cache and not xrn:
- api.cache.add('nodes',
merged_
rspec)
+ api.cache.add('nodes', rspec)
- return
merged_rspec
+ return
rspec.toxml()
# first draft at a merging SliverStatus
def SliverStatus(api, slice_xrn, creds, call_id):
# first draft at a merging SliverStatus
def SliverStatus(api, slice_xrn, creds, call_id):