X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;h=e22967c783f55998dbe073a982866bf545b8755a;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=69dd6655b4af431979d6c0e3731499e10ef38faa;hpb=02ad775013d04ed357b4af502757134ebf888365;p=sfa.git

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index 69dd6655..e22967c7 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -2,14 +2,13 @@
 
 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):
@@ -50,7 +49,9 @@ class SFATablesRules:
                 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):
@@ -84,16 +85,20 @@ 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':'ple.princeton.sapanb'}}})
+    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
+    incoming.print_rules()
 
     print "%d rules loaded for OUTGOING chain"%len(outgoing.sorted_rule_list)
-    print outgoing.sorted_rule_list[0].processors
+    outgoing.print_rules()
 
     rspec = open(sys.argv[1]).read()
     newrspec = incoming.apply(rspec)