From d1cfc16642d28d52345cdbc50a4fe2024e5cd0ad Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 21 Nov 2016 18:32:43 +0100 Subject: Server/Lint: name attribute is required for all Path entries --- src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index ebf4c4954..91ef036fb 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -53,26 +53,25 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): def __init__(self, *args, **kwargs): Bcfg2.Server.Lint.ServerPlugin.__init__(self, *args, **kwargs) self.required_attrs = dict( - Path=dict( - device=dict(name=is_filename, - owner=is_username, - group=is_username, - dev_type=lambda v: v in device_map), - directory=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode), - file=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode, - __text__=None), - hardlink=dict(name=is_filename, to=is_filename), - symlink=dict(name=is_filename), - ignore=dict(name=is_filename), - nonexistent=dict(name=is_filename), - permissions=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode), - vcs=dict(vcstype=lambda v: (v != 'Path' and - hasattr(Bcfg2.Client.Tools.VCS.VCS, - "Install%s" % v)), - revision=None, sourceurl=None)), + Path={ + '__any__': dict(name=is_filename), + 'device': dict(owner=is_username, group=is_username, + dev_type=lambda v: v in device_map), + 'directory': dict(owner=is_username, group=is_username, + mode=is_octal_mode), + 'file': dict(owner=is_username, group=is_username, + mode=is_octal_mode, __text__=None), + 'hardlink': dict(to=is_filename), + 'symlink': dict(), + 'ignore': dict(), + 'nonexistent': dict(), + 'permissions': dict(owner=is_username, group=is_username, + mode=is_octal_mode), + 'vcs': dict(vcstype=lambda v: (v != 'Path' and + hasattr(Bcfg2.Client.Tools.VCS.VCS, + "Install%s" % v)), + revision=None, sourceurl=None), + }, Service={"__any__": dict(name=None), "smf": dict(name=None, FMRI=None)}, Action={None: dict(name=None, -- cgit v1.2.3-1-g7c22