improvement(core): add IO_Object.get_dict_from_tuple() helper

Too much duplicated code. Factor out.

This obviously doesn't safe any lines of code. It still factors out the
concept of converting a config-tuple to a dictionary.

src/firewall/core/fw_config.py

@@ -629,10 +629,7 @@ def get_service_config_dict(self, obj):
         return obj.export_config_dict()
 
     def set_service_config(self, obj, conf):
-        conf_dict = {}
-        for i, value in enumerate(conf):
-            conf_dict[obj.IMPORT_EXPORT_STRUCTURE[i][0]] = value
-
+        conf_dict = obj.get_dict_from_tuple(conf)
         return self.set_service_config_dict(obj, conf_dict)
 
     def set_service_config_dict(self, obj, conf):
@@ -653,10 +650,9 @@ def new_service(self, name, conf):
         if name in self._services or name in self._builtin_services:
             raise FirewallError(errors.NAME_CONFLICT, "new_service(): '%s'" % name)
 
-        conf_dict = {}
-        for i, value in enumerate(conf):
-            conf_dict[Service.IMPORT_EXPORT_STRUCTURE[i][0]] = value
-
+        conf_dict = IO_Object.get_dict_from_tuple_static(
+            Service.IMPORT_EXPORT_STRUCTURE, conf
+        )
         return self.new_service_dict(name, conf_dict)
 
     def new_service_dict(self, name, conf):
@@ -827,10 +823,7 @@ def get_zone_config_dict(self, obj):
         return obj.export_config_dict()
 
     def set_zone_config(self, obj, conf):
-        conf_dict = {}
-        for i, value in enumerate(conf):
-            conf_dict[obj.IMPORT_EXPORT_STRUCTURE[i][0]] = value
-
+        conf_dict = obj.get_dict_from_tuple(conf)
         return self.set_zone_config_dict(obj, conf_dict)
 
     def set_zone_config_dict(self, obj, conf):
@@ -851,10 +844,9 @@ def new_zone(self, name, conf):
         if name in self._zones or name in self._builtin_zones:
             raise FirewallError(errors.NAME_CONFLICT, "new_zone(): '%s'" % name)
 
-        conf_dict = {}
-        for i, value in enumerate(conf):
-            conf_dict[Zone.IMPORT_EXPORT_STRUCTURE[i][0]] = value
-
+        conf_dict = IO_Object.get_dict_from_tuple_static(
+            Zone.IMPORT_EXPORT_STRUCTURE, conf
+        )
         return self.new_zone_dict(name, conf_dict)
 
     def new_zone_dict(self, name, conf):

src/firewall/core/io/io_object.py

@@ -39,6 +39,16 @@ def export_config(self):
             ret.append(copy.deepcopy(getattr(self, x[0])))
         return tuple(ret)
 
+    @staticmethod
+    def get_dict_from_tuple_static(IMPORT_EXPORT_STRUCTURE, conf):
+        conf_dict = {}
+        for i, value in enumerate(conf):
+            conf_dict[IMPORT_EXPORT_STRUCTURE[i][0]] = value
+        return conf_dict
+
+    def get_dict_from_tuple(obj, conf):
+        return IO_Object.get_dict_from_tuple_static(obj.IMPORT_EXPORT_STRUCTURE, conf)
+
     def export_config_dict(self):
         conf = {}
         type_formats = dict([(x[0], x[1]) for x in self.IMPORT_EXPORT_STRUCTURE])