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

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

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

{easy_utils_dev-2.160 → easy_utils_dev-2.162}/easy_utils_dev/debugger.py

@@ -42,8 +42,9 @@ class CensorFilter(logging.Filter):
         self.ip_regex = re.compile(r"\b\d{1,3}(?:\.\d{1,3}){3}\b")
 
     def add_censored_string(self, value):
-        if value:
-            self.censored_strings.append(str(value))
+        if value :
+            if str(value) not in self.censored_strings : 
+                self.censored_strings.append(str(value))
 
     def filter(self, record):
         msg = record.getMessage()

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

@@ -46,6 +46,7 @@ class PSS1830 :
         self.requireAknow=None
         self.gmre = False
         self.isGmreLogin=False
+        self.censor_strings = False
         self.gmrePrompt=None
         self.connectionMethod=None
         self.jump_transport=None
@@ -61,6 +62,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 +441,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 +513,32 @@ class PSS1830 :
                 return client
 
     def port_switcher( self , mode ) :
-        if mode == 'direct_cli' or self.sim:
-            port = 22
+        if self.sim :
+            return 22 , 0
+        if mode == 'direct_cli':
+            # real be
+            # root cli@19.19,19,9
+            return 22 , 1
         else:
-            port = 5122
-            if mode in ('cli', 'ssh'):
-                port = 5122
-        return port
+            # real NE
+            # ssh root@10.0.0.1 -p 5122
+            return 5122 , 2
 
     def _connect(self , mode='cli' , neip=None , rootpw='QUx1MTIj') :
         self.client = self.createClient()
-        port = self.port_switcher(mode)
+        port , reason  = self.port_switcher(mode)
+        self.logger.debug(f"Auto switch to port : {port} reason : {reason}")
         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}")
+            self.logger.debug(f"connecting to {mode}::{neip}:{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")
                 self.client.connect( neip , port , "root" , rootpw ,  sock=jhostserver )
                 ok = True
             self.logger.debug(f"client={self.client} ok={ok} port={port} mode={mode}")
@@ -575,12 +585,14 @@ class PSS1830 :
         if pw == 'YWRtaW4=' :
             self.logger.debug(f"pw specified is obfuscated. Switch to plain text ...")
             pw = self.encryptor.dec_base64(pw)
-            self.logger.debug(f"pw specified is obfuscated. Switch to plain text result {pw}")
         if rootpw == 'QUx1MTIj' :
             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.debug(f'Opening SSH  connection to NE {neip} mode={mode}, resetRequired={resetRequired}')
+        if self.censor_strings :
+            self.logger.censor.add_censored_string(str(rootpw))
+            self.logger.censor.add_censored_string(str(neip))
+            self.logger.censor.add_censored_string(str(pw))
+        self.logger.debug(f'Opening SSH  connection to NE {mode}::{neip} -resetRequired={resetRequired}')
         self.cliUser = user
         self.mode = mode
         self.cliPw = pw
@@ -602,19 +614,18 @@ class PSS1830 :
             auto_disable_paging={auto_disable_paging}
             connect_to_standby_ec={connect_to_standby_ec}
             return_channel={return_channel}
-            sim={self.sim}
+            isSim={self.sim}
             --------------------------------------------------------
         """)
         if connect_to_standby_ec and mode != 'ssh' :
             self.logger.error(f"connect_to_standby_ec is only supported for ssh mode. since PSS CLI only valid on Active Controller")
             raise exceptions.StandbyEcConnectionModeNotSupported('connect_to_standby_ec is only supported for cli/ssh mode.')
         # another method is to inject the jumpserver inside the connect itself.
-        if jumpserver != None  and self.jumpServerInSameInstance == False :
+        if jumpserver != None and self.jumpServerInSameInstance == False :
             self.isjumpserver = True
             self.jumpserver = jumpserver
             self.nfmtip = jumpserver.nfmtip 
-            self.connected = True
-        # self.verify_node_reachability(neip)
+            # self.connected = True
         self.maxConnectAttempt = maxAttemps = maxReconnectAttemp
         self.currentConnectAttempt=0
         for i in range(maxAttemps) :
@@ -634,12 +645,14 @@ class PSS1830 :
         self.connected=True
         self.logger.debug(f'''\n
         --------------------------------------------------------
-                 Network Element - connected - {neip}
+                 Network Element - connected - {mode}::{neip}:{self.port}
         ---------------------------------------------------------
         \n''')
         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.162}/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.162}/easy_utils_dev.egg-info/PKG-INFO

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

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

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