Refactoring with calculate-core

install/cl_wsdl_install.py

@@ -30,7 +30,7 @@ from calculate.install.cl_install import InstallError
 import cl_install
 from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
 from calculate.core.server.decorators import Dec
-from calculate.core.server.func import catchExcept
+from calculate.core.server.func import catchExcept,commonView
 core_method = Dec.core_method
 setLocalTranslate('cl_install3',sys.modules[__name__])
 import traceback
@@ -95,49 +95,6 @@ class Wsdl:
     from calculate.core.server.baseClass import Basic
     from calculate.core.server.decorators import Dec
 
-    def installCommon(self,sid,info,methodname,initfunc,
-                      installFunc="installSystem"):
-        """
-        Install common method
-        """
-        try:
-            dv = self.get_cache(sid,methodname,"vars")
-            if not dv:
-                dv = initfunc()
-            else:
-                if methodname == "install":
-                    self.fixInstallLocalization(sid,dv)
-                dv.processRefresh()
-            if info:
-                checkonly = info.CheckOnly
-                checkall = info.CheckAll
-            else:
-                checkonly = False
-                checkall = False
-            errors = map(lambda x:ReturnedMessage(**x),
-                     dv.checkGroups(info,allvars=checkall or \
-                                         not checkonly))
-            if errors:
-                return errors
-            if checkonly:
-                returnmess = ReturnedMessage(type = '', message = None)
-                return [returnmess]
-            install_meth = type("CommonInstall",(self.Common,
-                                cl_install.Install, object), {})
-            pid = self.startprocess(sid, target=install_meth,
-                            method=installFunc,\
-                            method_name=methodname or "install",
-                            args_proc = (dv,))
-            returnmess = ReturnedMessage(type = 'pid', message = pid)
-            returnmess.type = "pid"
-            returnmess.message = pid
-            dv = self.clear_cache(sid,methodname)
-            return [returnmess]
-        finally:
-            if dv:
-                self.set_cache(sid,methodname,"vars",dv,smart=False)
-        return []
-
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Installation'),title=__("System install"),
         image='calculate-install,system-installer,applications-other,'
@@ -145,7 +102,9 @@ class Wsdl:
         gui=True,command='cl-install',
         rights=['install'])
     def install ( self, sid, info):
-        return self.installCommon(sid,info,'install',self.install_vars)
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                               method="installSystem",method_name="install",
+                               callbackRefresh=self.fixInstallLocalization)
 
     def install_vars(self,dv=None):
         if not dv:
@@ -239,20 +198,13 @@ class Wsdl:
         """
         Install to flash
         """
-        return self.installCommon(sid,info,'install_flash',
-                                  self.install_flash_vars)
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="installSystem",method_name="install_flash")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def install_flash_view (self, sid, params):
-        dv = self.get_cache(sid,"install_flash","vars")
-        if not dv:
-            dv = self.install_flash_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'install_flash', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"install_flash")
 
     def install_pxe_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -274,20 +226,13 @@ class Wsdl:
         """
         Install to flash
         """
-        return self.installCommon(sid,info,'install_pxe',
-                                  self.install_pxe_vars)
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="installSystem",method_name="install_pxe")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def install_pxe_view (self, sid, params):
-        dv = self.get_cache(sid,"install_pxe","vars")
-        if not dv:
-            dv = self.install_pxe_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'install_pxe', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"install_pxe")
 
     def setup_network_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -313,21 +258,13 @@ class Wsdl:
         """
         Setup network
         """
-        return self.installCommon(sid,info,'setup_network',
-                                  self.setup_network_vars,
-                                  installFunc="setupSystem")
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="setupSystem",method_name="setup_network")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def setup_network_view (self, sid, params):
-        dv = self.get_cache(sid,"setup_network","vars")
-        if not dv:
-            dv = self.setup_network_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'setup_network', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"setup_network")
 
     def setup_video_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -351,21 +288,13 @@ class Wsdl:
         """
         Setup video
         """
-        return self.installCommon(sid,info,'setup_video',
-                                  self.setup_video_vars,
-                                  installFunc="setupSystem")
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="setupSystem",method_name="setup_video")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def setup_video_view (self, sid, params):
-        dv = self.get_cache(sid,"setup_video","vars")
-        if not dv:
-            dv = self.setup_video_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'setup_video', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"setup_video")
 
     def setup_locale_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -389,21 +318,13 @@ class Wsdl:
         """
         Setup locale
         """
-        return self.installCommon(sid,info,'setup_locale',
-                                  self.setup_locale_vars,
-                                  installFunc="setupSystem")
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="setupSystem",method_name="setup_locale")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def setup_locale_view (self, sid, params):
-        dv = self.get_cache(sid,"setup_locale","vars")
-        if not dv:
-            dv = self.setup_locale_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'setup_locale', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"setup_locale")
 
     def setup_boot_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -426,21 +347,13 @@ class Wsdl:
         """
         Setup locale
         """
-        return self.installCommon(sid,info,'setup_boot',
-                                  self.setup_boot_vars,
-                                  installFunc="setupSystem")
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="setupSystem",method_name="setup_boot")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def setup_boot_view (self, sid, params):
-        dv = self.get_cache(sid,"setup_boot","vars")
-        if not dv:
-            dv = self.setup_boot_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'setup_boot', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"setup_boot")
 
     def setup_system_vars(self):
         dv = cl_install.DataVarsInstall()
@@ -461,18 +374,10 @@ class Wsdl:
         """
         Setup system
         """
-        return self.installCommon(sid,info,'setup_system',
-                                  self.setup_system_vars,
-                                  installFunc="setupSystem")
+        return self.callMethod(sid,info,logicClass=cl_install.Install,
+                           method="setupSystem",method_name="setup_system")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @installCatchExcept
     def setup_system_view (self, sid, params):
-        dv = self.get_cache(sid,"setup_system","vars")
-        if not dv:
-            dv = self.setup_system_vars()
-        else:
-            dv.processRefresh()
-        self.set_cache(sid, 'setup_system', "vars",dv,smart=False)
-        view = ViewInfo(dv,viewparams=params)
-        return view
+        return commonView(self,sid,params,"setup_system")