From: Jon Zhang <rong.zhang@windriver.com>
Date: Tue, 7 May 2024 05:30:30 +0000 (+0000)
Subject: Merge "Revert "Add the PATCH method for the monitoring API""
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=7e4e326be2e53db31632eff22168784b89d40de2;hp=6841e2e68f72068374d333723f5b5275bfb98933;p=pti%2Fo2.git

Merge "Revert "Add the PATCH method for the monitoring API""
---

diff --git a/.github/workflows/gerrit-novote-merge.yaml b/.github/workflows/gerrit-merge.yaml
similarity index 95%
rename from .github/workflows/gerrit-novote-merge.yaml
rename to .github/workflows/gerrit-merge.yaml
index e80c467..e27434a 100644
--- a/.github/workflows/gerrit-novote-merge.yaml
+++ b/.github/workflows/gerrit-merge.yaml
@@ -66,7 +66,6 @@ jobs:
           gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
           gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
           vote-type: clear
-          comment-only: true
       - name: Allow replication
         run: sleep 10s
 
@@ -87,8 +86,8 @@ jobs:
             -Dsonar.build.sourceEncoding=UTF-8
             -Dsonar.organization=o-ran-sc
             -Dsonar.projectBaseDir=.
-            -Dsonar.projectKey=o-ran-sc_smo-o2
-            -Dsonar.projectName=smo-o2
+            -Dsonar.projectKey=o-ran-sc_pti-o2
+            -Dsonar.projectName=pti-o2
             -Dsonar.sources=.
             -Dsonar.verbose=true
 
@@ -110,4 +109,3 @@ jobs:
           gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
           gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
           vote-type: ${{ env.WORKFLOW_CONCLUSION }}
-          comment-only: true
diff --git a/o2ims/adapter/clients/fault_client.py b/o2ims/adapter/clients/fault_client.py
index 53602b4..3717487 100644
--- a/o2ims/adapter/clients/fault_client.py
+++ b/o2ims/adapter/clients/fault_client.py
@@ -21,7 +21,7 @@ from cgtsclient.client import get_client as get_stx_client
 from cgtsclient.exc import EndpointException
 from dcmanagerclient.api.client import client as get_dc_client
 from fmclient.client import get_client as get_fm_client
-from fmclient.common.exceptions import HTTPNotFound
+from fmclient.common.exceptions import HTTPNotFound, HttpServerError
 
 from o2app.adapter import unit_of_work
 from o2common.config import config
@@ -85,6 +85,11 @@ class StxAlarmClient(BaseClient):
                 logger.debug('alarm {} not in this resource pool {}'
                              .format(alarm, self._pool_id))
                 continue
+            except HttpServerError:
+                # TODO(jon): This exception needs to be removed when the
+                # INF-457 related FM client upgrade and issue fix occur.
+                logger.debug('alarm {} query failed'.format(alarm))
+                continue
             ret.append(event)
 
         return ret