X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fexec.py;h=4afcb48e493b6b9a554933add22c5e4a88e7f6b0;hb=483772a0716028a34cb98012fbe252ffd445fedf;hp=979245d34562dfcb02d188ebba537e497318d4a2;hpb=c6f2a8917e5c158fd7c8b73f52ff31ca99d6f395;p=sfa.git

diff --git a/sfatables/exec.py b/sfatables/exec.py
index 979245d3..4afcb48e 100644
--- a/sfatables/exec.py
+++ b/sfatables/exec.py
@@ -13,19 +13,18 @@ from sfatables.commands.List import *
 from sfatables.xmlrule import *
 
 class SFATablesRules:
-    sorted_rule_list = []
-
     def __init__(self, chain_name):
+        self.sorted_rule_list = []
         chain_dir_path = "%s/%s"%(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(rule_number))
+            self.sorted_rule_list.append(XMLRule(chain_name, rule_number))
         return
 
     def apply(self, rspec):
         intermediate_rspec = rspec
         for rule in self.sorted_rule_list:
-            intermediate_rspec  = rule.apply(intermediate_rspec)
+            intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
 
         return intermediate_rspec
 
@@ -33,9 +32,44 @@ def main():
     incoming = SFATablesRules('INCOMING')
     outgoing = SFATablesRules('OUTGOING')
 
+    rspec = """
+<rspec>
+    <request-context>
+        <sfa><user><hrn>plc.princeton.sapan</hrn></user></sfa>
+    </request-context>
+
+    <sfatables-rule>
+            <argument>
+                <name>hrn</name>
+                <value>plc</value>
+            </argument>
+            <argument>
+                <name>whitelist</name>
+                <value>plc.princeton</value>
+            </argument>
+            <argument>
+                <name>blacklist</name>
+                <value>plc.tp</value>
+            </argument>
+    </sfatables-rule>
+    <request>
+        <nodespec>
+            <node name="plc.princeton.planetlab-01"/>
+            <node name="plc.princeton.planetlab-02"/>
+            <node name="plc.princeton.planetlab-03"/>
+            <node name="plc.princeton.planetlab-04"/>
+            <node name="plc.tp.planetlab3"/>
+        </nodespec>
+    </request>
+</rspec>
+    """
+
+    
     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)
 
+    newrspec = incoming.apply(rspec)
+    print newrspec
     return
 
 if __name__=="__main__":