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

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 2718f615..d192a35b 100644
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -54,14 +54,19 @@ 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('INCOMING')
-            
-        #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
 
         # send the call to the right manager
         if sfa_aggregate_type not in ['pl']: