Removed deprecated plugins BB, Svcmgr, SGenshi

11 files changed, 70 insertions, 212 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index cbcef3405..77c3c1ade 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -104,7 +104,6 @@ plugin_list = ['Account',
                'SSHbase',
                'SSLCA',
                'Statistics',
-               'Svcmgr',
                'TCheetah',
                'TGenshi']
 
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index 816fd2ca7..70984c57d 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -27,7 +27,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore):
                  "interactive",
                  "-s",
                  "stdin"))
-    allowed = ['Metadata', 'BB', "DBStats", "Statistics", "Cfg", "SSHbase"]
+    allowed = ['Metadata', "DBStats", "Statistics", "Cfg", "SSHbase"]
 
     def __init__(self, setup):
         Bcfg2.Server.Admin.MetadataCore.__init__(self, setup)
diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py
index 2faa423c1..b190dd62a 100644
--- a/src/lib/Bcfg2/Server/Admin/Viz.py
+++ b/src/lib/Bcfg2/Server/Admin/Viz.py
@@ -35,7 +35,7 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
     __plugin_blacklist__ = ['DBStats', 'Snapshots', 'Cfg', 'Pkgmgr', 'Packages',
                             'Rules', 'Account', 'Decisions', 'Deps', 'Git',
                             'Svn', 'Fossil', 'Bzr', 'Bundler', 'TGenshi',
-                            'SGenshi', 'Base']
+                            'Base']
 
     def __call__(self, args):
         Bcfg2.Server.Admin.MetadataCore.__call__(self, args)
diff --git a/src/lib/Bcfg2/Server/Lint/GroupNames.py b/src/lib/Bcfg2/Server/Lint/GroupNames.py
index 069d5d2a5..5df98a30e 100644
--- a/src/lib/Bcfg2/Server/Lint/GroupNames.py
+++ b/src/lib/Bcfg2/Server/Lint/GroupNames.py
@@ -1,9 +1,11 @@
 import os
 import re
 import Bcfg2.Server.Lint
-from Bcfg2.Server.Plugins.Bundler import have_genshi
-if have_genshi:
-    from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile
+try:
+    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
+    has_genshi = True
+except ImportError:
+    has_genshi = False
 
 class GroupNames(Bcfg2.Server.Lint.ServerPlugin):
     """ ensure that all named groups are valid group names """
@@ -37,8 +39,8 @@ class GroupNames(Bcfg2.Server.Lint.ServerPlugin):
         """ check bundles for BoundPath entries with missing attrs """
         for bundle in self.core.plugins['Bundler'].entries.values():
             if (self.HandlesFile(bundle.name) and
-                (not have_genshi or
-                 not isinstance(bundle, SGenshiTemplateFile))):
+                (not has_genshi or
+                 not isinstance(bundle, BundleTemplateFile))):
                 self.check_entries(bundle.xdata.xpath("//Group"),
                                    bundle.name)
 
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index b9a6dc2dc..fcb7c6c28 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -5,9 +5,11 @@ import Bcfg2.Server.Lint
 import Bcfg2.Client.Tools.POSIX
 import Bcfg2.Client.Tools.VCS
 from Bcfg2.Server.Plugins.Packages import Apt, Yum
-from Bcfg2.Server.Plugins.Bundler import have_genshi
-if have_genshi:
-    from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile
+try:
+    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
+    has_genshi = True
+except ImportError:
+    has_genshi = False
 
 # format verifying functions
 def is_filename(val):
@@ -157,8 +159,8 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
         if 'Bundler' in self.core.plugins:
             for bundle in self.core.plugins['Bundler'].entries.values():
                 if (self.HandlesFile(bundle.name) and
-                    (not have_genshi or
-                     not isinstance(bundle, SGenshiTemplateFile))):
+                    (not has_genshi or
+                     not isinstance(bundle, BundleTemplateFile))):
                     try:
                         xdata = lxml.etree.XML(bundle.data)
                     except (lxml.etree.XMLSyntaxError, AttributeError):
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index 5499e75c2..b8bdb4755 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -22,7 +22,6 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
                          "%s/Rules/*.xml":"%s/rules.xsd",
                          "%s/Defaults/*.xml":"%s/defaults.xsd",
                          "%s/etc/report-configuration.xml":"%s/report-configuration.xsd",
-                         "%s/Svcmgr/*.xml":"%s/services.xsd",
                          "%s/Deps/*.xml":"%s/deps.xsd",
                          "%s/Decisions/*.xml":"%s/decisions.xsd",
                          "%s/Packages/sources.xml":"%s/packages.xsd",
diff --git a/src/lib/Bcfg2/Server/Plugins/BB.py b/src/lib/Bcfg2/Server/Plugins/BB.py
deleted file mode 100644
index bd518ad19..000000000
--- a/src/lib/Bcfg2/Server/Plugins/BB.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import lxml.etree
-import Bcfg2.Server
-import Bcfg2.Server.Plugin
-import glob
-import os
-import socket
-
-#manage boot symlinks
-  #add statistics check to do build->boot mods
-
-#map profiles: first array is not empty we replace the -p with a determined profile.
-logger = Bcfg2.Server.Plugin.logger
-
-class BBfile(Bcfg2.Server.Plugin.XMLFileBacked):
-    """Class for bb files."""
-    def Index(self):
-        """Build data into an xml object."""
-
-        try:
-            self.data = lxml.etree.XML(self.data,
-                                       parser=Bcfg2.Server.XMLParser)
-        except lxml.etree.XMLSyntaxError:
-            Bcfg2.Server.Plugin.logger.error("Failed to parse %s" % self.name)
-            return
-        self.tftppath = self.data.get('tftp', '/tftpboot')
-        self.macs = {}
-        self.users = {}
-        self.actions = {}
-        self.bootlinks = []
-
-        for node in self.data.findall('Node'):
-            iface = node.find('Interface')
-            if iface != None:
-                mac = "01-%s" % (iface.get('mac'.replace(':','-').lower()))
-                self.actions[node.get('name')] = node.get('action')
-                self.bootlinks.append((mac, node.get('action')))
-                try:
-                    ip = socket.gethostbyname(node.get('name'))
-                except:
-                    logger.error("failed host resolution for %s" % node.get('name'))
-
-                self.macs[node.get('name')] = (iface.get('mac'), ip)
-            else:
-                logger.error("%s" % lxml.etree.tostring(node))
-            self.users[node.get('name')] = node.get('user',"").split(':')
-
-    def enforce_bootlinks(self):
-        for mac, target in self.bootlinks:
-            path = self.tftppath + '/' + mac
-            if not os.path.islink(path):
-                logger.error("Boot file %s not a link" % path)
-            if target != os.readlink(path):
-                try:
-                    os.unlink(path)
-                    os.symlink(target, path)
-                except:
-                    logger.error("Failed to modify link %s" % path)
-
-class BBDirectoryBacked(Bcfg2.Server.Plugin.DirectoryBacked):
-    __child__ = BBfile
-
-
-class BB(Bcfg2.Server.Plugin.Plugin,
-         Bcfg2.Server.Plugin.Connector):
-    """The BB plugin maps users to machines and metadata to machines."""
-    name = 'BB'
-    deprecated = True
-
-    def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Connector.__init__(self)
-        self.store = BBDirectoryBacked(self.data, core.fam)
-
-    def get_additional_data(self, metadata):
-
-        users = {}
-        for user in self.store.entries['bb.xml'].users.get(metadata.hostname.split(".")[0], []):
-            pubkeys = []
-            for fname in glob.glob('/home/%s/.ssh/*.pub'%user):
-                pubkeys.append(open(fname).read())
-
-            users[user] = pubkeys
-
-        return dict([('users', users),
-                      ('macs', self.store.entries['bb.xml'].macs)])
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index 26fe1d822..c3c71eeed 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -12,7 +12,7 @@ import Bcfg2.Server.Lint
 
 try:
     import genshi.template.base
-    from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile
+    import Bcfg2.Server.Plugins.TGenshi
     have_genshi = True
 except:
     have_genshi = False
@@ -26,6 +26,57 @@ class BundleFile(Bcfg2.Server.Plugin.StructFile):
         return bundle
 
 
+if have_genshi:
+    class BundleTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile,
+                             Bcfg2.Server.Plugin.StructFile):
+        def __init__(self, name, specific, encoding):
+            Bcfg2.Server.Plugins.TGenshi.TemplateFile.__init__(self, name,
+                                                               specific,
+                                                               encoding)
+            Bcfg2.Server.Plugin.StructFile.__init__(self, name)
+
+        def get_xml_value(self, metadata):
+            if not hasattr(self, 'template'):
+                logger.error("No parsed template information for %s" %
+                             self.name)
+                raise Bcfg2.Server.Plugin.PluginExecutionError
+            try:
+                stream = self.template.generate(metadata=metadata).filter(
+                    Bcfg2.Server.Plugins.TGenshi.removecomment)
+                data = lxml.etree.XML(stream.render('xml',
+                                                    strip_whitespace=False),
+                                      parser=Bcfg2.Server.XMLParser)
+                bundlename = os.path.splitext(os.path.basename(self.name))[0]
+                bundle = lxml.etree.Element('Bundle', name=bundlename)
+                for item in self.Match(metadata, data):
+                    bundle.append(copy.deepcopy(item))
+                return bundle
+            except LookupError:
+                lerror = sys.exc_info()[1]
+                logger.error('Genshi lookup error: %s' % lerror)
+            except genshi.template.TemplateError:
+                terror = sys.exc_info()[1]
+                logger.error('Genshi template error: %s' % terror)
+                raise
+            except genshi.input.ParseError:
+                perror = sys.exc_info()[1]
+                logger.error('Genshi parse error: %s' % perror)
+            raise
+
+        def Match(self, metadata, xdata):
+            """Return matching fragments of parsed template."""
+            rv = []
+            for child in xdata.getchildren():
+                rv.extend(self._match(child, metadata))
+            logger.debug("File %s got %d match(es)" % (self.name, len(rv)))
+            return rv
+
+
+    class SGenshiTemplateFile(BundleTemplateFile):
+        # provided for backwards compat
+        pass
+
+
 class Bundler(Bcfg2.Server.Plugin.Plugin,
               Bcfg2.Server.Plugin.Structure,
               Bcfg2.Server.Plugin.XMLDirectoryBacked):
@@ -58,7 +109,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin,
              nsmap['py'] == 'http://genshi.edgewall.org/')):
             if have_genshi:
                 spec = Bcfg2.Server.Plugin.Specificity()
-                return SGenshiTemplateFile(name, spec, self.encoding)
+                return BundleTemplateFile(name, spec, self.encoding)
             else:
                 raise Bcfg2.Server.Plugin.PluginExecutionError("Genshi not available: %s" % name)
         else:
@@ -101,7 +152,7 @@ class BundlerLint(Bcfg2.Server.Lint.ServerPlugin):
         for bundle in self.core.plugins['Bundler'].entries.values():
             if (self.HandlesFile(bundle.name) and
                 (not have_genshi or
-                 not isinstance(bundle, SGenshiTemplateFile))):
+                 not isinstance(bundle, BundleTemplateFile))):
                     self.bundle_names(bundle)
 
     @classmethod
diff --git a/src/lib/Bcfg2/Server/Plugins/SGenshi.py b/src/lib/Bcfg2/Server/Plugins/SGenshi.py
deleted file mode 100644
index 12c125c62..000000000
--- a/src/lib/Bcfg2/Server/Plugins/SGenshi.py
+++ /dev/null
@@ -1,98 +0,0 @@
-'''This module implements a templating generator based on Genshi'''
-
-import genshi.input
-import genshi.template
-import lxml.etree
-import logging
-import copy
-import sys
-import os.path
-import Bcfg2.Server
-import Bcfg2.Server.Plugin
-import Bcfg2.Server.Plugins.TGenshi
-
-logger = logging.getLogger('Bcfg2.Plugins.SGenshi')
-
-
-class SGenshiTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile,
-                          Bcfg2.Server.Plugin.StructFile):
-    def __init__(self, name, specific, encoding):
-        Bcfg2.Server.Plugins.TGenshi.TemplateFile.__init__(self, name,
-                                                           specific, encoding)
-        Bcfg2.Server.Plugin.StructFile.__init__(self, name)
-
-    def get_xml_value(self, metadata):
-        if not hasattr(self, 'template'):
-            logger.error("No parsed template information for %s" % (self.name))
-            raise Bcfg2.Server.Plugin.PluginExecutionError
-        try:
-            stream = self.template.generate(metadata=metadata).filter( \
-                Bcfg2.Server.Plugins.TGenshi.removecomment)
-            data = lxml.etree.XML(stream.render('xml', strip_whitespace=False),
-                                  parser=Bcfg2.Server.XMLParser)
-            bundlename = os.path.splitext(os.path.basename(self.name))[0]
-            bundle = lxml.etree.Element('Bundle', name=bundlename)
-            for item in self.Match(metadata, data):
-                bundle.append(copy.deepcopy(item))
-            return bundle
-        except LookupError:
-            lerror = sys.exc_info()[1]
-            logger.error('Genshi lookup error: %s' % lerror)
-        except genshi.template.TemplateError:
-            terror = sys.exc_info()[1]
-            logger.error('Genshi template error: %s' % terror)
-            raise
-        except genshi.input.ParseError:
-            perror = sys.exc_info()[1]
-            logger.error('Genshi parse error: %s' % perror)
-        raise
-
-    def Match(self, metadata, xdata):
-        """Return matching fragments of parsed template."""
-        rv = []
-        for child in xdata.getchildren():
-            rv.extend(self._match(child, metadata))
-        logger.debug("File %s got %d match(es)" % (self.name, len(rv)))
-        return rv
-
-class SGenshiEntrySet(Bcfg2.Server.Plugin.EntrySet):
-
-    def __init__(self, path, fam, encoding):
-        fpattern = '\S+\.xml'
-        Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path,
-                                              SGenshiTemplateFile, encoding)
-        fam.AddMonitor(path, self)
-
-    def HandleEvent(self, event):
-        '''passthrough event handler for old calling convention'''
-        if event.filename != self.path:
-            return self.handle_event(event)
-
-    def BuildStructures(self, metadata):
-        """Build SGenshi structures."""
-        ret = []
-        for entry in self.get_matching(metadata):
-            try:
-                ret.append(entry.get_xml_value(metadata))
-            except:
-                logger.error("SGenshi: Failed to template file %s" % entry.name)
-        return ret
-
-
-class SGenshi(SGenshiEntrySet,
-              Bcfg2.Server.Plugin.Plugin,
-              Bcfg2.Server.Plugin.Structure):
-    """The SGenshi plugin provides templated structures."""
-    name = 'SGenshi'
-    __author__ = 'bcfg-dev@mcs.anl.gov'
-    deprecated = True
-
-    def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Structure.__init__(self)
-        try:
-            SGenshiEntrySet.__init__(self, self.data, self.core.fam, core.encoding)
-        except:
-            logger.error("Failed to load %s repository; disabling %s" \
-                         % (self.name, self.name))
-            raise Bcfg2.Server.Plugin.PluginInitError
diff --git a/src/lib/Bcfg2/Server/Plugins/Svcmgr.py b/src/lib/Bcfg2/Server/Plugins/Svcmgr.py
deleted file mode 100644
index f4232ad5c..000000000
--- a/src/lib/Bcfg2/Server/Plugins/Svcmgr.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""This generator provides service mappings."""
-
-import Bcfg2.Server.Plugin
-
-
-class Svcmgr(Bcfg2.Server.Plugin.PrioDir):
-    """This is a generator that handles service assignments."""
-    name = 'Svcmgr'
-    __author__ = 'bcfg-dev@mcs.anl.gov'
-    deprecated = True
diff --git a/src/lib/Bcfg2/Server/Plugins/__init__.py b/src/lib/Bcfg2/Server/Plugins/__init__.py
index f9f1b4e52..b33eeba28 100644
--- a/src/lib/Bcfg2/Server/Plugins/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/__init__.py
@@ -25,10 +25,8 @@ __all__ = [
            'SSHbase',
            'Snapshots',
            'Statistics',
-           'Svcmgr',
            'Svn',
            'TCheetah',
            'Trigger',
-           'SGenshi',
            'TGenshi',
           ]