From: Anil-Kumar Vengalil Date: Thu, 3 Dec 2009 20:59:16 +0000 (+0000) Subject: get into sfatables code only if some rules exist X-Git-Tag: sfa-0.9-7~209 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=43b7b8cefa9e2bb9dddc8f5d9a747e130436d54d get into sfatables code only if some rules exist --- diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py index 2718f615..4192cc08 100644 --- a/sfa/methods/create_slice.py +++ b/sfa/methods/create_slice.py @@ -55,13 +55,16 @@ class create_slice(Method): 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 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']: