Plugging in sfatables

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index a2b07d5..5d1a09c 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -8,9 +8,10 @@ from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.plc.slices import Slices
 from sfa.util.config import Config
-# RSpecManager_pl is not used. This is just to resolve issues with the dynamic __import__ that comes later.
+# RSpecManager_pl is not used. It's used to make sure the module is in place.
 import sfa.rspecs.aggregates.rspec_manager_pl
 from sfa.trust.credential import Credential
+from sfatables.runtime import SFATablesRules
 
 
 class create_slice(Method):
@@ -33,12 +34,20 @@ class create_slice(Method):
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn, rspec, caller_cred=None):
+    def call(self, cred, hrn, requested_rspec, caller_cred=None):
        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))
 
+        # Filter the incoming rspec using sfatables
+        incoming_rules = SFATablesRules('OUTGOING')
+            
+        incoming_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
+
+        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'):
@@ -48,5 +57,7 @@ class create_slice(Method):
             # 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 3e99fe4..10f02c4 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):
     """
@@ -55,4 +56,11 @@ class get_resources(Method):
             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