|
|
|
@ -113,7 +113,7 @@ class Wsdl:
|
|
|
|
|
from calculate.core.server.decorators import Dec
|
|
|
|
|
|
|
|
|
|
def installCommon(self,sid,info,methodname,initfunc,
|
|
|
|
|
installFunc="installSystem",humanName=""):
|
|
|
|
|
installFunc="installSystem"):
|
|
|
|
|
"""
|
|
|
|
|
Install common method
|
|
|
|
|
"""
|
|
|
|
@ -140,7 +140,7 @@ class Wsdl:
|
|
|
|
|
cl_install.Install, object), {})
|
|
|
|
|
pid = self.startprocess(sid, target=install_meth,
|
|
|
|
|
method=installFunc,\
|
|
|
|
|
method_name=humanName or _("System installing"),
|
|
|
|
|
method_name=methodname or "install",
|
|
|
|
|
args_proc = (dv,))
|
|
|
|
|
returnmess = ReturnedMessage(type = 'pid', message = pid)
|
|
|
|
|
returnmess.type = "pid"
|
|
|
|
@ -158,8 +158,7 @@ class Wsdl:
|
|
|
|
|
gui=True,command='cl-install',
|
|
|
|
|
rights=['install'])
|
|
|
|
|
def install ( self, sid, info):
|
|
|
|
|
return self.installCommon(sid,info,'install',self.install_vars,
|
|
|
|
|
humanName=_('System installing'))
|
|
|
|
|
return self.installCommon(sid,info,'install',self.install_vars)
|
|
|
|
|
|
|
|
|
|
def install_vars(self,dv=None):
|
|
|
|
|
if not dv:
|
|
|
|
@ -256,8 +255,7 @@ class Wsdl:
|
|
|
|
|
Install to flash
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'install_flash',
|
|
|
|
|
self.install_flash_vars,
|
|
|
|
|
humanName=_('Flash install'))
|
|
|
|
|
self.install_flash_vars)
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -294,8 +292,7 @@ class Wsdl:
|
|
|
|
|
Install to flash
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'install_pxe',
|
|
|
|
|
self.install_pxe_vars,
|
|
|
|
|
humanName=_('PXE install'))
|
|
|
|
|
self.install_pxe_vars)
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -338,8 +335,7 @@ class Wsdl:
|
|
|
|
|
print "OINRD",info.os_install_net_route_data
|
|
|
|
|
return self.installCommon(sid,info,'configure_network',
|
|
|
|
|
self.configure_network_vars,
|
|
|
|
|
installFunc="setupSystem",
|
|
|
|
|
humanName=_('Network'))
|
|
|
|
|
installFunc="setupSystem")
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -379,8 +375,7 @@ class Wsdl:
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'configure_video',
|
|
|
|
|
self.configure_video_vars,
|
|
|
|
|
installFunc="setupSystem",
|
|
|
|
|
humanName=_('Video'))
|
|
|
|
|
installFunc="setupSystem")
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -420,8 +415,7 @@ class Wsdl:
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'configure_locale',
|
|
|
|
|
self.configure_locale_vars,
|
|
|
|
|
installFunc="setupSystem",
|
|
|
|
|
humanName=_('Locale'))
|
|
|
|
|
installFunc="setupSystem")
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -460,8 +454,7 @@ class Wsdl:
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'configure_boot',
|
|
|
|
|
self.configure_boot_vars,
|
|
|
|
|
installFunc="setupSystem",
|
|
|
|
|
humanName=_('Boot'))
|
|
|
|
|
installFunc="setupSystem")
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
@ -497,8 +490,7 @@ class Wsdl:
|
|
|
|
|
"""
|
|
|
|
|
return self.installCommon(sid,info,'configure_system',
|
|
|
|
|
self.configure_system_vars,
|
|
|
|
|
installFunc="setupSystem",
|
|
|
|
|
humanName=_('System'))
|
|
|
|
|
installFunc="setupSystem")
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
|
@catchExcept
|
|
|
|
|