src/rougail/annotator/service.py

@@ -38,6 +38,16 @@ ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespac
                      'reflector_object',)
 
 
+KEY_TYPE = {'variable': 'symlink',
+            'PortOption': 'port',
+            'UnicodeOption': 'string',
+            'NetworkOption': 'network',
+            'NetmaskOption': 'netmask',
+            'URLOption': 'web_address',
+            'FilenameOption': 'filename',
+            }
+
+
 class ServiceAnnotator:
     """Manage service's object
     for example::
@@ -112,11 +122,9 @@ class ServiceAnnotator:
                                       )
             family.variable = []
             activate_obj = self._generate_element('boolean',
-                                                  None,
-                                                  None,
                                                   'activate',
                                                   True,
-                                                  elt,
+                                                  elt.xmlfiles,
                                                   '.'.join([subpath, 'activate']),
                                                   )
             for key in dir(elt):
@@ -129,19 +137,13 @@ class ServiceAnnotator:
                                                                     value,
                                                                     []).append(activate_obj)
                     continue
-                if key == 'name':
+                family.variable.append(self._generate_element(self._get_type(key,
-                    dtd_key_type = elttype + '_type'
-                else:
-                    dtd_key_type = key + '_type'
-                elt_type = getattr(elt, dtd_key_type, 'string')
-                if elt_type == 'variable':
-                    elt_type = 'symlink'
-                family.variable.append(self._generate_element(elt_type,
-                                                              dtd_key_type,
                                                                              elttype,
+                                                                             elt,
+                                                                             ),
                                                               key,
                                                               value,
-                                                              elt,
+                                                              elt.xmlfiles,
                                                               f'{subpath}.{key}'
                                                               ))
             family.variable.append(activate_obj)
@@ -188,26 +190,18 @@ class ServiceAnnotator:
 
     def _generate_element(self,
                           type_,
-                          dtd_key_type,
-                          elttype,
                           key,
                           value,
-                          elt,
+                          xmlfiles,
                           path,
                           ):  # pylint: disable=R0913
-        variable = self.objectspace.variable(elt.xmlfiles)
+        variable = self.objectspace.variable(xmlfiles)
         variable.name = normalize_family(key)
         variable.mode = None
         variable.type = type_
         if type_ == 'symlink':
             variable.opt = self.objectspace.paths.get_variable(value)
             variable.multi = None
-            if self.objectspace.types[dtd_key_type] != 'variable' and \
-                    variable.opt.type != self.objectspace.types[dtd_key_type]:
-                msg = _(f'"{key}" in "{elttype}" must be a variable with type '
-                        f'"{self.objectspace.types[dtd_key_type]}" not "{variable.opt.type}"')
-                raise DictConsistencyError(msg, 58, elt.xmlfiles)
-
         else:
             variable.doc = key
             variable.default = value
@@ -220,6 +214,21 @@ class ServiceAnnotator:
                                             )
         return variable
 
+    def _get_type(self,
+                  key: str,
+                  elt_name: str,
+                  elt,
+                  ) -> str:
+        if key == 'name':
+            dtd_key_type = elt_name + '_type'
+        else:
+            dtd_key_type = key + '_type'
+        if key in self.objectspace.booleans_attributs:
+            return 'boolean'
+        if hasattr(elt, dtd_key_type):
+            return KEY_TYPE[getattr(elt, dtd_key_type)]
+        return 'string'
+
     def _update_override(self,
                          file_,
                          service_name,
@@ -238,7 +247,7 @@ class ServiceAnnotator:
                      file_,
                      service_name,
                      ):
-        if not hasattr(file_, 'file_type') or file_.file_type == "string":
+        if not hasattr(file_, 'file_type') or file_.file_type == "UnicodeOption":
             if not hasattr(file_, 'source'):
                 file_.source = basename(file_.name)
         elif not hasattr(file_, 'source'):

src/rougail/data/rougail.dtd

@@ -49,21 +49,21 @@
 <!ATTLIST service name CDATA #REQUIRED>
 
 <!ELEMENT port (#PCDATA)>
-<!ATTLIST port port_type (port|variable) "port">
+<!ATTLIST port port_type (PortOption|variable) "PortOption">
 <!ATTLIST port portlist CDATA #IMPLIED>
 <!ATTLIST port protocol (tcp|udp) "tcp">
 
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED>
-<!ATTLIST ip ip_type (network|variable) "network">
+<!ATTLIST ip ip_type (NetworkOption|variable) "NetworkOption">
-<!ATTLIST ip interface_type (string|variable) "string">
+<!ATTLIST ip interface_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST ip interface CDATA #REQUIRED>
-<!ATTLIST ip netmask_type (netmask|variable) "netmask">
+<!ATTLIST ip netmask_type (NetmaskOption|variable) "NetmaskOption">
 <!ATTLIST ip netmask CDATA "255.255.255.255">
 
 <!ELEMENT file EMPTY>
 <!ATTLIST file name CDATA #REQUIRED>
-<!ATTLIST file file_type (string|variable) "string">
+<!ATTLIST file file_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>

src/rougail/objspace.py

@@ -110,7 +110,6 @@ class RougailObjSpace:
         self.valid_enums = {}
         self.booleans_attributs = []
         self.has_dyn_option = False
-        self.types = {}
 
         self.make_object_space_classes(xmlreflector)
         self.rougailconfig = rougailconfig
@@ -142,8 +141,6 @@ class RougailObjSpace:
                     if dtd_attr.name in self.booleans_attributs:
                         default_value = convert_boolean(default_value)
                     attrs[dtd_attr.name] = default_value
-                    if dtd_attr.name.endswith('_type'):
-                        self.types[dtd_attr.name] = default_value
                 if dtd_attr.name == 'redefine':
                     # has a redefine attribute, so it's a Redefinable object
                     clstype = Redefinable

tests/dictionaries/01test_redefine_base/00-base.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_base/10-base.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <variable name="my_variable" redefine="True" test="test1"/>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/01test_redefine_base/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.my_variable": null}

tests/dictionaries/01test_redefine_base/tiramisu/base.py

@@ -1,17 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
-option_2.impl_set_information('test', ('test1',))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/70port_variable/00-base.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail>
-
-    <services>
-        <service name='ntp'>
-            <port protocol='udp' port_type="variable">my_variable</port>
-            <port protocol='tcp' port_type="variable">my_variable</port>
-        </service>
-    </services>
-
-    <variables>
-        <variable name='my_variable' type='port'>
-            <value>123</value>
-        </variable>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/70port_variable/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.my_variable": "123", "services.ntp.ports.my_variable.name": "123", "services.ntp.ports.my_variable.protocol": "udp", "services.ntp.ports.my_variable.activate": true, "services.ntp.ports.my_variable_1.name": "123", "services.ntp.ports.my_variable_1.protocol": "tcp", "services.ntp.ports.my_variable_1.activate": true}

tests/dictionaries/70port_variable/tiramisu/base.py

@@ -1,27 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_2 = PortOption(name="my_variable", doc="my_variable", default="123", allow_private=True, properties=frozenset({"mandatory", "normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_7 = SymLinkOption(name="name", opt=option_2)
-option_8 = StrOption(name="protocol", doc="protocol", default="udp")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
-option_6 = OptionDescription(name="my_variable", doc="my_variable", children=[option_7, option_8, option_9])
-option_11 = SymLinkOption(name="name", opt=option_2)
-option_12 = StrOption(name="protocol", doc="protocol", default="tcp")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
-option_10 = OptionDescription(name="my_variable_1", doc="my_variable_1", children=[option_11, option_12, option_13])
-option_5 = OptionDescription(name="ports", doc="ports", children=[option_6, option_10])
-option_4 = OptionDescription(name="ntp", doc="ntp", children=[option_5])
-option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])