X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;h=e2b57877ecfffd05da795b2c2a29d1c22a4759dc;hb=a26c2035f895f329fd7d2a8892b7606be0d46116;hp=dc9e7cbf3aaa036d3dd5b7014c219b3667d2db01;hpb=342b9b05015e6a009d9dbccf559ae66334298b1f;p=sfa.git

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index dc9e7cbf..e2b57877 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -6,42 +6,50 @@ import pdb
 import libxml2
 
 from optparse import OptionParser
-from sfatables import commands, matches, targets
-from sfatables.xmlextension import Xmlextension
+from sfatables import commands
 from sfatables.globals import *
 from sfatables.commands.List import *
 from sfatables.xmlrule import *
 
 class SFATablesRules:
     def __init__(self, chain_name):
+        self.active_context = None
+        self.contexts = None # placeholder for rspec_manger
         self.sorted_rule_list = []
-        chain_dir_path = "%s/%s"%(sfatables_config,chain_name)
+        chain_dir_path = os.path.join(sfatables_config,chain_name)
         rule_list = List().get_rule_list(chain_dir_path)
         for rule_number in rule_list:
-            self.sorted_rule_list.append(XMLRule(chain_name, rule_number))
+            self.sorted_rule_list = self.sorted_rule_list + [XMLRule(chain_name, rule_number)]
         return
 
 
+    def set_context(self, request_context):
+        self.active_context = request_context
+        return
+
     def apply(self, rspec):
-        intermediate_rspec = rspec
+        doc = libxml2.parseDoc(rspec)
+        intermediate_rspec = doc
+
         for rule in self.sorted_rule_list:
             intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
             if (rule.terminal):
                 break
 
-        return intermediate_rspec
+        final_rspec = XMLRule().wrap_up(intermediate_rspec) 
+        return final_rspec
 
 def main():
     incoming = SFATablesRules('INCOMING')
-    outgoing = SFATablesRules('OUTGOING')
-
-    rspec = open(sys.argv[1]).read()
 
+    outgoing = SFATablesRules('OUTGOING')
+    print "%d rules loaded for INCOMING chain"%len(incoming.sorted_rule_list)
+    print incoming.sorted_rule_list[0].processors
 
-    
-    print "%d rules loaded for INCOMING chain\n"%len(incoming.sorted_rule_list)
-    print "%d rules loaded for OUTGOING chain\n"%len(outgoing.sorted_rule_list)
+    print "%d rules loaded for OUTGOING chain"%len(outgoing.sorted_rule_list)
+    print outgoing.sorted_rule_list[0].processors
 
+    rspec = open(sys.argv[1]).read()
     newrspec = incoming.apply(rspec)
     print newrspec
     return