Remove underscores from exported function names as they are now redundant.

6 files changed, 22 insertions, 22 deletions

diff --git a/client/test_func.py b/client/test_func.py
index 4869636..38ae977 100644
--- a/client/test_func.py
+++ b/client/test_func.py
@@ -12,11 +12,11 @@ TEST_SERVICES = True
 s = xmlrpclib.ServerProxy("http://127.0.0.1:51234")
 
 # here's the basic test...
-print s.test.test_add(1, 2)
+print s.test.add(1, 2)
 
 # here's the service module testing
 if TEST_SERVICES:
-    print s.service.service_restart("httpd")
+    print s.service.restart("httpd")
 
 # this is so I can remember how the virt module works
 if TEST_VIRT:
@@ -25,14 +25,14 @@ if TEST_VIRT:
    #s.virt_install("mdehaan.rdu.redhat.com","profileX")
 
    # wait ...
-   vms = s.virt.virt_list_vms()
+   vms = s.virt.list_vms()
    # example of stopping all stopped virtual machines
    print "list of virtual instances = %s" % vms
    for vm in vms:
-       status = s.virt.virt_status(vm)
+       status = s.virt.status(vm)
        print status
        if status == "shutdown":
-           s.virt.virt_start(vm)
+           s.virt.start(vm)
 
 # add more tests here           
 
diff --git a/modules/reboot.py b/modules/reboot.py
index c2f39ba..ddc7651 100755
--- a/modules/reboot.py
+++ b/modules/reboot.py
@@ -17,7 +17,7 @@ class Reboot(func_module.FuncModule):
 
     def __init__(self):
         self.methods = {
-                "reboot_reboot" : self.reboot
+                "reboot" : self.reboot
         }
         func_module.FuncModule.__init__(self)
 
diff --git a/modules/service.py b/modules/service.py
index eaea16e..bbc51e1 100755
--- a/modules/service.py
+++ b/modules/service.py
@@ -25,11 +25,11 @@ class Service(func_module.FuncModule):
 
     def __init__(self):
         self.methods = {
-            "service_start"   : self.start,
-            "service_stop"    : self.stop,
-            "service_restart" : self.restart,
-            "service_reload"  : self.reload,
-            "service_status"  : self.status
+            "start"   : self.start,
+            "stop"    : self.stop,
+            "restart" : self.restart,
+            "reload"  : self.reload,
+            "status"  : self.status
         }
         func_module.FuncModule.__init__(self)
 
diff --git a/modules/test.py b/modules/test.py
index b742e31..31f1e94 100755
--- a/modules/test.py
+++ b/modules/test.py
@@ -6,7 +6,7 @@ from modules import func_module
 class Test(func_module.FuncModule):
     def __init__(self):
         self.methods = {
-            "test_add": self.add
+            "add": self.add
         }
         func_module.FuncModule.__init__(self)
 
diff --git a/modules/virt.py b/modules/virt.py
index 319c2f3..d345d75 100755
--- a/modules/virt.py
+++ b/modules/virt.py
@@ -131,15 +131,15 @@ class Virt(func_module.FuncModule):
         """
 
         self.methods = {
-            "virt_install"  : self.install,
-            "virt_shutdown" : self.shutdown,
-            "virt_destroy"  : self.destroy,
-            "virt_start"    : self.create,
-            "virt_pause"    : self.pause,
-            "virt_unpause"  : self.unpause,
-            "virt_delete"   : self.undefine,
-            "virt_status"   : self.get_status,
-            "virt_list_vms" : self.list_vms,
+            "install"  : self.install,
+            "shutdown" : self.shutdown,
+            "destroy"  : self.destroy,
+            "start"    : self.create,
+            "pause"    : self.pause,
+            "unpause"  : self.unpause,
+            "delete"   : self.undefine,
+            "status"   : self.get_status,
+            "list_vms" : self.list_vms,
         }
         
         func_module.FuncModule.__init__(self)
diff --git a/modules/yummod.py b/modules/yummod.py
index 575b001..6600d47 100644
--- a/modules/yummod.py
+++ b/modules/yummod.py
@@ -23,7 +23,7 @@ class Yum(func_module.FuncModule):
 
     def __init__(self):
         self.methods = {
-                "yum_update" : self.update
+                "update" : self.update
         }
         func_module.FuncModule.__init__(self)