added module-level OptionParser to avoid passing it as an argument or global all over

8 files changed, 50 insertions, 59 deletions

diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 444e86a7c..e9beb47cd 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -3,8 +3,8 @@
 
 import sys
 import signal
-import Bcfg2.Options
 from Bcfg2.Client.Client import Client
+from Bcfg2.Options import get_option_parser, CLIENT_COMMON_OPTIONS
 
 
 def cb_sigint_handler(signum, frame):
@@ -13,8 +13,7 @@ def cb_sigint_handler(signum, frame):
 
 
 def main():
-    optinfo = Bcfg2.Options.CLIENT_COMMON_OPTIONS
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = get_option_parser(CLIENT_COMMON_OPTIONS)
     setup.parse(sys.argv[1:])
 
     if setup['args']:
@@ -23,7 +22,7 @@ def main():
         raise SystemExit(1)
 
     signal.signal(signal.SIGINT, cb_sigint_handler)
-    return Client(setup).run()
+    return Client().run()
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index fa4307702..8f6643ee0 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -41,7 +41,7 @@ def main():
     optinfo = dict()
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(optinfo)
     # override default help message to include description of all modes
     setup.hm = "Usage:\n\n%s\n%s" % (setup.buildHelpMessage(),
                                      create_description())
@@ -80,7 +80,7 @@ def main():
             err = sys.exc_info()[1]
             log.error("Failed to load admin mode %s: %s" % (modname, err))
             raise SystemExit(1)
-        mode = mode_cls(setup)
+        mode = mode_cls()
         try:
             mode(setup['args'][1:])
         finally:
diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt
index fde6af582..6a13b9bc5 100755
--- a/src/sbin/bcfg2-crypt
+++ b/src/sbin/bcfg2-crypt
@@ -27,8 +27,8 @@ class EncryptionChunkingError(Exception):
 class Encryptor(object):
     """ Generic encryptor for all files """
 
-    def __init__(self, setup):
-        self.setup = setup
+    def __init__(self):
+        self.setup = Bcfg2.Options.get_option_parser()
         self.passphrase = None
         self.pname = None
         self.logger = logging.getLogger(self.__class__.__name__)
@@ -56,7 +56,7 @@ class Encryptor(object):
     def set_passphrase(self):
         """ set the passphrase for the current file """
         if (not self.setup.cfp.has_section(Bcfg2.Encryption.CFG_SECTION) or
-            len(Bcfg2.Encryption.get_passphrases(self.setup)) == 0):
+            len(Bcfg2.Encryption.get_passphrases()) == 0):
             self.logger.error("No passphrases available in %s" %
                               self.setup['configfile'])
             return False
@@ -83,7 +83,7 @@ class Encryptor(object):
                                   (self.pname, self.setup['configfile']))
                 return False
         else:
-            pnames = Bcfg2.Encryption.get_passphrases(self.setup)
+            pnames = Bcfg2.Encryption.get_passphrases()
             if len(pnames) == 1:
                 self.pname = pnames.keys()[0]
                 self.passphrase = pnames[self.pname]
@@ -127,9 +127,7 @@ class Encryptor(object):
     #  pylint: disable=W0613
     def _encrypt(self, plaintext, passphrase, name=None):
         """ encrypt a single chunk of a file """
-        return Bcfg2.Encryption.ssl_encrypt(
-            plaintext, passphrase,
-            Bcfg2.Encryption.get_algorithm(self.setup))
+        return Bcfg2.Encryption.ssl_encrypt(plaintext, passphrase)
     #  pylint: enable=W0613
 
     def decrypt(self, fname):
@@ -162,7 +160,7 @@ class Encryptor(object):
                 except TypeError:
                     pchunk = None
                     for pname, passphrase in \
-                          Bcfg2.Encryption.get_passphrases(self.setup).items():
+                          Bcfg2.Encryption.get_passphrases().items():
                         self.logger.debug("Trying passphrase %s" % pname)
                         try:
                             pchunk = self._decrypt(chunk, passphrase)
@@ -196,9 +194,7 @@ class Encryptor(object):
 
     def _decrypt(self, crypted, passphrase):
         """ decrypt a single chunk """
-        return Bcfg2.Encryption.ssl_decrypt(
-            crypted, passphrase,
-            Bcfg2.Encryption.get_algorithm(self.setup))
+        return Bcfg2.Encryption.ssl_decrypt(crypted, passphrase)
 
     def write_encrypted(self, fname, data=None):
         """ write encrypted data to disk """
@@ -287,10 +283,8 @@ class PropertiesEncryptor(Encryptor):
         if name is None:
             name = "true"
         if plaintext.text and plaintext.text.strip():
-            plaintext.text = Bcfg2.Encryption.ssl_encrypt(
-                plaintext.text,
-                passphrase,
-                Bcfg2.Encryption.get_algorithm(self.setup)).strip()
+            plaintext.text = Bcfg2.Encryption.ssl_encrypt(plaintext.text,
+                                                          passphrase).strip()
             plaintext.set("encrypted", name)
         return plaintext
 
@@ -358,10 +352,8 @@ class PropertiesEncryptor(Encryptor):
         if not crypted.text or not crypted.text.strip():
             self.logger.warning("Skipping empty element %s" % crypted.tag)
             return crypted
-        decrypted = Bcfg2.Encryption.ssl_decrypt(
-            crypted.text,
-            passphrase,
-            Bcfg2.Encryption.get_algorithm(self.setup)).strip()
+        decrypted = Bcfg2.Encryption.ssl_decrypt(crypted.text,
+                                                 passphrase).strip()
         try:
             crypted.text = decrypted.encode('ascii', 'xmlcharrefreplace')
         except UnicodeDecodeError:
@@ -379,10 +371,10 @@ def main():  # pylint: disable=R0912,R0915
     optinfo = dict(interactive=Bcfg2.Options.INTERACTIVE)
     optinfo.update(Bcfg2.Options.CRYPT_OPTIONS)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(optinfo)
     setup.hm = "     bcfg2-crypt [options] <filename>\nOptions:\n%s" % \
         setup.buildHelpMessage()
-    setup.parse(sys.argv[1:])
+    setup.parse()
 
     if not setup['args']:
         print(setup.hm)
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index fa8c89b46..c697e9fca 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -115,9 +115,9 @@ def load_interpreters():
 
 class InfoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore):
     """Main class for bcfg2-info."""
-    def __init__(self, setup):
+    def __init__(self):
         cmd.Cmd.__init__(self)
-        Bcfg2.Server.Core.BaseCore.__init__(self, setup=setup)
+        Bcfg2.Server.Core.BaseCore.__init__(self)
         self.prompt = '> '
         self.cont = True
         self.fam.handle_events_in_interval(4)
@@ -751,7 +751,7 @@ def main():
                    interpreter=Bcfg2.Options.INTERPRETER)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(optinfo)
     setup.hm = "\n".join(["     bcfg2-info [options] [command <command args>]",
                           "Options:",
                           setup.buildHelpMessage(),
@@ -772,12 +772,12 @@ def main():
         sys.exit(0)
     elif setup['profile'] and HAS_PROFILE:
         prof = profile.Profile()
-        loop = prof.runcall(InfoCore, setup)
+        loop = prof.runcall(InfoCore)
         display_trace(prof)
     else:
         if setup['profile']:
             print("Profiling functionality not available.")
-        loop = InfoCore(setup)
+        loop = InfoCore()
 
     loop.run(setup['args'])
 
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 959a2d8ed..f12fcc6c4 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -13,37 +13,36 @@ import Bcfg2.Server.Lint
 LOGGER = logging.getLogger('bcfg2-lint')
 
 
-def run_serverless_plugins(plugins, setup=None, errorhandler=None, files=None):
+def run_serverless_plugins(plugins, errorhandler=None, files=None):
     """ Run serverless plugins """
     LOGGER.debug("Running serverless plugins")
     for plugin_name, plugin in list(plugins.items()):
-        run_plugin(plugin, plugin_name, errorhandler=errorhandler,
-                   setup=setup, files=files)
+        run_plugin(plugin, plugin_name, errorhandler=errorhandler, files=files)
 
 
-def run_server_plugins(plugins, setup=None, errorhandler=None, files=None):
+def run_server_plugins(plugins, errorhandler=None, files=None):
     """ run plugins that require a running server to run """
-    core = load_server(setup)
+    core = load_server()
     try:
         LOGGER.debug("Running server plugins")
         for plugin_name, plugin in list(plugins.items()):
             run_plugin(plugin, plugin_name, args=[core],
-                       errorhandler=errorhandler, setup=setup, files=files)
+                       errorhandler=errorhandler, files=files)
     finally:
         core.shutdown()
 
 
-def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
-               args=None, files=None):
+def run_plugin(plugin, plugin_name, errorhandler=None, args=None, files=None):
     """ run a single plugin, server-ful or serverless. """
     LOGGER.debug("  Running %s" % plugin_name)
     if args is None:
         args = []
 
     if errorhandler is None:
-        errorhandler = get_errorhandler(setup)
+        errorhandler = get_errorhandler()
 
-    if setup is not None and setup.cfp.has_section(plugin_name):
+    setup = Bcfg2.Options.get_option_parser()
+    if setup.cfp.has_section(plugin_name):
         arg = setup
         for key, val in setup.cfp.items(plugin_name):
             arg[key] = val
@@ -54,8 +53,9 @@ def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
     return plugin(*args, files=files, errorhandler=errorhandler).Run()
 
 
-def get_errorhandler(setup):
+def get_errorhandler():
     """ get a Bcfg2.Server.Lint.ErrorHandler object """
+    setup = Bcfg2.Options.get_option_parser()
     if setup.cfp.has_section("errors"):
         conf = dict(setup.cfp.items("errors"))
     else:
@@ -63,9 +63,9 @@ def get_errorhandler(setup):
     return Bcfg2.Server.Lint.ErrorHandler(config=conf)
 
 
-def load_server(setup):
+def load_server():
     """ load server """
-    core = Bcfg2.Server.Core.BaseCore(setup)
+    core = Bcfg2.Server.Core.BaseCore()
     core.fam.handle_events_in_interval(4)
     return core
 
@@ -82,8 +82,9 @@ def load_plugin(module, obj_name=None):
     return getattr(mod, obj_name)
 
 
-def load_plugins(setup):
+def load_plugins():
     """ get list of plugins to run """
+    setup = Bcfg2.Options.get_option_parser()
     if setup['args']:
         plugin_list = setup['args']
     elif "bcfg2-repo-validate" in sys.argv[0]:
@@ -145,7 +146,7 @@ def main():
                    lint_plugins=Bcfg2.Options.LINT_PLUGINS)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(optinfo)
     setup.parse(sys.argv[1:])
 
     log_args = dict(to_syslog=setup['syslog'], to_console=logging.WARNING)
@@ -161,9 +162,8 @@ def main():
     else:
         files = None
 
-    (serverlessplugins, serverplugins) = load_plugins(setup)
-
-    errorhandler = get_errorhandler(setup)
+    (serverlessplugins, serverplugins) = load_plugins()
+    errorhandler = get_errorhandler()
 
     if setup['showerrors']:
         for plugin in serverplugins.values() + serverlessplugins.values():
@@ -175,7 +175,7 @@ def main():
         raise SystemExit(0)
 
     run_serverless_plugins(serverlessplugins, errorhandler=errorhandler,
-                           setup=setup, files=files)
+                           files=files)
 
     if serverplugins:
         if errorhandler.errors:
@@ -191,7 +191,7 @@ def main():
                   "plugins")
         else:
             run_server_plugins(serverplugins, errorhandler=errorhandler,
-                               setup=setup, files=files)
+                               files=files)
 
     if errorhandler.errors or errorhandler.warnings or setup['verbose']:
         print("%d errors" % errorhandler.errors)
diff --git a/src/sbin/bcfg2-report-collector b/src/sbin/bcfg2-report-collector
index a0ee2259a..d925023d1 100755
--- a/src/sbin/bcfg2-report-collector
+++ b/src/sbin/bcfg2-report-collector
@@ -20,8 +20,8 @@ def main():
         )
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.REPORTING_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
-    setup.parse(sys.argv[1:])
+    setup = Bcfg2.Options.get_option_parser(optinfo)
+    setup.parse()
 
     # run collector
     try:
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 8322edeaa..7e7dede30 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -16,13 +16,13 @@ def main():
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.DAEMON_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(args=optinfo)
     setup.parse(sys.argv[1:])
     # check whether the specified bcfg2.conf exists
     if not os.path.exists(setup['configfile']):
         print("Could not read %s" % setup['configfile'])
         sys.exit(1)
-    
+
     if setup['backend'] not in ['best', 'cherrypy', 'builtin']:
         print("Unknown server backend %s, using 'best'" % setup['backend'])
         setup['backend'] = 'best'
@@ -37,7 +37,7 @@ def main():
         from Bcfg2.Server.BuiltinCore import Core
 
     try:
-        core = Core(setup)
+        core = Core()
         core.run()
     except CoreInitError:
         msg = sys.exc_info()[1]
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index 815d2740c..a708a233a 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -69,7 +69,7 @@ def main():
                    validate=Bcfg2.Options.CFG_VALIDATION)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.get_option_parser(args=optinfo)
     setup.hm = \
         "bcfg2-test [options] [client] [client] [...]\nOptions:\n     %s" % \
         setup.buildHelpMessage()
@@ -78,7 +78,7 @@ def main():
     if setup['verbose']:
         Bcfg2.Logger.setup_logging("bcfg2-test", to_syslog=setup['syslog'])
 
-    core = Bcfg2.Server.Core.BaseCore(setup)
+    core = Bcfg2.Server.Core.BaseCore()
 
     ignore = dict()
     for entry in setup['test_ignore']: