From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 2 Dec 2009 03:43:37 +0000 (+0000)
Subject: dont forget to pass caller_cred to get_rspec()
X-Git-Tag: sfa-0.9-7~214
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3fdaacab241d4ea1113c767dd3ca8538688fdab5;p=sfa.git

dont forget to pass caller_cred to get_rspec()
---

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 68fd9f5d..97fa73c7 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -77,9 +77,9 @@ def get_slices(api):
     return slices['hrn']
      
  
-def get_rspec(api, hrn=None):
+def get_rspec(api, hrn=None, caller_cred=None):
     from sfa.plc.nodes import Nodes
-    nodes = Nodes(api)
+    nodes = Nodes(api, caller_cred=caller_cred)
     if hrn:
         rspec = nodes.get_rspec(hrn)
     else:
diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index c2c58066..b921b8aa 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -162,9 +162,9 @@ def get_slices(api):
     slices.refresh()
     return slices['hrn']
      
-def get_rspec(api, hrn=None):
+def get_rspec(api, hrn=None, caller_cred=None):
     from sfa.plc.nodes import Nodes
-    nodes = Nodes(api)
+    nodes = Nodes(api, caller_cred=caller_cred)
     if hrn:
         rspec = nodes.get_rspec(hrn)
     else:
diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index c4309711..5e705daf 100644
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -59,13 +59,13 @@ class get_resources(Method):
             mgr_type = self.api.config.SFA_AGGREGATE_TYPE
             manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
             manager = __import__(manager_module, fromlist=[manager_base])
-            rspec = manager.get_rspec(self.api, hrn)
+            rspec = manager.get_rspec(self.api, hrn, caller_cred)
             outgoing_rules = SFATablesRules('OUTGOING')
         elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manager_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, fromlist=[manager_base])
-            rspec = manager.get_rspec(self.api, hrn)
+            rspec = manager.get_rspec(self.api, hrn, caller_cred)
             outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
 
         filtered_rspec = rspec
diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py
index a8e0b60c..e36e16f1 100644
--- a/sfa/plc/nodes.py
+++ b/sfa/plc/nodes.py
@@ -117,7 +117,7 @@ class Nodes(SimpleStorage):
                 caller_cred = self.caller_cred
                 # get the rspec from the aggregate
                 try:
-		    request_hash=None
+            	    request_hash=None
                     agg_rspec = aggregates[aggregate].get_resources(credential, hrn, request_hash, caller_cred)
                 except:
                     arg_list = [credential, hrn]