diff options
| author |   Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-03-05 13:39:29 -0500 |
|---|---|---|
| committer | Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-03-05 13:41:03 -0500 |
| commit | cced9b8cb8db80b147fa61ce76a9f04ad8c420c6 (patch) | |
| tree | ad2de937a970b129f284decc68842c039ca4dc5c | |
| parent | 6415d2d0985168ae899a4dafd63efcd9bb843f14 (diff) | |
fix bugs reported in sonar scan
Issue-ID: DCAEGEN2-1922
Change-Id: Ia980e53974428159b26123e0f72d52a6650420c6
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
| -rw-r--r-- | oti/event-handler/otihandler/dti_processor.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/oti/event-handler/otihandler/dti_processor.py b/oti/event-handler/otihandler/dti_processor.py index eb0eb99..5802233 100644 --- a/oti/event-handler/otihandler/dti_processor.py +++ b/oti/event-handler/otihandler/dti_processor.py @@ -156,7 +156,7 @@ def notify_svc(args_tuple): return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) else: # remove from dtih_event_ack if present - if curr_evt is not None: + if curr_evt: try: del_evt_ack = db_access.query_event_info_docker(curr_evt, component_scn, deployment_id, container_id) @@ -178,7 +178,7 @@ def notify_svc(args_tuple): elif dcae_service_action == 'update': # handle update for pods being tracked and handle add for new pods k8s_scn_result = db_access.query_event_data_k8s_pod(curr_evt, component_scn) - if k8s_scn_result is not None: + if k8s_scn_result: # update DTIProcessor.logger.debug("dti_processor.notify_svc() in k8s for update action") return notify_k8s_pod((dti_event, db_access, k8s_scn_result)) @@ -582,7 +582,7 @@ class DTIProcessor(object): msg = "processing delete event for {}/{} to relate with any k8s hosts".format( self.target_type, self.target_name) DTIProcessor.logger.warning(msg) - if self.prim_db_event is not None: + if self.prim_db_event: result = self.db_access.query_event_data_k8s(self.target_type, self.target_name) res_dict_k8s = dict(self.k8s_pool.map(notify_k8s_pod, ( ((self.event, self.db_access, ack_item) for ack_item in result)))) @@ -592,7 +592,7 @@ class DTIProcessor(object): self._result['ERROR'] = msg try: - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.deleteDomainObject(self.prim_db_event) except Exception as e: msg = "trying to delete event from database, got exception {}: {!s}".format(type(e).__name__, e.args) @@ -603,10 +603,10 @@ class DTIProcessor(object): DTIProcessor.logger.warning(msg) self._result['ERROR'] = msg - if res_dict_k8s is not None: + if res_dict_k8s: utils.update_dict(res_dict, res_dict_k8s) - if res_dict_docker is not None: + if res_dict_docker: utils.update_dict(res_dict, res_dict_docker) return res_dict @@ -622,7 +622,7 @@ class DTIProcessor(object): if self.is_notify: try: self.prim_db_event = self.db_access.query_event_item(self.target_type, self.target_name) - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.update_event_item(self.event, self.target_type, self.target_name) result = self.db_access.query_event_data(self.target_type, self.target_name) if len(result) == 0: @@ -662,10 +662,10 @@ class DTIProcessor(object): DTIProcessor.logger.error(msg) self._result['ERROR'] = msg - if res_dict_k8s is not None: + if res_dict_k8s: utils.update_dict(res_dict, res_dict_k8s) - if res_dict_docker is not None: + if res_dict_docker: utils.update_dict(res_dict, res_dict_docker) return res_dict @@ -678,7 +678,7 @@ class DTIProcessor(object): res_dict = {} try: self.prim_db_event = self.db_access.query_event_item(self.target_type, self.target_name) - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.update_event_item(self.event, self.target_type, self.target_name) else: self.prim_db_event = Event(event=self.event, target_name=self.target_name, target_type=self.target_type, |