Changing func/func/overlord/client.py:Client() to Overlord(). Client() still

works but will dive a deprecation warning.

First pass at this refactor. I think just about everything has been updated, but
some questions remain. Like if client.py needs a name change.

6 files changed, 37 insertions, 29 deletions

diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index 7add5bf..ea16975 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -77,8 +77,8 @@ class Call(client.command.Command):
 
         if self.options.rawprint:
             return data
-            
-        return pprint.pformat(data)
+
+        return  pprint.pformat(data)
 
     def do(self, args):
 
@@ -103,9 +103,13 @@ class Call(client.command.Command):
         # or some sort of shared datastruct?
         self.server_spec = self.parentCommand.server_spec
 
-        client_obj = client.Client(self.server_spec,port=self.port,interactive=True,
-            verbose=self.verbose, config=self.config, nforks=self.options.forks)
-        results = client_obj.run(self.module, self.method, self.method_args)
+        overlord_obj = client.Overlord(self.server_spec,port=self.port,
+                                     interactive=True,
+                                     verbose=self.verbose,
+                                     config=self.config,
+                                     nforks=self.options.forks)
+        results = overlord_obj.run(self.module, self.method, self.method_args)
+
 
         # TO DO: add multiplexer support
         # probably as a higher level module.
diff --git a/func/overlord/cmd_modules/check.py b/func/overlord/cmd_modules/check.py
index 446e6de..b360df6 100644
--- a/func/overlord/cmd_modules/check.py
+++ b/func/overlord/cmd_modules/check.py
@@ -82,14 +82,15 @@ class CheckAction(client.command.Command):
            # construct a client handle and see if any hosts are reachable 
            self.server_spec = self.parentCommand.server_spec
 
-           client_obj = client.Client(
+           overlord_obj = client.Overlord(
                self.server_spec,
                port=self.port,
                interactive=False,
                verbose=False,
                config=self.config
-           )
-           results = client_obj.test.add(1,2)
+               )
+           
+           results = overlord_obj.test.add(1,2)
            hosts = results.keys()
            if len(hosts) == 0:
                print "* no systems have signed certs"
diff --git a/func/overlord/cmd_modules/copyfile.py b/func/overlord/cmd_modules/copyfile.py
index 295aeab..a149d5d 100644
--- a/func/overlord/cmd_modules/copyfile.py
+++ b/func/overlord/cmd_modules/copyfile.py
@@ -49,11 +49,11 @@ class CopyFile(client.command.Command):
     def do(self, args):
         self.server_spec = self.parentCommand.server_spec
 
-        client_obj = client.Client(self.server_spec,
-                                   port=self.port,
-                                   interactive=False,
-                                   verbose=self.options.verbose,
-                                   config=self.config)
+        overlord_obj = client.Overlord(self.server_spec,
+                                       port=self.port,
+                                       interactive=False,
+                                       verbose=self.options.verbose,
+                                       config=self.config)
 
         
         try:
@@ -69,5 +69,5 @@ class CopyFile(client.command.Command):
 
     
         data = xmlrpclib.Binary(fb)
-        results = client_obj.run("copyfile", "copyfile", [self.options.remotepath, data,
+        results = overlord_obj.run("copyfile", "copyfile", [self.options.remotepath, data,
                                                           mode, uid, gid])
diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py
index 9421b8d..fbfc282 100644
--- a/func/overlord/cmd_modules/listminions.py
+++ b/func/overlord/cmd_modules/listminions.py
@@ -37,13 +37,13 @@ class ListMinions(client.command.Command):
     def do(self, args):
         self.server_spec = self.parentCommand.server_spec
 
-        client_obj = client.Client(self.server_spec,
-                                   port=self.port,
-                                   interactive=False,
-                                   verbose=self.options.verbose,
-                                   config=self.config)
+        overlord_obj = client.Overlord(self.server_spec,
+                                     port=self.port,
+                                     interactive=False,
+                                     verbose=self.options.verbose,
+                                     config=self.config)
 
-        results = client_obj.test.add(1,2)
+        results = overlord_obj.test.add(1,2)
         servers = results.keys()
         servers.sort()
 
diff --git a/func/overlord/cmd_modules/ping.py b/func/overlord/cmd_modules/ping.py
index 438e2a9..a94fa70 100644
--- a/func/overlord/cmd_modules/ping.py
+++ b/func/overlord/cmd_modules/ping.py
@@ -57,10 +57,13 @@ class Ping(client.command.Command):
 
         for server in servers:
 
-            client_obj = client.Client(server,port=self.options.port,interactive=False,
-                                       verbose=self.options.verbose,config=self.config, noglobs=True)
+            overlord_obj = client.Overlord(server,port=self.options.port,
+                                           interactive=False,
+                                           verbose=self.options.verbose,
+                                           config=self.config, noglobs=True)
 
-            results = client_obj.run("test", "ping", [])
+            results = overlord_obj.run("test", "ping", [])
+	    print "results", results, type(results)
             if results == 1:
                 print "[ ok ... ] %s" % server
             else:
diff --git a/func/overlord/cmd_modules/show.py b/func/overlord/cmd_modules/show.py
index e1df554..8963082 100644
--- a/func/overlord/cmd_modules/show.py
+++ b/func/overlord/cmd_modules/show.py
@@ -48,13 +48,13 @@ class ShowHardware(client.command.Command):
 
         self.server_spec = self.parentCommand.parentCommand.server_spec
         
-        client_obj = client.Client(self.server_spec,
-                                   port=self.port,
-                                   interactive=False,
-                                   verbose=self.options.verbose,
-                                   config=self.config)
+        overlord_obj = client.Overlord(self.server_spec,
+                                     port=self.port,
+                                     interactive=False,
+                                     verbose=self.options.verbose,
+                                     config=self.config)
         
-        results = client_obj.run("hardware", "info", [])
+        results = overlord_obj.run("hardware", "info", [])
 
         # if the user 
         top_options = ["port","verbose"]