Plugging in sfatables

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

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 8710c6f..5d1a09c 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -5,8 +5,14 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
-from sfa.util.slices import Slices
+from sfa.trust.auth import Auth
+from sfa.plc.slices import Slices
+from sfa.util.config import Config
+# 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):
     """
@@ -26,11 +32,32 @@ class create_slice(Method):
         Parameter(str, "Resource specification"),
         ]
 
-    returns = [Parameter(int, "1 if successful")]
+    returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn, rspec):
+    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')
-        slices = Slices(self.api)
-        slices.create_slice(hrn, rspec)
+        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