easy-utils-dev 2.126__py3-none-any.whl → 2.127__py3-none-any.whl

easy_utils_dev/ne1830PSS.py

@@ -13,7 +13,7 @@ from easy_utils_dev import exceptions
 
 class PSS1830 :
     def __init__(self , sim=False , debug_name='Auto1830PSS' , auto_enable_tcp_forward=False,file_name=None,debug_home_path=None ) -> None:
-        self.port = 22
+        self.port = None
         self.logger = DEBUGGER(debug_name,file_name=file_name, homePath=debug_home_path)
         self.connected = False
         self.channel = None
@@ -45,8 +45,8 @@ class PSS1830 :
         self.tcpForwardStatus=None
         self.resetRequired = False
         self.screenBuffer = ""
-        self.main_controller_client = None
-        self.standby_controller_client = None
+        self.main_controller_client : paramiko.SSHClient = None
+        self.standby_controller_client : paramiko.SSHClient = None
         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.')
@@ -62,14 +62,14 @@ class PSS1830 :
         if level == 'debug' :
             self._change_paramiko_debug
 
-    def nfmtJumpServer(self, ip , usr , pw  ) :
+    def nfmtJumpServer(self, ip , usr , pw , port=22  ) :
         self.logger.info(f"""ssh to jump-host -> address={ip}""")
         # print(f"this function will be deperecated soon. use create_jumphost() instead.")
         try :
             self.jumpServerInSameInstance = True
             self.jumpserver  = self.createClient()
             self.logger.info(f'connecting to jump-host with {usr}@{ip} port=[{self.port}] ..')
-            self.jumpserver.connect(ip , self.port , usr , pw )
+            self.jumpserver.connect(ip , port , usr , pw )
             self.isjumpserver = True
             self.nfmtip = ip 
             self.nfmtsshuser = usr
@@ -83,7 +83,7 @@ class PSS1830 :
                 self.jumpserver.close()
                 self.logger.debug(f"""re-establish the connection after modifying the sshd file and restarting the sshd service ..""")
                 self.jumpserver  = self.createClient()
-                self.jumpserver.connect(ip  , self.port , usr , pw , banner_timeout=200 , timeout=200, auth_timeout=200)
+                self.jumpserver.connect(ip  , port , usr , pw , banner_timeout=200 , timeout=200, auth_timeout=200)
             self.logger.info(f"""connecting to jump-host [{ip}] - connected""")
             self.connected = True
             self.jumpserver.nfmtip = ip
@@ -467,10 +467,13 @@ class PSS1830 :
 
     def switch_to_standby_ec(self) :
         if self.connect_to_standby_ec : 
-            self.logger.debug(f"connecting to standby EC {self.neip} ...")
-            response = self.ssh_execute(ssh=self.client , command=f"ifconfig ilan | awk '/inet / {{print $2}}'")
-            if not response :
-                raise exceptions.InvalidRemoteEcIp(f"couldn't connect to remote EC")
+            self.logger.info(f"connecting to standby EC {self.neip} ...")
+            if not self.sim :
+                response = self.ssh_execute(ssh=self.client , command=f"ifconfig ilan | awk '/inet / {{print $2}}'")
+                if not response :
+                    raise exceptions.InvalidRemoteEcIp(f"couldn't connect to remote EC")
+            if self.sim :
+                response = "100.0.81.1"
             if response :
                 current_ec_ip = response.replace('\n' , '')
                 switcher = {
@@ -653,22 +656,6 @@ class PSS1830 :
     def switch_to_cli_shell(self) :
         return self.client.invoke_shell()
 
-    
-    def isRequireAknowledge(self , newRelease) : 
-        if '-' in str(newRelease) :
-            newRelease = float(newRelease.split('-')[0])
-        if int(newRelease) in range( 0 , 15 ) :
-            return True
-        elif int(newRelease) >= 23 :
-            return False
-        else : 
-            return True
-
-    def getTime(self) :
-        now = datetime.now()
-        dt_string = now.strftime("%d-%m-%Y_%H-%M-%S")
-        return dt_string
-
     def get_neversion(self,supress_error=False,cache=True) :
         """
         retreive the NE version depending on connection mode
@@ -714,7 +701,6 @@ class PSS1830 :
             self.close_cliconnection()
         except :
             pass
-
         try :
             self.client.close()
         except :
@@ -735,13 +721,12 @@ class PSS1830 :
         cli = f'paging status disable'
         self.cli_execute(cli)
         self.logger.debug('paging disabled.')
-        
 
     def channels_report(self, exportCsv=False) :
         self.logger.info('Generating Channels Report .. ')
         channels = self.get_xcs()
         header = ['NE', 'shelf', 'slot', 'port' , 'powerRx' , "powerTx" , "channel" , "prefec"  ,"postFec" , "shape" , "phase" , "trackMode"]
-        csvFpath = f"channels_report_{self.host}_{self.getTime()}.csv"
+        csvFpath = f"channels_report_{self.host}_{getTimestamp()}.csv"
         if exportCsv :        
             csvFile = open(csvFpath, 'w', encoding='UTF8' , newline='')
             csvFile = csv.writer(csvFile)
@@ -834,7 +819,7 @@ class PSS1830 :
         except :
             return ''
     
-    def config_database(self , ip , user, password , protocol , path , backupname="BACKUP") :
+    def config_backup_db_server(self , ip , user, password , protocol , path , backupname="BACKUP") :
         self.cli_execute(f'config database server ip {ip}')
         self.cli_execute(f'config database server protocol {protocol}')
         self.cli_execute(f'config database path {path}{backupname}')

{easy_utils_dev-2.126.dist-info → easy_utils_dev-2.127.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy-utils-dev
-Version: 2.126
+Version: 2.127
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 License-File: license.dat

{easy_utils_dev-2.126.dist-info → easy_utils_dev-2.127.dist-info}/RECORD

@@ -16,7 +16,7 @@ easy_utils_dev/filescompressor.py,sha256=iKAtLfkEXOuvvqF56jH0D9KAAeZ7iaa_sRaJnyY
 easy_utils_dev/generate_license.py,sha256=fr_eoSjKCmDmAEBc6FWFXZxGQOHx9XO6hEK8dcyVUlA,3319
 easy_utils_dev/keycloakapi.py,sha256=eHnc5fSC-YVYQU6EFs3ehutITnkHNJktx5BH_hpfxwM,7116
 easy_utils_dev/lralib.py,sha256=3IjaZbTK_hhyETNP7eALsFyQjWM-jb2rg-rjvgdDDIc,6328
-easy_utils_dev/ne1830PSS.py,sha256=WWfSMQLrQgjShIebwjhxovuRq30OsoH5zQkWJZcIjjo,70103
+easy_utils_dev/ne1830PSS.py,sha256=tfQGEllBWynwDdsy6Fa7nbazPkV4aNXE6HHkN122RBw,69781
 easy_utils_dev/nsp_kafka.py,sha256=oPJUk8GYMLjqXP_H0EbXQwLkpBxf_uGr6l2QtZO1cc8,10725
 easy_utils_dev/openid_server.py,sha256=_odeg6omuizSUEJLtbAVn2PnG9vkcUAQ7rU3K5yXk_I,2545
 easy_utils_dev/optics_utils.py,sha256=G-hFX2iiUCSJjk7BICBRGvVoDq0IBONLZSjagoB5FMg,964
@@ -28,8 +28,8 @@ easy_utils_dev/utils.py,sha256=BmVnbxc336c6WTeDFcEHN6Mavt7fJrIEyK4GXODV3gI,13345
 easy_utils_dev/winserviceapi.py,sha256=2ZP6jaSt1-5vEJYXqwBhwX-1-eQ3V3YzntsoOoko2cw,18804
 easy_utils_dev/wsnoclib.py,sha256=tC-RmjddaLpihPCRBLGC2RnRpFJqexhvExUr1KncoQM,29063
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
-easy_utils_dev-2.126.dist-info/METADATA,sha256=O5CF2x3bvBiw63HRgxz7AHrofkxaMEaGFStHJn5qzTQ,537
-easy_utils_dev-2.126.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.126.dist-info/license.dat,sha256=hTRbLnrYZdH7UOsZRYC3IntAhyUkUUXi4TuizI7gca4,74
-easy_utils_dev-2.126.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.126.dist-info/RECORD,,
+easy_utils_dev-2.127.dist-info/METADATA,sha256=mj50JAg4vNXX0VT7PUfqCCRGazWLiP-PbKhBLgnP1R4,537
+easy_utils_dev-2.127.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.127.dist-info/license.dat,sha256=hTRbLnrYZdH7UOsZRYC3IntAhyUkUUXi4TuizI7gca4,74
+easy_utils_dev-2.127.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.127.dist-info/RECORD,,