X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=netconf-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fnetconf%2Fnotification%2FNotificationHandler.java;h=fe80c4aac2538d226d4ff838ecf44de2d48ae627;hb=ce4e2d38e3d42725f61c39dd172325d2def4bc44;hp=71197d0f48494c70b69e71da214bd843144f28ac;hpb=597b7c7a33b3f636263fd7297e3d257eb6b56175;p=oam%2Ftr069-adapter.git

diff --git a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NotificationHandler.java b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NotificationHandler.java
index 71197d0..fe80c4a 100644
--- a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NotificationHandler.java
+++ b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NotificationHandler.java
@@ -19,22 +19,38 @@
 package org.commscope.tr069adapter.netconf.notification;
 
 import org.commscope.tr069adapter.mapper.model.NetConfNotificationDTO;
+import org.commscope.tr069adapter.netconf.server.utils.NetConfServerConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;
 
 @Component
 public class NotificationHandler {
 
-  private static final Logger LOG = LoggerFactory.getLogger(NotificationHandler.class);
+  private static final Logger logger = LoggerFactory.getLogger(NotificationHandler.class);
+  private static final String CLIENT_STR = "client";
 
   @Autowired
   NetConfSessionUtil netConfSessionUtil;
 
+  @Autowired
+  private JmsTemplate jmsTemplate;
+
   public void handleNetConfNotification(NetConfNotificationDTO netConNotifDTO) {
-    LOG.debug("processing netconf notification " + netConNotifDTO);
-    netConfSessionUtil.sendNetConfNotification(netConNotifDTO);
-  }
+    logger.debug("processing netconf notification {}", netConNotifDTO);
+    try {
+      MDC.put(CLIENT_STR, netConNotifDTO.getDeviceID());
 
+      logger.debug("NetConf notificaiton reviced for {}", netConNotifDTO.getDeviceID());
+      jmsTemplate.convertAndSend(NetConfServerConstants.NETCONF_NOTIFICATION_Q, netConNotifDTO);
+      logger.debug("Successfully posted the notiticaiton to JMS to forward to SDNR");
+    } catch (Exception e) {
+      logger.error("Posting notification failed; Reason: {}", e.getMessage());
+    } finally {
+      MDC.remove(CLIENT_STR);
+    }
+  }
 }