X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fcommands%2FAdd.py;h=4f0e6067cd3406b6fdae7888edad08d58c4ac050;hb=7c7b4138dc8c6183f68e78e64eb616a1fdbafcbc;hp=79bb2d9761d2f73b4150926607a1c3bdbd0d7204;hpb=f5194b0cf1858313770d6796411fec30190b5522;p=sfa.git

diff --git a/sfatables/commands/Add.py b/sfatables/commands/Add.py
index 79bb2d97..4f0e6067 100644
--- a/sfatables/commands/Add.py
+++ b/sfatables/commands/Add.py
@@ -1,19 +1,64 @@
 import os, time
-from sfa.sfatables.command import Add
+import libxml2
+from sfatables.command import Command
+from sfatables.globals import *
 
 class Add(Command):
     options = [('-A','--add')]
     help = 'Add a rule to a chain'
-    key='add_rule'
-    matches = False
-    targets = False
+    matches = True
+    targets = True
 
     def __init__(self):
         return
 
-    def call(self):
-        # Override this function
+    def getnextfilename(self,type,chain):
+        dir = sfatables_config + "/"+chain;
+        last_rule_number = 0
+
+        for (root, dirs, files) in os.walk(dir):
+            for file in files:
+                if (file.startswith('sfatables-') and file.endswith(type)):
+                    number_str = file.split('-')[1]
+                    number = int(number_str)
+                    if (number>last_rule_number):
+                        last_rule_number = number
+
+        return "sfatables-%d-%s"%(last_rule_number+1,type)
+
+    def call_gen(self, chain, type, dir, options):
+        filename = dir + "/"+options.name+".xml"
+        xmldoc = libxml2.parseFile(filename)
+    
+        p = xmldoc.xpathNewContext()
+
+        supplied_arguments = options.arguments
+        for option in supplied_arguments:
+            option_name = option['name']
+            option_value = getattr(options,option_name)
+
+            if (hasattr(options,option_name)):
+                context = p.xpathEval("//rule/argument[name='%s']"%option_name)
+                if (not context):
+                    raise Exception('Unknown option %s for match %s'%(option,option['name']))
+                else:
+                    # Add the value of option
+                    valueNode = libxml2.newNode('value')
+                    valueNode.addContent(option_value)
+                    context[0].addChild(valueNode)
+
+        filename = self.getnextfilename(type,chain)
+        file_path = sfatables_config + '/' + chain + '/' + filename
+        xmldoc.saveFile(file_path)
+        p.xpathFreeContext()
+        xmldoc.freeDoc()
+
         return True
 
-    def __call__(self, option, opt_str, value, parser, *args, **kwargs):
-        return self.call(option)
+    def call(self, command_options, match_options, target_options):
+        chain = command_options.args[0]
+        ret = self.call_gen(chain, 'match',match_dir, match_options)
+        if (ret):
+            ret = self.call_gen(chain, 'target',target_dir, target_options)
+
+        return ret