From 48683b8ca543c63a03c8d594a768d48d4a1a87b9 Mon Sep 17 00:00:00 2001
From: Gabriel Cuba <gcuba@whitestack.com>
Date: Wed, 8 Nov 2023 00:14:33 -0500
Subject: [PATCH] Bug 1830 fixed: maps completed operations to original
 operation types

Change-Id: I1a2f60f183ede39cabd9a7441ae64f10d7557232
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>
---
 osm_nbi/notifications.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osm_nbi/notifications.py b/osm_nbi/notifications.py
index 63d4ce8..22413d0 100644
--- a/osm_nbi/notifications.py
+++ b/osm_nbi/notifications.py
@@ -235,6 +235,14 @@ class NotificationBase:
 
 
 class NsLcmNotification(NotificationBase):
+    # maps kafka commands of completed operations to the original operation type
+    completed_operation_map = {
+        "INSTANTIATED": "INSTANTIATE",
+        "SCALED": "SCALE",
+        "TERMINATED": "TERMINATE",
+        "UPDATED": "UPDATE",
+        "HEALED": "HEAL",
+    }
     # SOL005 response model for nslcm notifications
     response_models = {
         "NsLcmOperationOccurrenceNotification": {
@@ -358,7 +366,8 @@ class NsLcmNotification(NotificationBase):
         if op_state:
             filter_q["operationStates"].append(op_state)
         if command:
-            filter_q["operationTypes"].append(command)
+            op_type = self.completed_operation_map.get(command, command)
+            filter_q["operationTypes"].append(op_type)
         # self.logger.debug("Db query is: {}".format(filter_q))
         subscribers = []
         try:
-- 
2.25.1