easy-utils-dev 2.160__tar.gz → 2.161__tar.gz

{easy_utils_dev-2.160 → easy_utils_dev-2.161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.160
+Version: 2.161
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.160 → easy_utils_dev-2.161}/easy_utils_dev/ne1830PSS.py

@@ -61,6 +61,7 @@ class PSS1830 :
         self.screenBuffer = ""
         self.main_controller_client : paramiko.SSHClient = None
         self.standby_controller_client : paramiko.SSHClient = None
+        self.verify_node_reachability_by_ping = False
         self.create_jumphost = self.nfmtJumpServer
         if self.auto_enable_tcp_forward :
             self.logger.info(f'***WARNING*** : Auto enable tcp forwarding is enabled. This will allow tcp fowarding in target machine then restarting sshd service agent.')
@@ -439,6 +440,8 @@ class PSS1830 :
 
 
     def verify_node_reachability(self , neip ) :
+        if not self.verify_node_reachability_by_ping :
+            return True
         self.logger.debug(f"verify_node_reachability from jhost={self.isjumpserver}")
         if  self.isjumpserver == False :
             if not pingAddress(neip) :
@@ -509,26 +512,33 @@ class PSS1830 :
                 return client
 
     def port_switcher( self , mode ) :
-        if mode == 'direct_cli' or self.sim:
-            port = 22
+        if self.sim :
+            return 22
+        if mode == 'direct_cli':
+            # real be
+            # root cli@19.19,19,9
+            return 22
         else:
-            port = 5122
-            if mode in ('cli', 'ssh'):
-                port = 5122
-        return port
+            # real NE
+            # ssh root@10.0.0.1 -p 5122
+            return 5122
 
     def _connect(self , mode='cli' , neip=None , rootpw='QUx1MTIj') :
         self.client = self.createClient()
         port = self.port_switcher(mode)
+        self.logger.debug(f"Auto switch to port : {port}")
         try :
             jhostserver = self.createJhostInstance(neip , port)
             self.verify_node_reachability(neip)
             ok = False
             self.logger.debug(f"connecting to {neip} with mode={mode} and port={port}")
             if mode == 'direct_cli' :
+                self.logger.debug("Mode direct_cli detected")
                 self.client.connect(neip , port , "cli" , '' , sock=jhostserver)
                 ok = True
             elif mode == 'cli' or mode == 'ssh' :
+                self.logger.debug("Mode cli or ssh detected")
+                port = 22
                 self.client.connect( neip , port , "root" , rootpw ,  sock=jhostserver )
                 ok = True
             self.logger.debug(f"client={self.client} ok={ok} port={port} mode={mode}")
@@ -580,6 +590,7 @@ class PSS1830 :
             self.logger.debug(f"rootpw specified is obfuscated. Switch to plain text ...")
             rootpw = self.encryptor.dec_base64(rootpw)
             self.logger.debug(f"pw specified is obfuscated. Switch to plain text result {rootpw}")
+        # self.logger.info(f'root password is {rootpw}')
         self.logger.debug(f'Opening SSH  connection to NE {neip} mode={mode}, resetRequired={resetRequired}')
         self.cliUser = user
         self.mode = mode
@@ -640,6 +651,8 @@ class PSS1830 :
         if mode == 'ssh' : 
             self.logger.debug(f"ssh mode detected. returning self.client object with no switch_to_cli_shell()")
             self.connected = True
+            if return_channel :
+                return self.client , None
             return self.client
         self.channel = self.switch_to_cli_shell()
         self.logger.debug(f'set timeout in rcv channel to {self.TIMEOUT}')

{easy_utils_dev-2.160 → easy_utils_dev-2.161}/easy_utils_dev/uiserver.py

@@ -248,7 +248,6 @@ class UISERVER :
             if request :
                 return Response().ok(
                     message='Result of async request found' , 
-                    internalid=id ,
                     result=request.result ,
                     in_progress=request.in_progress ,
                     async_request=request.async_request ,
@@ -427,7 +426,7 @@ class UISERVER :
     def _wait_th(self , t ) :
         # t.join()
         while True :
-            time.sleep(10)
+            time.sleep(36000)
     
 
     def thrStartUi(self , suppress_prints=True) :

{easy_utils_dev-2.160 → easy_utils_dev-2.161}/easy_utils_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.160
+Version: 2.161
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.160 → easy_utils_dev-2.161}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '2.160'
+VERSION = '2.161'
 
 # Setting up
 setup(