From 771ed4b3785df3194cf28ed9f1e688e0f59b64b5 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:17:26 +0200 Subject: [PATCH] refs #2513 support new parameter for Configurar --- .../modules/server/ogAdmClient/__init__.py | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 7bb22b2..eecc855 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -560,8 +560,9 @@ class ogAdmClientWorker (ogLiveWorker): dsk = post_params['dsk'] cfg = post_params['cfg'] ids = post_params['ids'] + check_sizes = str ('check-sizes' in post_params and 'true' == post_params['check-sizes']).lower() - self.muestraMensaje (4) + if 'true' != check_sizes: self.muestraMensaje (4) params = [] disk_info = cfg.pop (0) @@ -582,23 +583,24 @@ class ogAdmClientWorker (ogLiveWorker): cfg_str = f'{disk_info_str}!{part_info_str}%' try: - self.interfaceAdmin (nfn, ['ignored', cfg_str]) - self.muestraMensaje (14) + self.interfaceAdmin (nfn, ['ignored', cfg_str, check_sizes]) + if 'true' != check_sizes: self.muestraMensaje (14) herror = 0 except: logger.warning ('Error al ejecutar el comando') - self.muestraMensaje (13) + if 'true' != check_sizes: 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': self.cfg2obj (cfg), } + if 'true' != check_sizes: + cfg = self.LeeConfiguracion() + if not cfg: + logger.warning ('No se ha podido recuperar la configuración de las particiones del disco') + return {} + cmd['cfg'] = self.cfg2obj (cfg) + self.muestraMenu() return self.respuestaEjecucionComando (cmd, herror, ids) @@ -1008,6 +1010,11 @@ class ogAdmClientWorker (ogLiveWorker): @check_secret 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)) + + check_sizes = str ('check-sizes' in post_params and 'true' == post_params['check-sizes']).lower() + if 'true' == check_sizes: + return self.do_Configurar (post_params) + return self._long_running_job ('Configurar', self.do_Configurar, args=(post_params,)) @execution_level('full')