moved some libraries in Bcfg2/ into more specific (Server/ or Client/) places

10 files changed, 37 insertions, 38 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
index 3b3b95ff5..516eba2f6 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
@@ -4,7 +4,7 @@
 from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator
 try:
-    from Bcfg2.Encryption import bruteforce_decrypt, EVPError
+    from Bcfg2.Server.Encryption import bruteforce_decrypt, EVPError
     HAS_CRYPTO = True
 except ImportError:
     HAS_CRYPTO = False
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
index 215e4c1f1..a285eecd8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
@@ -6,7 +6,7 @@ from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 
 try:
-    from Bcfg2.Encryption import bruteforce_decrypt
+    from Bcfg2.Server.Encryption import bruteforce_decrypt
     HAS_CRYPTO = True
 except ImportError:
     HAS_CRYPTO = False
@@ -21,7 +21,7 @@ except ImportError:
 class EncryptedTemplateLoader(TemplateLoader):
     """ Subclass :class:`genshi.template.TemplateLoader` to decrypt
     the data on the fly as it's read in using
-    :func:`Bcfg2.Encryption.bruteforce_decrypt` """
+    :func:`Bcfg2.Server.Encryption.bruteforce_decrypt` """
     def _instantiate(self, cls, fileobj, filepath, filename, encoding=None):
         plaintext = StringIO(bruteforce_decrypt(fileobj.read()))
         return TemplateLoader._instantiate(self, cls, plaintext, filepath,
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
index 4d6639e4d..1711cc655 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
@@ -9,7 +9,7 @@ from Bcfg2.Server.Plugin import StructFile
 from Bcfg2.Server.Plugins.Cfg import CfgCreator, CfgCreationError
 from Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator import CfgPublicKeyCreator
 try:
-    import Bcfg2.Encryption
+    from Bcfg2.Server.Encryption import get_passphrases, ssl_encrypt
     HAS_CRYPTO = True
 except ImportError:
     HAS_CRYPTO = False
@@ -50,9 +50,8 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile):
         if (HAS_CRYPTO and
             self.setup.cfp.has_section("sshkeys") and
             self.setup.cfp.has_option("sshkeys", "passphrase")):
-            return Bcfg2.Encryption.get_passphrases()[self.setup.cfp.get(
-                    "sshkeys",
-                    "passphrase")]
+            return get_passphrases()[self.setup.cfp.get("sshkeys",
+                                                        "passphrase")]
         return None
 
     def handle_event(self, event):
@@ -198,8 +197,7 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile):
             privkey = open(filename).read()
             if HAS_CRYPTO and self.passphrase:
                 self.debug_log("Cfg: Encrypting key data at %s" % filename)
-                privkey = Bcfg2.Encryption.ssl_encrypt(privkey,
-                                                       self.passphrase)
+                privkey = ssl_encrypt(privkey, self.passphrase)
                 specificity['ext'] = '.crypt'
 
             self.write_data(privkey, **specificity)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
index cf4234ed0..3ad64b242 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
@@ -81,6 +81,7 @@ import Bcfg2.Server.Plugin
 from Bcfg2.Server.FileMonitor import get_fam
 from Bcfg2.Options import get_option_parser
 from Bcfg2.Compat import any, md5  # pylint: disable=W0622
+from Bcfg2.Server.Statistics import track_statistics
 
 LOGGER = logging.getLogger(__name__)
 
@@ -213,7 +214,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
             cachefiles.add(source.cachefile)
         return list(cachefiles)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def get_groups(self, grouplist):
         """ Given a list of package group names, return a dict of
         ``<group name>: <list of packages>``.  This method is provided
@@ -234,7 +235,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
             rv[group] = self.get_group(group, ptype)
         return rv
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def get_group(self, group, ptype=None):
         """ Get the list of packages of the given type in a package
         group.
@@ -469,7 +470,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
         """
         return list(complete.difference(initial))
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def complete(self, packagelist):  # pylint: disable=R0912,R0914
         """ Build a complete list of all packages and their dependencies.
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index 876ee6090..782e077bb 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -5,6 +5,7 @@ import os
 import sys
 import Bcfg2.Server.Plugin
 from Bcfg2.Options import get_option_parser
+from Bcfg2.Server.Statistics import track_statistics
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError
 
 
@@ -109,7 +110,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
         load its data. """
         return sorted(list(self.parsed)) == sorted(self.extras)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Index(self):
         Bcfg2.Server.Plugin.StructFile.Index(self)
         self.entries = []
@@ -122,7 +123,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
         ``Index`` is responsible for calling :func:`source_from_xml`
         for each ``Source`` tag in each file. """
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def source_from_xml(self, xsource):
         """ Create a
         :class:`Bcfg2.Server.Plugins.Packages.Source.Source` subclass
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 7a8b2827a..5cf90e188 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -54,6 +54,7 @@ from Bcfg2.Options import get_option_parser
 from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \
      HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \
      urlopen, cPickle, md5
+from Bcfg2.Server.Statistics import track_statistics
 
 
 def fetch_url(url):
@@ -320,7 +321,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
                       self.essentialpkgs), cache, 2)
         cache.close()
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def setup_data(self, force_update=False):
         """ Perform all data fetching and setup tasks.  For most
         backends, this involves downloading all metadata from the
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index c5d59eb24..4057ed230 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -69,6 +69,7 @@ from Bcfg2.Compat import StringIO, cPickle, HTTPError, URLError, \
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError, Source, \
      fetch_url
+from Bcfg2.Server.Statistics import track_statistics
 
 LOGGER = logging.getLogger(__name__)
 
@@ -363,7 +364,7 @@ class YumCollection(Collection):
             cachefiles.add(self.cachefile)
         return list(cachefiles)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def write_config(self):
         """ Write the server-side config file to :attr:`cfgfile` based
         on the data from :func:`get_config`"""
@@ -465,7 +466,7 @@ class YumCollection(Collection):
             return "# This config was generated automatically by the Bcfg2 " \
                    "Packages plugin\n\n" + buf.getvalue()
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def build_extra_structures(self, independent):
         """ Add additional entries to the ``<Independent/>`` section
         of the final configuration.  This adds several kinds of
@@ -572,7 +573,7 @@ class YumCollection(Collection):
                                         name=self.pulp_cert_set.certpath)
             self.pulp_cert_set.bind_entry(crt, self.metadata)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def _get_pulp_consumer(self, consumerapi=None):
         """ Get a Pulp consumer object for the client.
 
@@ -601,7 +602,7 @@ class YumCollection(Collection):
                               "%s" % err)
         return consumer
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def _add_gpg_instances(self, keyentry, localkey, remotekey, keydata=None):
         """ Add GPG keys instances to a ``Package`` entry.  This is
         called from :func:`build_extra_structures` to add GPG keys to
@@ -644,7 +645,7 @@ class YumCollection(Collection):
             self.logger.error("Packages: Could not read GPG key %s: %s" %
                               (localkey, err))
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def get_groups(self, grouplist):
         """ If using the yum libraries, given a list of package group
         names, return a dict of ``<group name>: <list of packages>``.
@@ -806,7 +807,7 @@ class YumCollection(Collection):
                 new.append(pkg)
         return new
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def complete(self, packagelist):
         """ Build a complete list of all packages and their dependencies.
 
@@ -846,7 +847,7 @@ class YumCollection(Collection):
         else:
             return set(), set()
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def call_helper(self, command, inputdata=None):
         """ Make a call to :ref:`bcfg2-yum-helper`.  The yum libs have
         horrific memory leaks, so apparently the right way to get
@@ -1067,7 +1068,7 @@ class YumSource(Source):
                 self.file_to_arch[self.escape_url(fullurl)] = arch
         return urls
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def read_files(self):
         """ When using the builtin yum parser, read and parse locally
         downloaded metadata files.  This diverges from the stock
@@ -1109,7 +1110,7 @@ class YumSource(Source):
                 self.packages[key].difference(self.packages['global'])
         self.save_state()
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def parse_filelist(self, data, arch):
         """ parse filelists.xml.gz data """
         if arch not in self.filemap:
@@ -1123,7 +1124,7 @@ class YumSource(Source):
                         self.filemap[arch][fentry.text] = \
                             set([pkg.get('name')])
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def parse_primary(self, data, arch):
         """ parse primary.xml.gz data """
         if arch not in self.packages:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 169dcd588..ca7b7c530 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -13,6 +13,7 @@ from Bcfg2.Compat import ConfigParser, urlopen, HTTPError
 from Bcfg2.Server.Plugins.Packages.Collection import Collection, \
     get_collection_class
 from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources
+from Bcfg2.Server.Statistics import track_statistics
 
 #: The default path for generated yum configs
 YUM_CONFIG_DEFAULT = "/etc/yum.repos.d/bcfg2.repo"
@@ -235,7 +236,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                 return True
         return False
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def validate_structures(self, metadata, structures):
         """ Do the real work of Packages.  This does two things:
 
@@ -270,7 +271,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         collection.build_extra_structures(indep)
         structures.append(indep)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def _build_packages(self, metadata, independent, structures,
                         collection=None):
         """ Perform dependency resolution and build the complete list
@@ -341,7 +342,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         newpkgs.sort()
         collection.packages_to_entry(newpkgs, independent)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Refresh(self):
         """ Packages.Refresh() => True|False
 
@@ -349,7 +350,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         self._load_config(force_update=True)
         return True
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Reload(self):
         """ Packages.Refresh() => True|False
 
@@ -445,7 +446,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
             if kfile not in keyfiles:
                 os.unlink(kfile)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def get_collection(self, metadata):
         """ Get a
         :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection`
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 7b8ef2209..2ea5088de 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -10,6 +10,7 @@ import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
 import Bcfg2.Server.FileMonitor
+from Bcfg2.Server.Statistics import track_statistics
 
 try:
     from django.db import models
@@ -190,7 +191,7 @@ class Probes(Bcfg2.Server.Plugin.Probing,
         self.load_data()
     __init__.__doc__ = Bcfg2.Server.Plugin.DatabaseBacked.__init__.__doc__
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def write_data(self, client):
         """ Write probe data out for use with bcfg2-info """
         if self._use_db:
@@ -293,12 +294,12 @@ class Probes(Bcfg2.Server.Plugin.Probing,
                 self.cgroups[pgroup.hostname] = []
             self.cgroups[pgroup.hostname].append(pgroup.group)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def GetProbes(self, meta):
         return self.probes.get_probe_data(meta)
     GetProbes.__doc__ = Bcfg2.Server.Plugin.Probing.GetProbes.__doc__
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def ReceiveData(self, client, datalist):
         if self.core.metadata_cache_mode in ['cautious', 'aggressive']:
             if client.hostname in self.cgroups:
diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index b7ede594c..762f9f8f0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -10,11 +10,6 @@ import lxml.etree
 from Bcfg2.Options import get_option_parser
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugin import PluginExecutionError
-try:
-    import Bcfg2.Encryption
-    HAS_CRYPTO = True
-except ImportError:
-    HAS_CRYPTO = False
 
 try:
     import json