[trigger] Refactorisation (voir détails) - On passe aux tests

* Pour une plus grande modularité, event a été refactorisé, ce qui
 a impliqué de réécrire le fonctionnement des services.
 * Maintenant, y a plus qu'à tester.

gestion/trigger/services/firewall.py

@@ -8,14 +8,18 @@
 # Author  : Pierre-Elliott Bécue <becue@crans.org>
 # Licence : GPLv3
 # Date    : 15/06/2014
+"""
+Firewall service module. is uses the firewall library as it's, it
+is not designed to replace it, just to call specific functions from
+it to regenerate what needs to.
+"""
 
 import lc_ldap.shortcuts
 from gestion.trigger.host import record
+from gestion.trigger.services.service import BasicService
 import cranslib.clogger as clogger
 import gestion.config.firewall as firewall_config
 import gestion.trigger.firewall4.firewall4 as firewall4
-import os
-import sys
 
 logger = clogger.CLogger("trigger.firewall", "debug")
 
@@ -28,25 +32,73 @@ class FwFunFactory(object):
 
     @classmethod
     def register(cls, key, value):
+        """Stores in factory the function name and its value
+
+        """
         cls._meths[key] = value
 
     @classmethod
     def get(cls, key):
+        """Gets what is stored
+
+        """
         return cls._meths.get(key, None)
 
 def fwrecord(function):
+    """Records function in FwFunFactory
+
+    """
     FwFunFactory.register(function.func_name, function)
 
 def fwcall(fwfun):
+    """Calls in function from FwFunFactory
+
+    """
     return FwFunFactory.get(fwfun)
 
 @record
-def firewall(body=()):
-    if len(body) != 2:
-        logger.warning("Received body %r, this format is incorrect, discarding.", body)
-    (service, data) = body
-    logger.info("Calling service %s for data %r", service, data)
-    fwcall(service)(data)
+class firewall(BasicService):
+    """Firewall service that handles any modification in the firewall.
+
+    """
+
+    # Class lookup table to define which changes call which function.
+    changes_trigger = {
+        lc_ldap.attributs.macAddress.ldap_name: (firewall.send_mac_ip,),
+        lc_ldap.attributs.ipHostNumber.ldap_name: (firewall.send_mac_ip,),
+    }
+
+    @classmethod
+    def send_mac_ip(cls, body, diff):
+        """Computes mac_ip data to send from body and diff
+
+        """
+        macs = tuple([body[i].get(lc_ldap.attributs.macAddress.ldap_name, [''])[0] for i in xrange(1, 3)])
+        ips = tuple([body[i].get(lc_ldap.attributs.ipHostNumber.ldap_name, [''])[0] for i in xrange(1, 3)])
+
+        # Mise à jour du parefeu mac_ip
+        if not macs[0]:
+            # Création d'une nouvelle machine.
+            fw = {'add': [(macs[1], ips[1])]}
+        elif not macs[1]:
+            # Destruction d'une machine.
+            fw = {'delete': [(macs[0], ips[0])]}
+        else:
+            # Mise à jour.
+            fw = {'update': [(macs[0], ips[0], macs[1], ips[1])]}
+        return ("firewall", ("mac_ip", fw))
+
+    @classmethod
+    def regen(cls, body=()):
+        """Regens the specific service
+
+        """
+        if len(body) != 2:
+            logger.warning("Received body %r, this format is incorrect, discarding.", body)
+            return
+        (service, data) = body
+        logger.info("Calling service %s for data %r", service, data)
+        fwcall(service)(data)
 
 @fwrecord
 def mac_ip(body):