Contd... (integrating sfatables)

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

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 89cc654..9b52ba7 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -7,9 +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):
     """
@@ -41,6 +42,9 @@ class get_resources(Method):
         #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.
+
         if (sfa_aggregate_type == 'pl'):
             nodes = Nodes(self.api, caller_cred=caller_cred)
             if hrn:
@@ -49,8 +53,14 @@ class get_resources(Method):
                 nodes.refresh()
                 rspec = nodes['rspec']
         else:
-            # To clean up after July 21 - SB    
             rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
             rspec = rspec_manager.get_rspec(self.api, hrn)
         
-        return rspec
+        # Filter the outgoing rspec using sfatables
+        outgoing_rules = SFATablesRules('OUTGOING')
+        
+        outgoing_rules.set_user(caller_cred.callerGID.hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
+
+        filtered_rspec = outgoing_rules.apply(rspec)
+
+        return filtered_rspec