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:
4d9e4e9
)
compute_hash belongs to api.key not api
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 1 Dec 2009 23:44:26 +0000
(23:44 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 1 Dec 2009 23:44:26 +0000
(23:44 +0000)
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
90042f3
..
a002772
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-71,6
+71,8
@@
def create_slice(api, hrn, rspec, caller_cred=None):
tempspec.parseDict(resourceDict)
rspecs[net_hrn] = tempspec.toxml()
tempspec.parseDict(resourceDict)
rspecs[net_hrn] = tempspec.toxml()
+ print "rspecs:", rspecs.keys()
+ print "aggregates:", aggregates.keys()
# send each rspec to the appropriate aggregate/sm
for net_hrn in rspecs:
try:
# send each rspec to the appropriate aggregate/sm
for net_hrn in rspecs:
try:
@@
-102,7
+104,7
@@
def create_slice(api, hrn, rspec, caller_cred=None):
else:
# lets forward this rspec to a sm that knows about the network
arg_list = [credential, net_hrn]
else:
# lets forward this rspec to a sm that knows about the network
arg_list = [credential, net_hrn]
- request_hash = api.compute_hash(arg_list)
+ request_hash = api.
key.
compute_hash(arg_list)
for aggregate in aggregates:
try:
network_found = aggregates[aggregate].get_aggregates(credential, net_hrn)
for aggregate in aggregates:
try:
network_found = aggregates[aggregate].get_aggregates(credential, net_hrn)
@@
-123,7
+125,7
@@
def create_slice(api, hrn, rspec, caller_cred=None):
print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % \
locals()
traceback.print_exc()
print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % \
locals()
traceback.print_exc()
-
return 1
+ return 1
def start_slice(api, hrn, caller_cred=None):
slicename = hrn_to_pl_slicename(hrn)
def start_slice(api, hrn, caller_cred=None):
slicename = hrn_to_pl_slicename(hrn)