X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_resources.py;h=049cbc8b0b946a6f008fc3f737939526a136af3f;hb=6ac7c0f051e2fb64f14ba1dab389986165ce812d;hp=3dd3658f12efd7e8e0869034004fed2f54128cb3;hpb=ace26da65405f3c3c4a950ee0bf64217f0574e25;p=sfa.git

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 3dd3658f..049cbc8b 100644
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -7,8 +7,10 @@ from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.util.config import Config
 from sfa.plc.nodes import Nodes
-# RSpecManager_pl is not used. This is just to resolve issues with the dynamic __import__ that comes later.
+# RSpecManager_pl is not used. This line is a check that ensures that everything is in place for the import to work.
 import sfa.rspecs.aggregates.rspec_manager_pl
+from sfa.trust.credential import Credential
+from sfatables.runtime import SFATablesRules
 
 class get_resources(Method):
     """
@@ -25,24 +27,59 @@ class get_resources(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Mixed(Parameter(str, "Human readable name (hrn)"),
-              Parameter(None, "hrn not specified"))
+              Parameter(None, "hrn not specified")),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified")),
+        Parameter(str, "Callers credential string")
         ]
 
     returns = Parameter(str, "String representatin of an rspec")
     
-    def call(self, cred, hrn=None):
-        sfa_aggregate_type = Config().get_aggregate_rspec_type()=='pl'
+    def call(self, cred, hrn=None, request_hash = None, caller_cred=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 
+        # authenticate the caller's request_hash. Let just get the caller's gid
+        # from the cred and authenticate using that 
+        client_gid = Credential(string=cred).get_gid_caller()
+        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
+
+        #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))
+
+        # 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'):
-            self.api.auth.check(cred, 'listnodes')
-            nodes = Nodes(self.api)
+            nodes = Nodes(self.api, caller_cred=caller_cred)
             if hrn:
                 rspec = nodes.get_rspec(hrn)
             else:
                 nodes.refresh()
                 rspec = nodes['rspec']
         else:
-            # To clean up after July 21 - SB    
-            rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type)
-            rspec = rspec_manager.get_rspec(hrn)
-        
-        return rspec
+            rspec = rspec_manager.get_rspec(self.api, hrn)
+
+        # Filter the outgoing rspec using sfatables
+	import pdb
+	pdb.set_trace()
+	if self.api.interface=='slicemgr':
+           outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
+	else:
+           outgoing_rules = SFATablesRules('OUTGOING')
+	if outgoing_rules.sorted_rule_list:
+           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)
+           return filtered_rspec
+	else:
+	   return rspec