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, 15 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py
index 2df0b11cd..66c1ce430 100644
--- a/src/lib/Bcfg2/Client/Client.py
+++ b/src/lib/Bcfg2/Client/Client.py
@@ -8,10 +8,10 @@ import fcntl
 import socket
 import logging
 import tempfile
-import Bcfg2.Proxy
 import Bcfg2.Logger
 import Bcfg2.Options
 import Bcfg2.Client.XML
+import Bcfg2.Client.Proxy
 import Bcfg2.Client.Frame
 import Bcfg2.Client.Tools
 from Bcfg2.Utils import locked, Executor
@@ -22,12 +22,12 @@ from Bcfg2.version import __version__
 class Client(object):
     """ The main Bcfg2 client class """
 
-    def __init__(self, setup):
+    def __init__(self):
         self.toolset = None
         self.tools = None
         self.config = None
         self._proxy = None
-        self.setup = setup
+        self.setup = Bcfg2.Options.get_option_parser()
 
         if self.setup['debug']:
             level = logging.DEBUG
@@ -53,7 +53,7 @@ class Client(object):
                 raise SystemExit(1)
         if 'drivers' in self.setup and self.setup['drivers'] == 'help':
             self.logger.info("The following drivers are available:")
-            self.logger.info(Bcfg2.Client.Tools.drivers)
+            self.logger.info(Bcfg2.Client.Tools.__all__)
             raise SystemExit(0)
         if self.setup['remove'] and 'services' in self.setup['remove'].lower():
             self.logger.error("Service removal is nonsensical; "
@@ -123,7 +123,7 @@ class Client(object):
     def proxy(self):
         """ get an XML-RPC proxy to the server """
         if self._proxy is None:
-            self._proxy = Bcfg2.Proxy.ComponentProxy(
+            self._proxy = Bcfg2.Client.Proxy.ComponentProxy(
                 self.setup['server'],
                 self.setup['user'],
                 self.setup['password'],
@@ -143,8 +143,8 @@ class Client(object):
 
         try:
             probes = Bcfg2.Client.XML.XML(str(self.proxy.GetProbes()))
-        except (Bcfg2.Proxy.ProxyError,
-                Bcfg2.Proxy.CertificateError,
+        except (Bcfg2.Client.Proxy.ProxyError,
+                Bcfg2.Client.Proxy.CertificateError,
                 socket.gaierror,
                 socket.error):
             err = sys.exc_info()[1]
@@ -167,7 +167,7 @@ class Client(object):
                 self.proxy.RecvProbeData(Bcfg2.Client.XML.tostring(
                         probedata,
                         xml_declaration=False).decode('UTF-8'))
-            except Bcfg2.Proxy.ProxyError:
+            except Bcfg2.Client.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.fatal_error("Failed to upload probe data: %s" % err)
 
@@ -193,7 +193,7 @@ class Client(object):
             if self.setup['profile']:
                 try:
                     self.proxy.AssertProfile(self.setup['profile'])
-                except Bcfg2.Proxy.ProxyError:
+                except Bcfg2.Client.Proxy.ProxyError:
                     err = sys.exc_info()[1]
                     self.fatal_error("Failed to set client profile: %s" % err)
 
@@ -208,8 +208,8 @@ class Client(object):
                                       "client version")
                 else:
                     self.logger.error("Failed to declare version: %s" % err)
-            except (Bcfg2.Proxy.ProxyError,
-                    Bcfg2.Proxy.CertificateError,
+            except (Bcfg2.Client.Proxy.ProxyError,
+                    Bcfg2.Client.Proxy.CertificateError,
                     socket.gaierror,
                     socket.error):
                 err = sys.exc_info()[1]
@@ -223,13 +223,13 @@ class Client(object):
                         self.proxy.GetDecisionList(self.setup['decision'])
                     self.logger.info("Got decision list from server:")
                     self.logger.info(self.setup['decision_list'])
-                except Bcfg2.Proxy.ProxyError:
+                except Bcfg2.Client.Proxy.ProxyError:
                     err = sys.exc_info()[1]
                     self.fatal_error("Failed to get decision list: %s" % err)
 
             try:
                 rawconfig = self.proxy.GetConfig().encode('UTF-8')
-            except Bcfg2.Proxy.ProxyError:
+            except Bcfg2.Client.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.fatal_error("Failed to download configuration from "
                                  "Bcfg2: %s" % err)
@@ -281,10 +281,7 @@ class Client(object):
                     newconfig.append(bundle)
             self.config = newconfig
 
-        self.tools = Bcfg2.Client.Frame.Frame(self.config,
-                                              self.setup,
-                                              times, self.setup['drivers'],
-                                              self.setup['dryrun'])
+        self.tools = Bcfg2.Client.Frame.Frame(self.config, times)
 
         if not self.setup['omit_lock_check']:
             #check lock here
@@ -323,7 +320,7 @@ class Client(object):
                 self.proxy.RecvStats(Bcfg2.Client.XML.tostring(
                         feedback,
                         xml_declaration=False).decode('UTF-8'))
-            except Bcfg2.Proxy.ProxyError:
+            except Bcfg2.Client.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.logger.error("Failed to upload configuration statistics: "
                                   "%s" % err)