passing the hrn of the initial caller instead of its credentail

[sfa.git] / sfa / methods / get_resources.py

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 0a39911..399f0e8 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -35,7 +35,7 @@ class get_resources(Method):
 
     returns = Parameter(str, "String representatin of an rspec")
     
-    def call(self, cred, hrn=None, request_hash = None, caller_cred=None):
+    def call(self, cred, hrn=None, request_hash = None, origin_hrn=None):
         sfa_aggregate_type = Config().get_aggregate_rspec_type()
 
         # This cred will be an authority cred, not a user, so we cant use it to 
@@ -45,35 +45,33 @@ class get_resources(Method):
         client_gid_str = client_gid.save_to_string(save_parents=True)
         self.api.auth.authenticateGid(client_gid_str, [cred,hrn], request_hash)
         self.api.auth.check(cred, 'listnodes')
-        if caller_cred==None:
-            caller_cred=cred
+        if origin_hrn==None:
+            origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
 
         #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
 
-        # This code needs to be cleaned up so that 'pl' is treated as just another RSpec manager.
-        # The change ought to be straightforward as soon as we define PL's new RSpec.
 
-        rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type,
-                                   fromlist = ["sfa.rspecs.aggregates"])
-        if (sfa_aggregate_type == 'pl'):
-            nodes = Nodes(self.api, caller_cred=caller_cred)
-            if hrn:
-                rspec = nodes.get_rspec(hrn)
-            else:
-                nodes.refresh()
-                rspec = nodes['rspec']
-        else:
-            rspec = rspec_manager.get_rspec(self.api, hrn)
 
-        # Filter the outgoing rspec using sfatables
-        outgoing_rules = SFATablesRules('OUTGOING')
+        # send the call to the right manager
+        manager_base = 'sfa.managers'
+        if self.api.interface in ['aggregate']:
+            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, origin_hrn)
+            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, origin_hrn)
+            outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
 
-        request_context = rspec_manager.fetch_context(
-            hrn,
-            Credential(string=caller_cred).get_gid_caller().get_hrn(),
-            outgoing_rules.contexts)
-        outgoing_rules.set_context(request_context)
-        filtered_rspec = outgoing_rules.apply(rspec)
+        filtered_rspec = rspec
+        if outgoing_rules.sorted_rule_list:
+           request_context = manager.fetch_context(hrn, origin_hrn, outgoing_rules.contexts)
+           outgoing_rules.set_context(request_context)
+           filtered_rspec = outgoing_rules.apply(rspec)
 
         return filtered_rspec