X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfatables%2Fruntime.py;h=f773b0d656ab68e03487f117de7f8334d5e0e9e7;hp=0ed38e0628d5abf4697deb0a93d7202cb397f8b6;hb=HEAD;hpb=9a053166cdb0187d0514403e92e8719d9a3aa8ee

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index 0ed38e06..f773b0d6 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -1,15 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import sys
 import os
-import pdb
+
 import libxml2
+import libxslt
 
-from optparse import OptionParser
-from sfatables import commands
-from sfatables.globals import *
-from sfatables.commands.List import *
-from sfatables.xmlrule import *
+from sfatables.globals import sfatables_config
+from sfatables.commands.List import List
+from sfatables.xmlrule import XMLRule
 
 class SFATablesRules:
     def __init__(self, chain_name):
@@ -45,18 +44,20 @@ class SFATablesRules:
 
     def create_xml_node(self, name, context_dict):
         node = libxml2.newNode(name)
-        for k in context_dict.keys():
+        for k in list(context_dict.keys()):
             if (type(context_dict[k])==dict):
                 childNode = self.create_xml_node(k, context_dict[k])
                 node.addChild(childNode)
             else:
-                node.addContent(context_dict[k])
+                childNode = libxml2.newNode(k)
+                childNode.addContent(context_dict[k])
+                node.addChild(childNode)
         return node
                 
     def add_request_context_to_rspec(self, doc):
         p = doc.xpathNewContext()
-        context = p.xpathEval("//Rspec")
-        if (not context):
+        context = p.xpathEval("//*")
+        if not context or context[0].name not in ['RSpec', 'rspec']:
             raise Exception('Request is not an rspec')
         else:
             # Add the request context
@@ -74,8 +75,8 @@ class SFATablesRules:
             intermediate_rspec = doc
 
             for rule in self.sorted_rule_list:
-                intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
-                if (rule.terminal):
+                (matched,intermediate_rspec) = rule.apply_interpreted(intermediate_rspec)
+                if (rule.terminal and matched):
                     break
 
             final_rspec = self.wrap_up(intermediate_rspec) 
@@ -84,20 +85,24 @@ class SFATablesRules:
 
         return final_rspec
 
+    def print_rules(self):
+        for rule in self.sorted_rule_list:
+            print(rule.processors)
+
 def main():
     incoming = SFATablesRules('INCOMING')
     incoming.set_context({'sfa':{'user':{'hrn':'plc.princeton.sapanb'}}})
 
     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"%len(incoming.sorted_rule_list))
+    incoming.print_rules()
 
-    print "%d rules loaded for OUTGOING chain"%len(outgoing.sorted_rule_list)
-    print outgoing.sorted_rule_list[0].processors
+    print("%d rules loaded for OUTGOING chain"%len(outgoing.sorted_rule_list))
+    outgoing.print_rules()
 
     rspec = open(sys.argv[1]).read()
     newrspec = incoming.apply(rspec)
-    print newrspec
+    print(newrspec)
     return
 
 if __name__=="__main__":