Moving context extraction to the rspec manager

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index e9bd7b4..a3ff7ef 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -40,24 +40,27 @@ class create_slice(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))
 
+        rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
         # Filter the incoming rspec using sfatables
         incoming_rules = SFATablesRules('OUTGOING')
             
         incoming_rules.set_slice(hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
 
+        contexts = incoming_rules.contexts
+        request_context = rspec_manager.get_context(hrn, Credential(string=caller_cred.get_gid_caller().get_hrn()), contexts)
+        incoming_rules.set_context(request_context)
         rspec = incoming_rules.apply(requested_rspec)
 
 
         sfa_aggregate_type = Config().get_aggregate_rspec_type()
         self.api.auth.check(cred, 'createslice')
+
         if (sfa_aggregate_type == 'pl'):
             slices = Slices(self.api, caller_cred=caller_cred)
             slices.create_slice(hrn, 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.create_slice(self.api, hrn, rspec)
 
-            
         
         return 1 

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 9b52ba7..b10f3d2 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -45,6 +45,7 @@ class get_resources(Method):
         # 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:
@@ -53,14 +54,13 @@ class get_resources(Method):
                 nodes.refresh()
                 rspec = nodes['rspec']
         else:
-            rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
             rspec = rspec_manager.get_rspec(self.api, hrn)
         
         # 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
-
+        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