From ebe7542db7217c2fac3d7111e80f94caedfb69e2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 16 Jan 2013 13:28:06 -0500
Subject: added module-level OptionParser to avoid passing it as an argument or
 global all over

---
 src/lib/Bcfg2/Server/Admin/Xcmd.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Admin/Xcmd.py')

diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 79eeebc7c..7f9f32816 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -12,17 +12,17 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
     __usage__ = "<command>"
 
     def __call__(self, args):
-        optinfo = {
-            'server': Bcfg2.Options.SERVER_LOCATION,
-            'user': Bcfg2.Options.CLIENT_USER,
-            'password': Bcfg2.Options.SERVER_PASSWORD,
-            'key': Bcfg2.Options.SERVER_KEY,
-            'certificate': Bcfg2.Options.CLIENT_CERT,
-            'ca': Bcfg2.Options.CLIENT_CA,
-            'timeout': Bcfg2.Options.CLIENT_TIMEOUT,
-            }
-        setup = Bcfg2.Options.OptionParser(optinfo)
-        setup.parse(args)
+        setup = Bcfg2.Options.get_option_parser()
+        setup.add_options(dict(ca=Bcfg2.Options.CLIENT_CA,
+                               certificate=Bcfg2.Options.CLIENT_CERT,
+                               key=Bcfg2.Options.SERVER_KEY,
+                               password=Bcfg2.Options.SERVER_PASSWORD,
+                               server=Bcfg2.Options.SERVER_LOCATION,
+                               user=Bcfg2.Options.CLIENT_USER,
+                               timeout=Bcfg2.Options.CLIENT_TIMEOUT))
+        opts = sys.argv[1:]
+        opts.remove(self.__class__.__name__.lower())
+        setup.reparse(argv=opts)
         Bcfg2.Proxy.RetryMethod.max_retries = 1
         proxy = Bcfg2.Proxy.ComponentProxy(setup['server'],
                                            setup['user'],
@@ -34,12 +34,9 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
         if len(setup['args']) == 0:
             print("Usage: xcmd <xmlrpc method> <optional arguments>")
             return
-        cmd = setup['args'][0]
-        args = ()
-        if len(setup['args']) > 1:
-            args = tuple(setup['args'][1:])
+        cmd = args[0]
         try:
-            data = getattr(proxy, cmd)(*args)
+            data = getattr(proxy, cmd)(*setup['args'])
         except xmlrpclib.Fault:
             flt = sys.exc_info()[1]
             if flt.faultCode == 7:
-- 
cgit v1.2.3-1-g7c22


From 25cb6db5ccb0c8e8302c220a90344a95baf3909b Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 5 Feb 2013 14:04:09 -0500
Subject: moved some libraries in Bcfg2/ into more specific (Server/ or
 Client/) places

---
 src/lib/Bcfg2/Server/Admin/Xcmd.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Admin/Xcmd.py')

diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 7f9f32816..13077c7ad 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -2,7 +2,7 @@
 
 import sys
 import Bcfg2.Options
-import Bcfg2.Proxy
+import Bcfg2.Client.Proxy
 import Bcfg2.Server.Admin
 from Bcfg2.Compat import xmlrpclib
 
@@ -23,14 +23,14 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
         opts = sys.argv[1:]
         opts.remove(self.__class__.__name__.lower())
         setup.reparse(argv=opts)
-        Bcfg2.Proxy.RetryMethod.max_retries = 1
-        proxy = Bcfg2.Proxy.ComponentProxy(setup['server'],
-                                           setup['user'],
-                                           setup['password'],
-                                           key=setup['key'],
-                                           cert=setup['certificate'],
-                                           ca=setup['ca'],
-                                           timeout=setup['timeout'])
+        Bcfg2.Client.Proxy.RetryMethod.max_retries = 1
+        proxy = Bcfg2.Client.Proxy.ComponentProxy(setup['server'],
+                                                  setup['user'],
+                                                  setup['password'],
+                                                  key=setup['key'],
+                                                  cert=setup['certificate'],
+                                                  ca=setup['ca'],
+                                                  timeout=setup['timeout'])
         if len(setup['args']) == 0:
             print("Usage: xcmd <xmlrpc method> <optional arguments>")
             return
@@ -46,7 +46,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
                 return
             else:
                 raise
-        except Bcfg2.Proxy.ProxyError:
+        except Bcfg2.Client.Proxy.ProxyError:
             err = sys.exc_info()[1]
             print("Proxy Error: %s" % err)
             return
-- 
cgit v1.2.3-1-g7c22


From 96628400ced3b6dfc1ef35692f5e5a3ca388749a Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 12 Feb 2013 07:50:01 -0500
Subject: fixed some option parsing bugs

---
 src/lib/Bcfg2/Server/Admin/Xcmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/Bcfg2/Server/Admin/Xcmd.py')

diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 13077c7ad..6f411c2e4 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -36,7 +36,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
             return
         cmd = args[0]
         try:
-            data = getattr(proxy, cmd)(*setup['args'])
+            data = getattr(proxy, cmd)(*args[1:])
         except xmlrpclib.Fault:
             flt = sys.exc_info()[1]
             if flt.faultCode == 7:
-- 
cgit v1.2.3-1-g7c22