git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into eucalyptus-devel
[sfa.git]
/
sfatables
/
runtime.py
diff --git
a/sfatables/runtime.py
b/sfatables/runtime.py
index
69dd665
..
99226f4
100644
(file)
--- a/
sfatables/runtime.py
+++ b/
sfatables/runtime.py
@@
-3,9
+3,10
@@
import sys
import os
import pdb
import sys
import os
import pdb
+from optparse import OptionParser
+
import libxml2
import libxml2
-from optparse import OptionParser
from sfatables import commands
from sfatables.globals import *
from sfatables.commands.List import *
from sfatables import commands
from sfatables.globals import *
from sfatables.commands.List import *
@@
-50,7
+51,9
@@
class SFATablesRules:
childNode = self.create_xml_node(k, context_dict[k])
node.addChild(childNode)
else:
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):
return node
def add_request_context_to_rspec(self, doc):
@@
-84,16
+87,20
@@
class SFATablesRules:
return final_rspec
return final_rspec
+ def print_rules(self):
+ for rule in self.sorted_rule_list:
+ print rule.processors
+
def main():
incoming = SFATablesRules('INCOMING')
def main():
incoming = SFATablesRules('INCOMING')
- incoming.set_context({'sfa':{'user':{'hrn':'pl
e
.princeton.sapanb'}}})
+ incoming.set_context({'sfa':{'user':{'hrn':'pl
c
.princeton.sapanb'}}})
outgoing = SFATablesRules('OUTGOING')
print "%d rules loaded for INCOMING chain"%len(incoming.sorted_rule_list)
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 "%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)
rspec = open(sys.argv[1]).read()
newrspec = incoming.apply(rspec)