Update services to use SubHandler and DictSubHandler.

[software/pymin.git] / pymin / services / firewall / __init__.py

diff --git a/pymin/services/firewall/__init__.py b/pymin/services/firewall/__init__.py
index 229cc207a3a2a5efff14b7d2f1e59bc02fb3bab8..d3ae1ed548a58daf18f4b701d62fe670568851ec 100644 (file)
--- a/pymin/services/firewall/__init__.py
+++ b/pymin/services/firewall/__init__.py
@@ -8,7 +8,7 @@ from os import path
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, ServiceHandler, \
-                                TransactionalHandler
+                                TransactionalHandler, SubHandler
 
 __ALL__ = ('FirewallHandler', 'Error', 'RuleError', 'RuleAlreadyExistsError',
            'RuleNotFoundError')
@@ -112,30 +112,26 @@ class Rule(Sequence):
     def as_tuple(self):
         r"Return a tuple representing the rule."
         return (self.chain, self.target, self.src, self.dst, self.protocol,
-                    self.src_port)
+                    self.src_port, self.dst_port)
 
-class RuleHandler(Handler):
+class RuleHandler(SubHandler):
     r"""RuleHandler(rules) -> RuleHandler instance :: Handle a list of rules.
 
     This class is a helper for FirewallHandler to do all the work related to rules
     administration.
 
-    rules - A list of Rule objects.
+    parent - The parent service handler.
     """
 
     handler_help = u"Manage firewall rules"
 
-    def __init__(self, rules):
-        r"Initialize the object, see class documentation for details."
-        self.rules = rules
-
     @handler(u'Add a new rule')
     def add(self, *args, **kwargs):
         r"add(rule) -> None :: Add a rule to the rules list (see Rule doc)."
         rule = Rule(*args, **kwargs)
-        if rule in self.rules:
+        if rule in self.parent.rules:
             raise RuleAlreadyExistsError(rule)
-        self.rules.append(rule)
+        self.parent.rules.append(rule)
 
     @handler(u'Update a rule')
     def update(self, index, *args, **kwargs):
@@ -143,7 +139,7 @@ class RuleHandler(Handler):
         # TODO check if the modified rule is the same of an existing one
         index = int(index) # TODO validation
         try:
-            self.rules[index].update(*args, **kwargs)
+            self.parent.rules[index].update(*args, **kwargs)
         except IndexError:
             raise RuleNotFoundError(index)
 
@@ -152,7 +148,7 @@ class RuleHandler(Handler):
         r"delete(index) -> Rule :: Delete a rule from the list returning it."
         index = int(index) # TODO validation
         try:
-            return self.rules.pop(index)
+            return self.parent.rules.pop(index)
         except IndexError:
             raise RuleNotFoundError(index)
 
@@ -161,14 +157,14 @@ class RuleHandler(Handler):
         r"get(rule) -> Rule :: Get all the information about a rule."
         index = int(index) # TODO validation
         try:
-            return self.rules[index]
+            return self.parent.rules[index]
         except IndexError:
             raise RuleNotFoundError(index)
 
     @handler(u'Get information about all rules')
     def show(self):
         r"show() -> list of Rules :: List all the complete rules information."
-        return self.rules
+        return self.parent.rules
 
 
 class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
@@ -197,14 +193,14 @@ class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
         r"Initialize the object, see class documentation for details."
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
-        self._service_start = path.join(self._config_writer_cfg_dir,
-                                                    self._config_writer_files)
+        self._service_start = ('sh', path.join(self._config_writer_cfg_dir,
+                                        self._config_writer_files))
         self._service_stop = ('iptables', '-t', 'filter', '-F')
         self._service_restart = self._service_start
         self._service_reload = self._service_start
         self._config_build_templates()
         self._restore()
-        self.rule = RuleHandler(self.rules)
+        self.rule = RuleHandler(self)
 
     def _get_config_vars(self, config_file):
         return dict(rules=self.rules)