opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #702 have interfaceAdmin() raise exceptions

unification2
Natalia Serrano 2024-09-13 11:08:14 +02:00
parent 32d3621923
commit 9fe674f30e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/opengnsys/modules/server/ogAdmClient/__init__.py
View File

@ -203,20 +203,28 @@ class ogAdmClientWorker (ServerWorker):
else: else:
proc = ['bash', '-c', '{} {}'.format (devel_bash_prefix, exe)] proc = ['bash', '-c', '{} {}'.format (devel_bash_prefix, exe)]
logger.debug ('subprocess.run ("{}", capture_output=True)'.format (proc)) logger.debug ('subprocess.run ("{}", capture_output=True)'.format (proc))
return subprocess.run (proc, capture_output=True).stdout.strip().decode ('utf-8') p = subprocess.run (proc, capture_output=True)
if 0 != p.returncode:
raise Exception ('command failed') ## TODO mejorar este mensaje
return p.stdout.strip().decode ('utf-8')
def tomaIPlocal (self): def tomaIPlocal (self):
try: try:
self.IPlocal = self.interfaceAdmin ('getIpAddress'); self.IPlocal = self.interfaceAdmin ('getIpAddress');
logger.info ('local IP is "{}"'.format (self.IPlocal))
except Exception as e: except Exception as e:
logger.error (e) logger.error (e)
logger.error ('No se ha podido recuperar la dirección IP del cliente') logger.error ('No se ha podido recuperar la dirección IP del cliente')
return False return False
logger.info ('local IP is "{}"'.format (self.IPlocal))
return True return True
def LeeConfiguracion(self): def LeeConfiguracion (self):
try:
parametroscfg = self.interfaceAdmin ('getConfiguration') ## Configuración de los Sistemas Operativos del cliente parametroscfg = self.interfaceAdmin ('getConfiguration') ## Configuración de los Sistemas Operativos del cliente
except Exception as e:
logger.error (e)
logger.error ('No se ha podido recuperar la dirección IP del cliente')
return None
logger.debug ('parametroscfg ({})'.format (parametroscfg)) logger.debug ('parametroscfg ({})'.format (parametroscfg))
return parametroscfg return parametroscfg
@ -291,6 +299,9 @@ class ogAdmClientWorker (ServerWorker):
def inclusionCliente (self): def inclusionCliente (self):
cfg = self.LeeConfiguracion() cfg = self.LeeConfiguracion()
if not cfg:
logger.error ('LeeConfiguracion() failed')
return False
res = self.enviaMensajeServidor ('InclusionCliente', { 'cfg': cfg }) res = self.enviaMensajeServidor ('InclusionCliente', { 'cfg': cfg })
logger.debug ('res ({})'.format (res)) logger.debug ('res ({})'.format (res))