Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 13 insertions, 46 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Decisions.py b/src/lib/Bcfg2/Server/Plugins/Decisions.py
index eae18fdfe..a67a356d4 100644
--- a/src/lib/Bcfg2/Server/Plugins/Decisions.py
+++ b/src/lib/Bcfg2/Server/Plugins/Decisions.py
@@ -2,66 +2,33 @@
 blacklist certain entries. """
 
 import os
-import sys
-import lxml.etree
 import Bcfg2.Server.Plugin
+import Bcfg2.Server.FileMonitor
 
 
-class DecisionFile(Bcfg2.Server.Plugin.SpecificData):
+class DecisionFile(Bcfg2.Server.Plugin.StructFile):
     """ Representation of a Decisions XML file """
 
-    def __init__(self, name, specific, encoding):
-        Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific,
-                                                  encoding)
-        self.contents = None
-
-    def handle_event(self, event):
-        Bcfg2.Server.Plugin.SpecificData.handle_event(self, event)
-        self.contents = lxml.etree.XML(self.data)
-
-    def get_decisions(self):
+    def get_decisions(self, metadata):
         """ Get a list of whitelist or blacklist tuples """
+        if self.xdata is None:
+            # no white/blacklist has been read yet, probably because
+            # it doesn't exist
+            return []
         return [(x.get('type'), x.get('name'))
-                for x in self.contents.xpath('.//Decision')]
+                for x in self.XMLMatch(metadata).xpath('.//Decision')]
 
 
-class Decisions(Bcfg2.Server.Plugin.EntrySet,
-                Bcfg2.Server.Plugin.Plugin,
+class Decisions(Bcfg2.Server.Plugin.Plugin,
                 Bcfg2.Server.Plugin.Decision):
-    """ Decisions plugin
-
-    Arguments:
-    - `core`: Bcfg2.Core instance
-    - `datastore`: File repository location
-    """
-    basename_is_regex = True
+    """ Decisions plugin """
     __author__ = 'bcfg-dev@mcs.anl.gov'
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.Decision.__init__(self)
-
-        Bcfg2.Server.Plugin.EntrySet.__init__(self, '(white|black)list',
-                                              self.data,
-                                              DecisionFile,
-                                              core.setup['encoding'])
-        try:
-            core.fam.AddMonitor(self.data, self)
-        except OSError:
-            err = sys.exc_info()[1]
-            msg = 'Adding filemonitor for %s failed: %s' % (self.data, err)
-            self.logger.error(msg)
-            raise Bcfg2.Server.Plugin.PluginInitError(msg)
-
-    def HandleEvent(self, event):
-        """ Handle events on Decision files by passing them off to
-        EntrySet.handle_event """
-        if event.filename != self.path:
-            return self.handle_event(event)
+        self.whitelist = DecisionFile(os.path.join(self.data, "whitelist.xml"))
+        self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml"))
 
     def GetDecisions(self, metadata, mode):
-        ret = []
-        for cdt in self.get_matching(metadata):
-            if os.path.basename(cdt.name).startswith(mode):
-                ret.extend(cdt.get_decisions())
-        return ret
+        return getattr(self, mode).get_decision(metadata)