From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 1 Dec 2009 23:44:26 +0000 (+0000)
Subject: compute_hash belongs to api.key not api
X-Git-Tag: sfa-0.9-7~230
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=06900c8d392c2757552aace9a39c31ef06623a66;p=sfa.git

compute_hash belongs to api.key not api
---

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 90042f3d..a002772f 100644
--- 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()
 
+    print "rspecs:", rspecs.keys()
+    print "aggregates:", aggregates.keys() 
     # 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]
-                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)
@@ -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()
-        return 1
+    return 1
 
 def start_slice(api, hrn, caller_cred=None):
     slicename = hrn_to_pl_slicename(hrn)