refs #783 #784 #785 #786 #881 #882 #883 #879 move code around

src/opengnsys/modules/server/ogAdmClient/__init__.py

@@ -421,16 +421,6 @@ class ogAdmClientWorker (ogLiveWorker):
         self.muestraMenu()
         return self.respuestaEjecucionComando (cmd, 0)
 
-    def process_Actualizar (self, path, get_params, post_params, server):
-        logger.debug ('in process_Actualizar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
-        return self._long_running_job ('Actualizar', self.do_Actualizar, args=(post_params,))
-
-    def process_Purgar (self, path, get_params, post_params, server):
-        logger.debug ('in process_Purgar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
-        os.kill (os.getpid(), signal.SIGTERM)
-        return {}
-        #exit (0)      ## ogAdmClient.c:905
-
     def do_Comando (self, post_params):
         for k in ['nfn', 'ids']:
             if k not in post_params:
@@ -452,6 +442,81 @@ class ogAdmClientWorker (ogLiveWorker):
         }
         return self.respuestaEjecucionComando (cmd, herror, ids)
 
+    def do_Apagar (self, post_params):
+        for k in ['nfn', 'ids']:
+            if k not in post_params:
+                logger.error (f'required parameter ({k}) not in POST params')
+                return {}
+
+        nfn = post_params['nfn']
+        ids = post_params['ids']
+
+        try:
+            self.interfaceAdmin (nfn)
+            herror = 0
+        except:
+            logger.warning ('Error al ejecutar el comando')
+            herror = 1
+
+        cmd = {
+            'nfn': 'RESPUESTA_Apagar',
+        }
+        return self.respuestaEjecucionComando (cmd, herror, ids)
+
+    def do_Reiniciar (self, post_params):
+        for k in ['nfn', 'ids']:
+            if k not in post_params:
+                logger.error (f'required parameter ({k}) not in POST params')
+                return {}
+
+        nfn = post_params['nfn']
+        ids = post_params['ids']
+
+        try:
+            self.interfaceAdmin (nfn)
+            herror = 0
+        except:
+            logger.warning ('Error al ejecutar el comando')
+            herror = 1
+
+        cmd = {
+            'nfn': 'RESPUESTA_Reiniciar',
+        }
+        return self.respuestaEjecucionComando (cmd, herror, ids)
+
+    def do_IniciarSesion (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']
+
+        try:
+            self.interfaceAdmin (nfn, [dsk, par])
+            herror = 0
+        except:
+            logger.warning ('Error al ejecutar el comando')
+            herror = 1
+
+        cmd = {
+            'nfn': 'RESPUESTA_IniciarSesion',
+        }
+        return self.respuestaEjecucionComando (cmd, herror, ids)
+
+    def process_Actualizar (self, path, get_params, post_params, server):
+        logger.debug ('in process_Actualizar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
+        return self._long_running_job ('Actualizar', self.do_Actualizar, args=(post_params,))
+
+    def process_Purgar (self, path, get_params, post_params, server):
+        logger.debug ('in process_Purgar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
+        os.kill (os.getpid(), signal.SIGTERM)
+        return {}
+        #exit (0)      ## ogAdmClient.c:905
+
     def process_Comando (self, path, get_params, post_params, server):
         logger.debug ('in process_Comando, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
         return self._long_running_job ('Comando', self.do_Comando, args=(post_params,))
@@ -508,79 +573,14 @@ class ogAdmClientWorker (ogLiveWorker):
         }
         return self.respuestaEjecucionComando (cmd, 0, ids)
 
-    def do_Apagar (self, post_params):
-        for k in ['nfn', 'ids']:
-            if k not in post_params:
-                logger.error (f'required parameter ({k}) not in POST params')
-                return {}
-
-        nfn = post_params['nfn']
-        ids = post_params['ids']
-
-        try:
-            self.interfaceAdmin (nfn)
-            herror = 0
-        except:
-            logger.warning ('Error al ejecutar el comando')
-            herror = 1
-
-        cmd = {
-            'nfn': 'RESPUESTA_Apagar',
-        }
-        return self.respuestaEjecucionComando (cmd, herror, ids)
-
     def process_Apagar (self, path, get_params, post_params, server):
         logger.debug ('in process_Apagar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
         return self._long_running_job ('Apagar', self.do_Apagar, args=(post_params,))
 
-    def do_Reiniciar (self, post_params):
-        for k in ['nfn', 'ids']:
-            if k not in post_params:
-                logger.error (f'required parameter ({k}) not in POST params')
-                return {}
-
-        nfn = post_params['nfn']
-        ids = post_params['ids']
-
-        try:
-            self.interfaceAdmin (nfn)
-            herror = 0
-        except:
-            logger.warning ('Error al ejecutar el comando')
-            herror = 1
-
-        cmd = {
-            'nfn': 'RESPUESTA_Reiniciar',
-        }
-        return self.respuestaEjecucionComando (cmd, herror, ids)
-
     def process_Reiniciar (self, path, get_params, post_params, server):
         logger.debug ('in process_Reiniciar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
         return self._long_running_job ('Reiniciar', self.do_Reiniciar, args=(post_params,))
 
-    def do_IniciarSesion (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']
-
-        try:
-            self.interfaceAdmin (nfn, [dsk, par])
-            herror = 0
-        except:
-            logger.warning ('Error al ejecutar el comando')
-            herror = 1
-
-        cmd = {
-            'nfn': 'RESPUESTA_IniciarSesion',
-        }
-        return self.respuestaEjecucionComando (cmd, herror, ids)
-
     def process_IniciarSesion (self, path, get_params, post_params, server):
         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,))