1 files changed, 45 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
index 58b4d4afb..837f47279 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
@@ -1,6 +1,9 @@
+import os
 import re
+import sys
 import logging
 import lxml.etree
+import Bcfg2.Server.Lint
 import Bcfg2.Server.Plugin
 
 class PackedDigitRange(object):
@@ -58,7 +61,7 @@ class PatternMap(object):
         return self.groups
 
     def process_re(self, name):
-        match = self.re.match(name)
+        match = self.re.search(name)
         if not match:
             return None
         ret = list()
@@ -70,17 +73,22 @@ class PatternMap(object):
             ret.append(newg)
         return ret
 
+    def __str__(self):
+        return "%s: %s %s" % (self.__class__.__name__, self.pattern,
+                              self.groups)
+
 
-class PatternFile(Bcfg2.Server.Plugin.SingleXMLFileBacked):
+class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked):
     __identifier__ = None
 
-    def __init__(self, filename, fam):
-        Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, filename, fam)
+    def __init__(self, filename, fam=None):
+        Bcfg2.Server.Plugin.XMLFileBacked.__init__(self, filename, fam=fam,
+                                                   should_monitor=True)
         self.patterns = []
         self.logger = logging.getLogger(self.__class__.__name__)
 
     def Index(self):
-        Bcfg2.Server.Plugin.SingleXMLFileBacked.Index(self)
+        Bcfg2.Server.Plugin.XMLFileBacked.Index(self)
         self.patterns = []
         for entry in self.xdata.xpath('//GroupPattern'):
             try:
@@ -112,13 +120,42 @@ class PatternFile(Bcfg2.Server.Plugin.SingleXMLFileBacked):
 class GroupPatterns(Bcfg2.Server.Plugin.Plugin,
                     Bcfg2.Server.Plugin.Connector):
     name = "GroupPatterns"
-    experimental = True
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.Connector.__init__(self)
-        self.config = PatternFile(self.data + '/config.xml',
-                                  core.fam)
+        self.config = PatternFile(os.path.join(self.data, 'config.xml'),
+                                  fam=core.fam)
 
     def get_additional_groups(self, metadata):
         return self.config.process_patterns(metadata.hostname)
+
+
+class GroupPatternsLint(Bcfg2.Server.Lint.ServerPlugin):
+    def Run(self):
+        """ run plugin """
+        cfg = self.core.plugins['GroupPatterns'].config
+        for entry in cfg.xdata.xpath('//GroupPattern'):
+            groups = [g.text for g in entry.findall('Group')]
+            self.check(entry, groups, ptype='NamePattern')
+            self.check(entry, groups, ptype='NameRange')
+
+    @classmethod
+    def Errors(cls):
+        return {"pattern-fails-to-initialize":"error"}
+
+    def check(self, entry, groups, ptype="NamePattern"):
+        if ptype == "NamePattern":
+            pmap = lambda p: PatternMap(p, None, groups)
+        else:
+            pmap = lambda p: PatternMap(None, p, groups)
+
+        for el in entry.findall(ptype):
+            pat = el.text
+            try:
+                pmap(pat)
+            except:
+                err = sys.exc_info()[1]
+                self.LintError("pattern-fails-to-initialize",
+                               "Failed to initialize %s %s for %s: %s" %
+                               (ptype, pat, entry.get('pattern'), err))