From a4ca1866ea731b67638a65c5cb8e052f07cdbaa1 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com>
Date: Fri, 21 Sep 2007 11:26:52 -0400
Subject: Rename web_svc as func_module.

---
 modules/func_module.py | 43 +++++++++++++++++++++++++++++++++++++++++
 modules/service.py     |  6 +++---
 modules/test.py        |  6 +++---
 modules/virt.py        |  6 +++---
 modules/web_svc.py     | 52 --------------------------------------------------
 5 files changed, 52 insertions(+), 61 deletions(-)
 create mode 100755 modules/func_module.py
 delete mode 100755 modules/web_svc.py

(limited to 'modules')

diff --git a/modules/func_module.py b/modules/func_module.py
new file mode 100755
index 0000000..ec587c1
--- /dev/null
+++ b/modules/func_module.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+##
+## Copyright 2007, Red Hat, Inc
+## see AUTHORS
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+from codes import *
+
+from server import config_data
+from server import logger
+
+import os
+import threading
+import time
+import traceback
+
+
+class FuncModule(object):
+    def __init__(self):
+
+        config_obj = config_data.Config()
+        config_result = config_obj.get()
+        self.config = config_result
+        self.__init_log()
+        
+    def __init_log(self):
+        log = logger.Logger()
+        self.logger = log.logger
+    
+    def register_rpc(self, handlers):
+        for meth in self.methods:
+            handlers[meth] = self.methods[meth]
+            
+
+
diff --git a/modules/service.py b/modules/service.py
index f0693b0..379689a 100755
--- a/modules/service.py
+++ b/modules/service.py
@@ -16,12 +16,12 @@
 
 
 from codes import *
-from modules import web_svc
+from modules import func_module
 
 import subprocess
 import os
 
-class Service(web_svc.WebSvc):
+class Service(func_module.FuncModule):
 
     def __init__(self):
         self.methods = {
@@ -31,7 +31,7 @@ class Service(web_svc.WebSvc):
             "service_reload"  : self.reload,
             "service_status"  : self.status
         }
-        web_svc.WebSvc.__init__(self)
+        func_module.FuncModule.__init__(self)
 
     def __command(self, service_name, command):
 
diff --git a/modules/test.py b/modules/test.py
index eb2e3f4..b742e31 100755
--- a/modules/test.py
+++ b/modules/test.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 from codes import *
-from modules import web_svc
+from modules import func_module
 
-class Test(web_svc.WebSvc):
+class Test(func_module.FuncModule):
     def __init__(self):
         self.methods = {
             "test_add": self.add
         }
-        web_svc.WebSvc.__init__(self)
+        func_module.FuncModule.__init__(self)
 
     def add(self, numb1, numb2):
         return numb1 + numb2
diff --git a/modules/virt.py b/modules/virt.py
index 7e642cf..00eeb98 100755
--- a/modules/virt.py
+++ b/modules/virt.py
@@ -27,7 +27,7 @@ import libvirt
 
 # our modules
 import codes
-import web_svc
+import func_module
 
 VIRT_STATE_NAME_MAP = {
    0 : "running",
@@ -121,7 +121,7 @@ class FuncLibvirtConnection():
 
 
 
-class Virt(web_svc.WebSvc):
+class Virt(func_module.FuncModule):
     
     
     def __init__(self):
@@ -142,7 +142,7 @@ class Virt(web_svc.WebSvc):
             "virt_list_vms" : self.list_vms,
         }
         
-        web_svc.WebSvc.__init__(self)
+        func_module.FuncModule.__init__(self)
 
     def get_conn(self):
 	self.conn = FuncLibvirtConnection()
diff --git a/modules/web_svc.py b/modules/web_svc.py
deleted file mode 100755
index 134af37..0000000
--- a/modules/web_svc.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-
-## Virt-factory backend code.
-##
-## Copyright 2006, Red Hat, Inc
-## Adrian Likins <alikins@redhat.com
-##
-## This software may be freely redistributed under the terms of the GNU
-## general public license.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-##
-
-from codes import *
-
-from server import config_data
-from server import logger
-
-import os
-import threading
-import time
-import traceback
-
-
-class WebSvc(object):
-    def __init__(self):
-
-        config_obj = config_data.Config()
-        config_result = config_obj.get()
-        self.config = config_result
-        self.__init_log()
-        
-    def __init_log(self):
-        # lets see what happens when we c&p the stuff from server.py 
-        log = logger.Logger()
-        self.logger = log.logger
-    
-    def register_rpc(self, handlers):
-        for meth in self.methods:
-            handlers[meth] = self.methods[meth]
-            
-    def offset_and_limit(self, args):
-        return args.get('offset', 0), args.get('limit', 100000)
-
-
-class AuthWebSvc(WebSvc):
-    def __init__(self):
-        WebSvc.__init__(self)
-
-
-- 
cgit