Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provider support

Browse Source
This commit is contained in:
Emmanuel Garette
2021-12-10 23:35:44 +01:00
parent 757d9ec5c2
commit 8cf8c9b8eb
21 changed files with 212 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rougail/annotator/fill.py
View File

@ -32,7 +32,7 @@ from rougail.annotator.target import TargetAnnotator
from rougail.annotator.param import ParamAnnotator
CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates', 'nsd_filename', 'get_linked_configuration')
CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates', 'nsd_filename', 'get_linked_configuration', 'get_internal_zones', 'nsd_concat_lists', 'get_internal_info_in_zone')
class Annotator(TargetAnnotator, ParamAnnotator):

5
src/rougail/annotator/param.py
View File

@ -102,8 +102,11 @@ class ParamAnnotator:
if param.type == 'suffix':
for target in obj.target:
if not self.objectspace.paths.variable_is_dynamic(target.name.path):
target_name = target.name
if isinstance(target_name, self.objectspace.variable):
target_name = target_name.name
msg = _(f'"{param.type}" parameter cannot be set with target '
f'"{target.name}" which is not a dynamic variable')
f'"{target_name}" which is not a dynamic variable')
raise DictConsistencyError(msg, 53, obj.xmlfiles)
elif param.type == 'index':
for target in obj.target:

1
src/rougail/convert.py
View File

@ -86,6 +86,7 @@ class RougailConvert:
)
self.output = TiramisuReflector(rougailobjspace,
functions_file,
rougailconfig['internal_functions'],
).get_text() + '\n'
@staticmethod

1
src/rougail/data/rougail.dtd
View File

@ -90,7 +90,6 @@
<!ATTLIST family hidden (True|False) "False">
<!ATTLIST family dynamic CDATA #IMPLIED>
<!ATTLIST family leadership (True|False) "False">
<!ATTLIST family provider CDATA #IMPLIED>
<!ELEMENT variable ((choice*|value*)*)>
<!ATTLIST variable name CDATA #REQUIRED>

11
src/rougail/objspace.py
View File

@ -179,6 +179,7 @@ class RougailObjSpace:
self.space,
namespace,
redefine_variables,
False,
)
def _xml_parse(self, # pylint: disable=R0913
@ -187,10 +188,15 @@ class RougailObjSpace:
space,
namespace,
redefine_variables,
is_dynamic,
) -> None:
# var to check unique family name in a XML file
family_names = []
for child in document:
if is_dynamic:
is_sub_dynamic = True
else:
is_sub_dynamic = document.attrib.get('dynamic') is not None
if not isinstance(child.tag, str):
# doesn't proceed the XML commentaries
continue
@ -225,6 +231,7 @@ class RougailObjSpace:
document,
variableobj,
space,
is_sub_dynamic,
)
self.add_to_tree_structure(variableobj,
space,
@ -237,6 +244,7 @@ class RougailObjSpace:
variableobj,
namespace,
redefine_variables,
is_sub_dynamic,
)
def get_variableobj(self,
@ -472,6 +480,7 @@ class RougailObjSpace:
document,
variableobj,
space,
is_dynamic,
):
"""Fill self.paths attributes
"""
@ -488,7 +497,7 @@ class RougailObjSpace:
self.paths.add_variable(namespace,
variableobj.name,
space.path,
document.attrib.get('dynamic') is not None,
is_dynamic,
variableobj,
leader,
)

2
src/rougail/path.py
View File

@ -125,6 +125,8 @@ class Path:
) -> str: # pylint: disable=C0111
"""Add a new variable (with path)
"""
if name == 'hostname_' and not is_dynamic:
raise Exception('pffff')
if '.' not in name:
full_path = '.'.join([family, name])
if namespace == self.variable_namespace:

5
src/rougail/template/base.py
View File

@ -236,6 +236,7 @@ class RougailBaseTemplate:
def patch_template(self,
filename: str,
templates_dir: str,
) -> None:
"""Apply patch to a template
"""
@ -251,7 +252,7 @@ class RougailBaseTemplate:
msg = _(f"Error applying patch: '{patch_file}'\n"
f"To reproduce and fix this error {patch_cmd_err}")
self.log.error(_(msg))
copy(join(self.templates_dir, filename), self.tmp_dir)
copy(join(templates_dir, filename), self.tmp_dir)
def prepare_template(self,
filename: str,
@ -263,7 +264,7 @@ class RougailBaseTemplate:
if not isdir(self.tmp_dir):
raise TemplateError(_(f'cannot find tmp_dir {self.tmp_dir}'))
copy(join(templates_dir, filename), self.tmp_dir)
self.patch_template(filename)
self.patch_template(filename, templates_dir)
def instance_file(self,
filevar: Dict,

4
src/rougail/template/systemd.py
View File

@ -84,7 +84,7 @@ class RougailSystemdTemplate(RougailBaseTemplate):
) -> tuple:
source = filevar['source']
if not isfile(source): # pragma: no cover
raise FileNotFound(_(f"File {source} does not exist."))
raise FileNotFound(_(f'Source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
tmp_file = join(self.tmp_dir, source)
#self.instance_file(fill, 'files')
if variable:
@ -102,7 +102,7 @@ class RougailSystemdTemplate(RougailBaseTemplate):
) -> tuple:
source = filevar['source']
if not isfile(source): # pragma: no cover
raise FileNotFound(_(f"File {source} does not exist."))
raise FileNotFound(_(f'Override source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
tmp_file = join(self.tmp_dir, source)
service_name = filevar['name']
destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail.conf'

51
src/rougail/tiramisureflector.py
View File

@ -32,12 +32,6 @@ from .annotator import CONVERT_OPTION
from .objspace import RootRougailObject
class Root(): # pylint: disable=R0903
"""Root classes
"""
path = '.'
class BaseElt: # pylint: disable=R0903
"""Base element
"""
@ -52,6 +46,7 @@ class TiramisuReflector:
def __init__(self,
objectspace,
funcs_paths,
internal_functions,
):
self.index = 0
self.text = []
@ -73,6 +68,9 @@ class TiramisuReflector:
" continue",
" setattr(func, function, getattr(_func, function))",
])
if internal_functions:
for func in internal_functions:
self.text.append(f"setattr(func, '{func}', {func})")
self.text.extend(["try:",
" from tiramisu3 import *",
"except:",
@ -86,8 +84,11 @@ class TiramisuReflector:
def make_tiramisu_objects(self) -> None:
"""make tiramisu objects
"""
providers = {}
baseelt = BaseElt()
self.set_name(baseelt)
dynamic_path = ''
dynamic = False
basefamily = Family(baseelt,
self.text,
self.objectspace,
@ -95,7 +96,12 @@ class TiramisuReflector:
for elt in self.reorder_family():
self.populate_family(basefamily,
elt,
providers,
dynamic,
dynamic_path,
)
basefamily.elt.information = providers
basefamily.populate_informations()
self.baseelt = baseelt
def reorder_family(self):
@ -115,6 +121,9 @@ class TiramisuReflector:
def populate_family(self,
parent_family,
elt,
providers,
dynamic,
dynamic_path,
):
"""Populate family
"""
@ -123,11 +132,21 @@ class TiramisuReflector:
self.text,
self.objectspace,
)
if not dynamic_path:
dynamic_path = elt.name
else:
dynamic_path = dynamic_path + '.' + elt.name
if dynamic or hasattr(elt, 'suffixes'):
dynamic_path += '{suffix}'
dynamic = True
parent_family.add(family)
for children in vars(elt).values():
if isinstance(children, self.objectspace.family):
self.populate_family(family,
children,
providers,
dynamic,
dynamic_path,
)
continue
if isinstance(children, dict):
@ -139,13 +158,21 @@ class TiramisuReflector:
continue
if isinstance(child, self.objectspace.variable):
self.set_name(child)
sub_dynamic_path = dynamic_path + '.' + child.name
if dynamic:
sub_dynamic_path += '{suffix}'
family.add(Variable(child,
self.text,
self.objectspace,
providers,
sub_dynamic_path,
))
else:
self.populate_family(family,
child,
providers,
dynamic,
dynamic_path,
)
def set_name(self,
@ -185,6 +212,8 @@ class Common:
self.option_name = self.elt.reflector_name
self.populate_attrib()
self.populate_informations()
if hasattr(self.elt, 'provider'):
self.providers['provider:' + self.elt.provider] = self.dynamic_path
return self.option_name
def populate_attrib(self):
@ -239,7 +268,11 @@ class Common:
"""
if not hasattr(self.elt, 'information'):
return
for key, value in vars(self.elt.information).items():
if isinstance(self.elt.information, dict):
informations = self.elt.information
else:
informations = vars(self.elt.information)
for key, value in informations.items():
if key == 'xmlfiles':
continue
if isinstance(value, str):
@ -297,7 +330,11 @@ class Variable(Common):
elt,
text,
objectspace,
providers,
dynamic_path,
):
self.providers = providers
self.dynamic_path = dynamic_path
super().__init__(elt, text, objectspace)
self.object_type = CONVERT_OPTION[elt.type]['opttype']