X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fcreate_slice.py;h=d192a35b0f4ba566ee642e95aee54921d070e2af;hb=16ea94ee08c92c3978ca2463a4d7967bfbeec55d;hp=1a4e580fc1eb6c3bd2013c3f6ed7160457891f52;hpb=0617bf203bd582103e7f45633cd320b1f80d1fb0;p=sfa.git

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 1a4e580f..d192a35b 100644
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -54,21 +54,36 @@ class create_slice(Method):
         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
+        if self.api.interface in ['slicemgr']:
+           incoming_rules = SFATablesRules('FORWARD-INCOMING')
+	elif self.api.interface in ['aggregate']:
+           incoming_rules = SFATablesRules('INCOMING')
+	if incoming_rules.sorted_rule_list:
+           #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.fetch_context(hrn, Credential(string=caller_cred).get_gid_caller().get_hrn(), contexts)
-        incoming_rules.set_context(request_context)
-        rspec = incoming_rules.apply(requested_rspec)
+           contexts = incoming_rules.contexts
+           request_context = rspec_manager.fetch_context(hrn, Credential(string=caller_cred).get_gid_caller().get_hrn(), contexts)
+           incoming_rules.set_context(request_context)
+           rspec = incoming_rules.apply(requested_rspec)
+	else:	
+	   rspec = requested_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    
+        # send the call to the right manager
+        if sfa_aggregate_type not in ['pl']:
+            # To clean up after July 21 - SB
             rspec = rspec_manager.create_slice(self.api, hrn, rspec)
+            return 1
+
+        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])
+            manager.create_slice(self.api, hrn, 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])
+            manager.create_slice(self.api, hrn, rspec, caller_cred)
 
-        
         return 1