easy-utils-dev 2.138__py3-none-any.whl → 2.139__py3-none-any.whl

easy_utils_dev/EasySsh.py

@@ -69,7 +69,7 @@ class CREATESSH :
         ch.disconnect = disconnect
         return ch
 
-    def ssh_execute(self ,command ,  merge_output=False , hide_output=False) :
+    def ssh_execute(self ,command ,  merge_output=False , hide_output=True) :
         self.logger.info(f"executing {command}")
         try :
             stdin_ , stdout_ , stderr_ = self.ssh.exec_command(command)

easy_utils_dev/wsnoclib.py

@@ -35,6 +35,7 @@ class KafkaConfig :
         self.kafka_subscription_deleted = False 
         self.base_url = None
         self.kafka_thread=None
+        self.enable_auto_refresh = False
 
 
 
@@ -69,7 +70,8 @@ class WSNOCLIB :
         self.onGoingRequests=0
         self.fastQueue = FastQueue(request_max_count)
         self.queue = []
-        self.tokenRefreshPeriod = 2700
+        self.token = {}
+        self.tokenRefreshPeriod = None
         self.final_results = []
         self.killed=False
         self.nes=[]
@@ -124,33 +126,23 @@ class WSNOCLIB :
             return
         if not pingAddress(self.address) :
             raise Exception(f'Address {self.address} is not pingable.')
-        self.logger.info(f'Connecting to {self.address} using username: {self.username} BAuth={BAuth(self.username, self.password)}')
+        # self.logger.info(f'Connecting to {self.address} using username: {self.username}')
         self.logger.debug(f'Connecting to {self.address} using username: {self.username}')
         URL = f"https://{self.address}/rest-gateway/rest/api/v1/auth/token"
-        self.logger.debug(f'Login URL is {URL}')
         headers = {
             "Content-Type": "application/json"
         }
         data = {
             "grant_type": "client_credentials"
         }
-        r = requests.post(url = URL , headers=headers , auth=BAuth(self.username, self.password), verify=False, json=data)
-        self.logger.debug(f"""
-            response_header={r.headers}
-            response_encoding={r.encoding}
-            response_reason={r.reason}
-            body={r.request.body}
-            headers={r.request.headers}
-            URL={URL}
-            content={r.text}
-        """)
-        self.logger.info(f'Request return status code : {r.status_code}')
-        self.logger.debug(f"Login Request response body is {r.text}")
-        if r.status_code != 200 :
+        r = self.session.post(url = URL , headers=headers , auth=BAuth(self.username, self.password), json=data)
+        if not r.ok :
             self.logger.debug(f'fail message {r.text}')
             raise Exception(f'Failed to authenticate WSNOC. Return status code : {r.status_code}')
         self.access_token = r.json()["access_token"]
         self.refresh_token = r.json()["refresh_token"]
+        if not self.tokenRefreshPeriod :
+            self.tokenRefreshPeriod = int(r.json()["expires_in"]) - 100
         self.bearer_token = f'Bearer {self.access_token}'
         self.token = r.json()
         self.token.update({'bearer_token' :  self.bearer_token })
@@ -202,12 +194,13 @@ class WSNOCLIB :
         sleep(self.tokenRefreshPeriod)
         self.logger.info(f"Waiting period completed. Starting Revoking/Login process ...")
         self.refresh_inprogress = True
-        self.logout(logout=False)
-        sleep(30)
-        self.logger.info(f"Logout process completed. Starting Reconnecting ...")
-        self.connect(self.auto_refresh_token)
+        self.renew_by_refresh_token()
         self.refresh_inprogress = False
-        self.event.dispatchEvent('onTokenRefresh', self.token)
+        self.kafka.refresh_inprogress = True
+        if self.kafka.enable_auto_refresh :
+            self.renewSubscription()
+        self.kafka.refresh_inprogress = False
+        self.runAutoRefreshThread()
 
     def kafka_connect( self , 
             user , 
@@ -253,7 +246,6 @@ class WSNOCLIB :
         self.logger.debug(f"nsp_address: {nsp_address}")
         self.logger.debug(f"NewRelease: {new_release}")
         self.kafka.kafka_subscription_deleted= False
-
         if not self.external_nsp : 
             if new_release :
                 self.kafka.kafka_nsp_os_name = 'nspos-kafka'
@@ -265,8 +257,6 @@ class WSNOCLIB :
             self.kafka.kafka_address = nsp_address
             self.kafka.kafka_port = 9192
             self.kafka.kafka_nsp_os_name = 'nspos-tomcat'
-
-        self.logger.info('requesting kafka subscription ...')
         if self.loggedOut or self.killed:
             self.logger.error(f"WSNOC API Authentication process loggedout or killed. exit")
             raise Exception('WSNOC API Authentication process loggedout or killed. exit')
@@ -283,21 +273,38 @@ class WSNOCLIB :
         self.nsp_key = f'{self.temp_dir}/nsp.key'
         self.nsp_cert = f'{self.temp_dir}/nsp.pem'
         if not self.external_nsp :
+            ####################
+            ####################
+            #
+            #   IN CASE OF INTERNAL NSP
+            #   
+            ####################
+            ####################
+            checkContainer = self.ssh.ssh_execute(f"docker ps | grep -i 'nspos-kafka' | wc -l")
+            if checkContainer != '0' :
+                self.kafka.kafka_nsp_os_name = 'nspos-kafka'
+            self.kafka.kafka_port = None
             self.logger.debug(f"Working on internal NSP to copy the files ...")
             self.ssh.ssh_execute(f"docker cp {self.kafka.kafka_nsp_os_name}:/opt/nsp/os/ssl/certs/nsp/nsp.pem /tmp/nsp.pem")
             self.ssh.ssh_execute(f"docker cp {self.kafka.kafka_nsp_os_name}:/opt/nsp/os/ssl/nsp.key /tmp/nsp.key")
             sftp.get('/tmp/nsp.pem' , f'{self.temp_dir}/nsp.pem')
             sftp.get('/tmp/nsp.key' , f'{self.temp_dir}/nsp.key')
             self.kafka.ca_cert = f'{self.temp_dir}/nsp.pem'
-            baseUrl = self.kafka.base_url = None
-            port = self.kafka.kafka_api_port
+            self.kafka.base_url = f'https://{self.address}'
         else :
+            ####################
+            ####################
+            #
+            #   IN CASE OF EXTERNAL NSP
+            #   
+            ####################
+            ####################
             self.logger.debug(f"Working on external NSP to copy the files ...")
             CertLoc = f"""find /var/lib/kubelet/pods/ -type d -path "*/volumes/kubernetes.io~empty-dir/shared-tls-volume" | head -n1"""
             CertLoc = self.ssh.ssh_execute(CertLoc).replace('\n','')
             self.logger.debug(f"CertLoc Host: {CertLoc}")
-            baseUrl = self.kafka.base_url = f'https://{nsp_address}'
-            port = self.kafka.kafka_port = None
+            self.kafka.base_url = f'https://{nsp_address}'
+            self.kafka.kafka_port = None
             if len(CertLoc) > 15 :
                 self.logger.debug(f"Copying cert files from nsp host machine ....")
                 copies = [
@@ -334,7 +341,6 @@ class WSNOCLIB :
             self.logger.debug(f'affectedObjectType Filter : filter updated with "{filter}"')
         if custom_filter_expression :
             filter += f" {custom_filter_expression}"
-        URL = '/nbi-notification/api/v1/notifications/subscriptions'
         kafkaForm = {
                 "categories": [
                     {
@@ -344,19 +350,18 @@ class WSNOCLIB :
                 ]
         }
         self.logger.debug(f"Kafka Filter Form : {kafkaForm}")
-        response = self.post(
-            url=URL,
-            baseUrl=baseUrl,
-            return_json=True,
-            port=port,
-            body=json.dumps(kafkaForm)
-        )
-        if response :
+        if self.kafka.kafka_port is not None :
+            URL = f"{self.kafka.base_url}:{self.kafka.kafka_port}/nbi-notification/api/v1/notifications/subscriptions"
+        else :
+            URL = f"{self.kafka.base_url}/nbi-notification/api/v1/notifications/subscriptions"
+        response = self.session.post(URL , json=kafkaForm , retries=3)
+        if response.ok :
+            response = response.json()
             self.kafka.subscriptionId = response['response']['data']['subscriptionId']
             self.kafka.response = response
             self.kafka.topicId = response['response']['data']['topicId']
             if auto_refresh :
-                self.kafka.kafka_thread = start_thread(target=self.renewSubscription)
+                self.kafka.enable_auto_refresh = True
             self.killed=False
         else :
             self.logger.error(f"Failed to create kafka subscription.")
@@ -365,81 +370,84 @@ class WSNOCLIB :
         return self.kafka
 
     def change_kafka_refresh_period(self , period : int =3000) :
-        self.kafka.kafka_refresh_period = period
+        print('Deprecated function change_kafka_refresh_period. Kafka refresh period is now managed by WSNOC API SLEEP PERIOD')
 
     def renewSubscription(self) :
-        while True :
-            try :
-                sleep(self.kafka.kafka_refresh_period) 
-                if self.loggedOut or self.killed:
-                    break
-                self.logger.info('Renewing subscription ...')
-                self.kafka.refresh_inprogress = True
-                URL = f"/nbi-notification/api/v1/notifications/subscriptions/{self.kafka.subscriptionId}/renewals"
-                response = self.post(
-                    url=URL,
-                    baseUrl=self.kafka.base_url,
-                    port=self.kafka.kafka_port,
-                )
-                self.logger.info(f'Renewing subscription [{response.status_code}]')
-                self.logger.info(f'Renewing subscription Response: [{response.text}]')
-            except Exception as error :
-                self.logger.error(f'failed to renew subscription. {error}')
-                self.logger.debug(traceback.format_exc())
-            self.kafka.refresh_inprogress = False
-
-    def deleteKafkaSubscription(self , subscriptionId=None) :
-        self.logger.info(f'Deleting subscription subscriptionId:{subscriptionId}')
-        if not subscriptionId :
-            self.logger.info(f'Deleting subscription subscriptionId:{self.kafka.subscriptionId}')
-            subscriptionId=self.kafka.subscriptionId
-        URL = f"/nbi-notification/api/v1/notifications/subscriptions/{subscriptionId}"
-        self.kafka.kafka_subscription_deleted= True
-        self.delete(
-            url=URL,
-            return_json=True,
-            port=self.kafka.kafka_api_port,
-        )
-        self.killed=True
-        return True
+        self.logger.info('Renewing subscription ...')
+        if self.kafka.kafka_port is not None :
+            URL = f"{self.kafka.base_url}:{self.kafka.kafka_port}/nbi-notification/api/v1/notifications/subscriptions/{self.kafka.subscriptionId}/renewals"
+        else :
+            URL = f"{self.kafka.base_url}/nbi-notification/api/v1/notifications/subscriptions/{self.kafka.subscriptionId}/renewals"
+        response = self.session.post(URL , retries=3)
+        if not response.ok :
+            self.logger.error(f'failed to renew subscription. {response.text}')
+
+    # def renewSubscription(self) :
+    #     while True :
+    #         try :
+    #             sleep(self.kafka.kafka_refresh_period) 
+    #             if self.loggedOut or self.killed:
+    #                 break
+    #             self.logger.info('Renewing subscription ...')
+    #             self.kafka.refresh_inprogress = True
+    #             URL = f"{self.kafka.base_url}:{self.kafka.kafka_port}/nbi-notification/api/v1/notifications/subscriptions/{self.kafka.subscriptionId}/renewals"
+    #             response = self.session.post(URL , retries=3)
+    #             self.logger.debug(f'Renewing subscription Response: [{response.text}]')
+    #         except Exception as error :
+    #             self.logger.error(f'failed to renew subscription. {error}')
+    #             self.logger.debug(traceback.format_exc())
+    #         self.kafka.refresh_inprogress = False
+
+    # def deleteKafkaSubscription(self , subscriptionId=None) :
+    #     self.logger.info(f'Deleting subscription subscriptionId:{subscriptionId}')
+    #     if not subscriptionId :
+    #         self.logger.info(f'Deleting subscription subscriptionId:{self.kafka.subscriptionId}')
+    #         subscriptionId=self.kafka.subscriptionId
+    #     self.kafka.kafka_subscription_deleted= True
+    #     URL = f"{self.kafka.base_url}:{self.kafka.kafka_port}/nbi-notification/api/v1/notifications/subscriptions/{subscriptionId}"
+    #     response = self.session.delete(URL , retries=3)
+    #     return response
     
-    def handle_beautify_alarm(self , alarm ) :
-        oalarm = alarm
-        alarm = alarm['data']['ietf-restconf:notification']
-        if 'create' in str(list(alarm.keys())) :
-            alarmData = alarm['nsp-fault:alarm-create']
-            oalarm['dataEnh'] = {
-                'newAlarm' : True,
-                'alarmChange' : False,
-                'alarmId' : int(alarmData['objectId'].split(':')[-1]),
-                'neId' : alarmData['neId'],
-                'neName	' : alarmData['neName'],
-                'alarmName' : alarmData['alarmName'],
-                'cleared' : False,
-                'aknowledged' : False,
-                **alarmData , 
-            }
-        elif 'change' in str(list(alarm.keys())) :
-            alarmData = alarm['nsp-fault:alarm-change']
-            cleared = False
-            aknowledged = False
-            if 'severity' in list(alarmData.keys()) :
-                if alarmData['severity']['new-value'] == 'cleared' :
-                    cleared = True
-            if 'acknowledged' in list(alarmData.keys()) :
-                    aknowledged = alarmData['acknowledged']['new-value']
-            oalarm['dataEnh'] = {
-                'newAlarm' : False,
-                'alarmChange' : True,
-                'alarmId' : int(alarmData['objectId'].split(':')[-1]),
-                'cleared' : cleared,
-                'aknowledged' : aknowledged,
-                **alarmData ,
-            }
-        return oalarm
-
-
-    def kafka_listen(self) :  
+    # def handle_beautify_alarm(self , alarm ) :
+    #     oalarm = alarm
+    #     alarm = alarm['data']['ietf-restconf:notification']
+    #     if 'create' in str(list(alarm.keys())) :
+    #         alarmData = alarm['nsp-fault:alarm-create']
+    #         oalarm['dataEnh'] = {
+    #             'newAlarm' : True,
+    #             'alarmChange' : False,
+    #             'alarmId' : int(alarmData['objectId'].split(':')[-1]),
+    #             'neId' : alarmData['neId'],
+    #             'neName	' : alarmData['neName'],
+    #             'alarmName' : alarmData['alarmName'],
+    #             'cleared' : False,
+    #             'aknowledged' : False,
+    #             **alarmData , 
+    #         }
+    #     elif 'change' in str(list(alarm.keys())) :
+    #         alarmData = alarm['nsp-fault:alarm-change']
+    #         cleared = False
+    #         aknowledged = False
+    #         if 'severity' in list(alarmData.keys()) :
+    #             if alarmData['severity']['new-value'] == 'cleared' :
+    #                 cleared = True
+    #         if 'acknowledged' in list(alarmData.keys()) :
+    #                 aknowledged = alarmData['acknowledged']['new-value']
+    #         oalarm['dataEnh'] = {
+    #             'newAlarm' : False,
+    #             'alarmChange' : True,
+    #             'alarmId' : int(alarmData['objectId'].split(':')[-1]),
+    #             'cleared' : cleared,
+    #             'aknowledged' : aknowledged,
+    #             **alarmData ,
+    #         }
+    #     return oalarm
+
+
+    def kafka_listen(self) : 
+        def hold_if_kafka_refresh_inprogress() :
+            while self.kafka.refresh_inprogress :
+                sleep(.1)
         self.logger.info('Listening to Kafka Notifications ...')
         if not self.kafka.topicId :
             self.logger.error(f'kafka is not established. exit.')
@@ -464,9 +472,7 @@ class WSNOCLIB :
         )
         try:
             while True:
-                if self.kafka.refresh_inprogress :
-                    self.logger.info(f"Waiting for kafka subscription to be ready. In refresh process...")
-                    sleep(1)
+                hold_if_kafka_refresh_inprogress()
                 if self.kafka.kafka_subscription_deleted :
                     self.logger.info(f"Kafka subscription is deleted. exit.")
                     break
@@ -583,6 +589,27 @@ class WSNOCLIB :
             return r.json()
         return r
 
+    def renew_by_refresh_token(self) :
+        URL = f"https://{self.address}/rest-gateway/rest/api/v1/auth/token"
+        headers = {
+             "Content-Type": "application/json"
+        }
+        data = {
+            "grant_type": "refresh_token",
+            "refresh_token": f"{self.refresh_token}"
+            
+        }
+        r = self.session.post(URL , headers=headers , json=data , auth=BAuth(self.username, self.password) , skip_hold_for_token_refresh=True)
+        if r.ok :
+            if not self.tokenRefreshPeriod :
+                self.tokenRefreshPeriod = int(r.json()["expires_in"]) - 100
+            self.access_token = r.json()["access_token"]
+            self.refresh_token = r.json()["refresh_token"]
+            self.bearer_token = f'Bearer {self.access_token}'
+            self.token = r.json()
+            self.token.update({'bearer_token' :  self.bearer_token })
+        return r
+
     def session_info(self) :
         self.logger.debug('Getting Version ...')
         response = self.get( url='/oms1350/data/common/sessionInfo')
@@ -676,22 +703,27 @@ class WSNOCSession(requests.Session):
         self.headers.update({"Content-Type": "application/json"})  # base defaults
         self._wsnoc = wsnoc
         self.verify = False
+        self.retries = 0
+        self.skip_hold_for_token_refresh = False
         
     def rebuild_auth(self, prepared_request, response):
         return
 
-    def hold_for_token_refresh(self) :
+    def hold_for_token_refresh(self, url) :
         while self._wsnoc.refresh_inprogress :
+            self._wsnoc.logger.debug(f'Waiting for token refresh. {url}')
             sleep(.1)
 
-    def request(self, method, url , retries=0 , **kwargs):
+    def request(self, method, url , retries=0 , skip_hold_for_token_refresh=False , **kwargs):
         self._wsnoc.logger.debug(f'[{method}] : {url}')
-        self.hold_for_token_refresh()
+        if not skip_hold_for_token_refresh :
+            self.hold_for_token_refresh(url)
         self._wsnoc.api_count += 1
         token = self._wsnoc.getLatestToken().get('bearer_token')
         request_headers = kwargs.get('headers' , {})
-        if not request_headers.get('Authorization') :
-            request_headers['Authorization'] = token
+        if token :
+            if not request_headers.get('Authorization') :
+                request_headers['Authorization'] = token
         kwargs['headers'] = request_headers
         request = super().request(method, url, **kwargs  )
         for i in range(retries) :
@@ -702,7 +734,7 @@ class WSNOCSession(requests.Session):
                 self.hold_for_token_refresh()
                 request = super().request(method, url, **kwargs )
                 self._wsnoc.logger.debug(f'[Try-{i}] [{method}] : {url}- {request.status_code}')
-        self._wsnoc.logger.info(f'[{method}] : {url}- {request.status_code}')
+        self._wsnoc.logger.info(f'[{method}] : {url} - [{request.status_code}]')
         return request
 
 

{easy_utils_dev-2.138.dist-info → easy_utils_dev-2.139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy-utils-dev
-Version: 2.138
+Version: 2.139
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.138.dist-info → easy_utils_dev-2.139.dist-info}/RECORD

@@ -1,4 +1,4 @@
-easy_utils_dev/EasySsh.py,sha256=PbFK1vSBcnt_SfkZXZGh5wg6Sg9R2WlXeGdvjZluJ9E,3592
+easy_utils_dev/EasySsh.py,sha256=9pQaHHQGng8X3fsy4Vvto5RIEObm-iOt52VLiO6m1g0,3591
 easy_utils_dev/Events.py,sha256=MdI53gAyXX_2jmChpayayQM0ZitgjtkyUNrQYGEEZnw,2978
 easy_utils_dev/FastQueue.py,sha256=Drt8B_hEdmg9eAt7OWSgTyoJ3rUHkeJHk9xdaehtEsY,5622
 easy_utils_dev/NameObject.py,sha256=Z4Qp3qfMcQeMPw35PV_xOu8kigRtfSRZ4h7woR0t3Gg,270
@@ -27,11 +27,11 @@ easy_utils_dev/temp_memory.py,sha256=gfC-izYw8Sg1DD5iOdL8R5-fdB5RK0qkXZie9WmFjPA
 easy_utils_dev/uiserver.py,sha256=d9jImwgSURMH4MIU4Zkro2b20cAbuV8rO_If42FVyZ4,6826
 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=z18kdPJJeNYAaomqH1t6KfTWm77BNPx6aPAW9P0PSOc,30813
+easy_utils_dev/wsnoclib.py,sha256=25sjxutCAOHHGaK7-t1owNq9fV29BHFK1Dox08SZdFg,32876
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
 easy_utils_dev/ept_sql/create_dirs.sql,sha256=KWfX-Nc6lvr_BC-P6O97NE0idoPW4GNKUKUCgonJhto,3508
 easy_utils_dev/ept_sql/create_ept_tables.sql,sha256=WDHyIyeReV8_QaYBPIpSy-lto3OKvZtex1tWs-FPURQ,67737
-easy_utils_dev-2.138.dist-info/METADATA,sha256=uN_YPuZajKHryq24B8n7zfC3qVYpw9oXaDabo_Vfo1E,510
-easy_utils_dev-2.138.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.138.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.138.dist-info/RECORD,,
+easy_utils_dev-2.139.dist-info/METADATA,sha256=-C0ualpFQyudh54KYQSws8PVDWoPXSme1Bd8FZNA3-E,510
+easy_utils_dev-2.139.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.139.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.139.dist-info/RECORD,,