Options: migrated bcfg2-lint to new parser

1 files changed, 13 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/InfoXML.py b/src/lib/Bcfg2/Server/Lint/InfoXML.py
index 184f657b7..4b1513a11 100644
--- a/src/lib/Bcfg2/Server/Lint/InfoXML.py
+++ b/src/lib/Bcfg2/Server/Lint/InfoXML.py
@@ -15,6 +15,15 @@ class InfoXML(Bcfg2.Server.Lint.ServerPlugin):
     * Paranoid mode disabled in an ``info.xml`` file;
     * Required attributes missing from ``info.xml``
     """
+
+    options = Bcfg2.Server.Lint.ServerPlugin.options + [
+        Bcfg2.Options.Common.default_paranoid,
+        Bcfg2.Options.Option(
+            cf=("InfoXML", "required_attrs"),
+            type=Bcfg2.Options.Types.comma_list,
+            default=["owner", "group", "mode"],
+            help="Attributes to require on <Info> tags")]
+
     def Run(self):
         if 'Cfg' not in self.core.plugins:
             return
@@ -26,7 +35,7 @@ class InfoXML(Bcfg2.Server.Lint.ServerPlugin):
                 for entry in entryset.entries.values():
                     if isinstance(entry, CfgInfoXML):
                         self.check_infoxml(infoxml_fname,
-                                           entry.infoxml.pnode.data)
+                                           entry.infoxml.xdata)
                         found = True
                 if not found:
                     self.LintError("no-infoxml",
@@ -42,8 +51,7 @@ class InfoXML(Bcfg2.Server.Lint.ServerPlugin):
         """ Verify that info.xml contains everything it should. """
         for info in xdata.getroottree().findall("//Info"):
             required = []
-            if "required_attrs" in self.config:
-                required = self.config["required_attrs"].split(",")
+            required = Bcfg2.Options.setup.required_attrs
 
             missing = [attr for attr in required if info.get(attr) is None]
             if missing:
@@ -52,10 +60,10 @@ class InfoXML(Bcfg2.Server.Lint.ServerPlugin):
                                (",".join(missing), fname,
                                 self.RenderXML(info)))
 
-            if ((Bcfg2.Options.MDATA_PARANOID.value and
+            if ((Bcfg2.Options.setup.default_paranoid == "true" and
                  info.get("paranoid") is not None and
                  info.get("paranoid").lower() == "false") or
-                (not Bcfg2.Options.MDATA_PARANOID.value and
+                (Bcfg2.Options.setup.default_paranoid == "false" and
                  (info.get("paranoid") is None or
                   info.get("paranoid").lower() != "true"))):
                 self.LintError("paranoid-false",