diff --git a/src/opengnsys/modules/server/CloningEngine/__init__.py b/src/opengnsys/modules/server/CloningEngine/__init__.py index b0aeb08..3eaff50 100644 --- a/src/opengnsys/modules/server/CloningEngine/__init__.py +++ b/src/opengnsys/modules/server/CloningEngine/__init__.py @@ -186,6 +186,40 @@ class CloningEngineWorker (ogLiveWorker): } return thr_status + def do_Configurar (self, post_params): + for k in ['nfn', 'dsk', 'cfg', 'ids']: + if k not in post_params: + logger.error (f'required parameter ({k}) not in POST params') + return {} + + nfn = post_params['nfn'] + dsk = post_params['dsk'] + cfg = post_params['cfg'].replace('\n','$').replace('\t','#') + ids = post_params['ids'] + + self.muestraMensaje (4) + + try: + self.interfaceAdmin (nfn, [dsk, cfg]) + self.muestraMensaje (14) + herror = 0 + except: + logger.warning ('Error al ejecutar el comando') + self.muestraMensaje (13) + herror = 1 + + cfg = self.LeeConfiguracion() + if not cfg: + logger.warning ('No se ha podido recuperar la configuración de las particiones del disco') + return {} + + cmd = { + 'nfn': 'RESPUESTA_Configurar', + 'cfg': cfg, + } + self.muestraMenu() + return self.respuestaEjecucionComando (cmd, herror, ids) + def do_InventarioHardware (self, post_params): for k in ['nfn', 'ids']: if k not in post_params: @@ -286,6 +320,10 @@ class CloningEngineWorker (ogLiveWorker): logger.warning ('this method has been removed') raise Exception ({ '_httpcode': 404, '_msg': 'This method has been removed' }) + def process_Configurar (self, path, get_params, post_params, server): + logger.debug ('in process_Configurar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) + return self._long_running_job ('Configurar', self.do_Configurar, args=(post_params,)) + def process_InventarioHardware (self, path, get_params, post_params, server): logger.debug ('in process_InventarioHardware, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) return self._long_running_job ('InventarioHardware', self.do_InventarioHardware, args=(post_params,)) diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 686a64c..9cc84b4 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -585,44 +585,6 @@ class ogAdmClientWorker (ogLiveWorker): logger.debug ('in process_IniciarSesion, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) return self._long_running_job ('IniciarSesion', self.do_IniciarSesion, args=(post_params,)) - def do_Configurar (self, post_params): - for k in ['nfn', 'dsk', 'cfg', 'ids']: - if k not in post_params: - logger.error (f'required parameter ({k}) not in POST params') - return {} - - nfn = post_params['nfn'] - dsk = post_params['dsk'] - cfg = post_params['cfg'].replace('\n','$').replace('\t','#') - ids = post_params['ids'] - - self.muestraMensaje (4) - - try: - self.interfaceAdmin (nfn, [dsk, cfg]) - self.muestraMensaje (14) - herror = 0 - except: - logger.warning ('Error al ejecutar el comando') - self.muestraMensaje (13) - herror = 1 - - cfg = self.LeeConfiguracion() - if not cfg: - logger.warning ('No se ha podido recuperar la configuración de las particiones del disco') - return {} - - cmd = { - 'nfn': 'RESPUESTA_Configurar', - 'cfg': cfg, - } - self.muestraMenu() - return self.respuestaEjecucionComando (cmd, herror, ids) - - def process_Configurar (self, path, get_params, post_params, server): - logger.debug ('in process_Configurar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) - return self._long_running_job ('Configurar', self.do_Configurar, args=(post_params,)) - def process_EjecutarScript (self, path, get_params, post_params, server): logger.warning ('in process_EjecutarScript')