From a3f4eafffb03b0692c9def44cd41ae84f3558086 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Tue, 8 Oct 2024 10:19:04 +0200 Subject: [PATCH] refs #887 implement InventarioSoftware() --- .../modules/server/CloningEngine/__init__.py | 24 +++++++++++++++++++ .../modules/server/ogAdmClient/__init__.py | 3 --- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/opengnsys/modules/server/CloningEngine/__init__.py b/src/opengnsys/modules/server/CloningEngine/__init__.py index ac93cf9..a5229d5 100644 --- a/src/opengnsys/modules/server/CloningEngine/__init__.py +++ b/src/opengnsys/modules/server/CloningEngine/__init__.py @@ -180,6 +180,26 @@ class CloningEngineWorker (ogLiveWorker): } return thr_status + def do_InventarioSoftware (self, post_params): + for k in ['nfn', 'dsk', 'par', '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'] + par = post_params['par'] + ids = post_params['ids'] + + self.muestraMensaje (7) + + res = self.InventariandoSoftware (dsk, par, True, 'InventarioSoftware') + self.muestraMenu() + cmd = { + 'nfn': 'RESPUESTA_InventarioSoftware', + } + return self.respuestaEjecucionComando (cmd, 0, ids) + def process_CrearImagen (self, path, get_params, post_params, server): logger.debug ('in process_CrearImagen, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) logger.debug ('type(post_params) "{}"'.format (type (post_params))) @@ -210,3 +230,7 @@ class CloningEngineWorker (ogLiveWorker): logger.debug ('in process_RestaurarSoftIncremental, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) logger.warning ('this method has been removed') raise Exception ({ '_httpcode': 404, '_msg': 'This method has been removed' }) + + def process_InventarioSoftware (self, path, get_params, post_params, server): + logger.debug ('in process_InventarioSoftware, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) + return self._long_running_job ('InventarioSoftware', self.do_InventarioSoftware, args=(post_params,)) diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 85abfae..9d96aa1 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -673,8 +673,5 @@ class ogAdmClientWorker (ogLiveWorker): def process_EjecutarScript (self, path, get_params, post_params, server): logger.warning ('in process_EjecutarScript') - def process_InventarioSoftware (self, path, get_params, post_params, server): - logger.warning ('in process_InventarioSoftware') - def process_EjecutaComandosPendientes (self, path, get_params, post_params, server): logger.warning ('in process_EjecutaComandosPendientes')