X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fcreate_slice.py;h=a85e8e5066196677e819434676de41a9d38e2bf9;hb=ffba27b005f35add9b2022dd2d4c7b7a0c9b6615;hp=bd86efa193e6d3cf051313815bdb228bf1c25724;hpb=05c1da568b6ce94815c802177d558bc0fb43ee40;p=sfa.git

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index bd86efa1..a85e8e50 100644
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -2,24 +2,21 @@
 ### $URL$
 
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.method import Method
 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. 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
-
+from sfatables.runtime import SFATablesRules
 
 class create_slice(Method):
     """
     Instantiate the specified slice according to whats defined in the specified rspec      
 
     @param cred credential string specifying the rights of the caller
-    @param hrn human readable name of slice to instantiate
+    @param hrn human readable name of slice to instantiate (hrn or xrn)
     @param rspec resource specification
     @return 1 is successful, faults otherwise  
     """
@@ -28,41 +25,52 @@ class create_slice(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to instantiate"),
+        Parameter(str, "Human readable name of slice to instantiate (hrn or xrn)"),
         Parameter(str, "Resource specification"),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
-    
-    def call(self, cred, hrn, requested_rspec, caller_cred=None):
-        if caller_cred==None:
-            caller_cred=cred
-        
-        self.api.auth.check(cred, 'createslice')
-
-        #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))
 
-        sfa_aggregate_type = Config().get_aggregate_rspec_type()
-        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)
-        rspec = requested_rspec
+    def __run_sfatables(self, manager, rules, hrn, origin_hrn, rspec):
+        if rules.sorted_rule_list:
+            contexts = rules.contexts
+            request_context = manager.fetch_context(hrn, origin_hrn, contexts)
+            rules.set_context(request_context)
+            newrspec = rules.apply(rspec)
+        else:	
+            newrspec = rspec
+        return newrspec
 
+        
+    def call(self, cred, xrn, requested_rspec, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn) 
+        user_cred = Credential(string=cred)
+        #log the call
+        if not origin_hrn:
+            origin_hrn = user_cred.get_gid_caller().get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+         
+        # validate the credential
+        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 = rspec_manager.create_slice(self.api, hrn, rspec)
+        manager_base = 'sfa.managers'
+        if self.api.interface in ['aggregate']:
+            mgr_type = self.api.config.SFA_AGGREGATE_TYPE
+            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            rspec = self.__run_sfatables(manager, 
+                                         SFATablesRules('INCOMING'),
+                                         hrn, origin_hrn, requested_rspec)
+            manager.create_slice(self.api, xrn, rspec)
+        elif self.api.interface in ['slicemgr']:
+            mgr_type = self.api.config.SFA_SM_TYPE
+            manager_module = manager_base + ".slice_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            rspec = self.__run_sfatables(manager, 
+                                         SFATablesRules('FORWARD-INCOMING'),
+                                         hrn, origin_hrn, requested_rspec)
+            manager.create_slice(self.api, xrn, rspec, origin_hrn)
 
-        
         return 1