Fcaps: changing alarm text parameter to be same while raising and clearing

Change-Id: I92e8b2d202779f0df3fa4d90868e36c52a9b95ec
Signed-off-by: gowri <gowri.r@ericsson.com>
(cherry picked from commit 96e9465bf5cd49600a74f10c6ad4d9c39220cec1)

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
index 8acfd99031a23a859ae29f2e23d1e84aa819eec7..347771f2a01d537908dd8e28edcc602e6f083945 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
@@ -32,6 +32,7 @@ public class BgpAlarms extends TimerTask {
     private BgpConfigurationManager bgpMgr;
 
     private static Map<String , BgpAlarmStatus> neighborsRaisedAlarmStatusMap = new HashMap<>();
+    private final String alarmText = "Bgp Neighbor TCP connection is down";
 
     @Override
     public void run () {
@@ -133,12 +134,9 @@ public class BgpAlarms extends TimerTask {
         if ((nbrIp == null) || (nbrIp.isEmpty())) {
             return;
         }
-        logger.trace("Raising BgpControlPathFailure alarm. {} ",
-                source);
+        logger.trace("Raising BgpControlPathFailure alarm. {} alarmtext {} ", source, alarmText);
         //Invokes JMX raiseAlarm method
-        alarmAgent.invokeFMraisemethod( "BgpControlPathFailure",
-                "Raising Bgp Nbr TCP connection down alarm.",
-                source.toString());
+        alarmAgent.invokeFMraisemethod( "BgpControlPathFailure", alarmText, source.toString());
     }
 
     public void clearBgpNbrDownAlarm(String nbrIp) {
@@ -147,10 +145,8 @@ public class BgpAlarms extends TimerTask {
         if ((nbrIp == null) || (nbrIp.isEmpty())) {
             return;
         }
-        logger.trace("Clearing BgpControlPathFailure alarm of source {} ", source);
+        logger.trace("Clearing BgpControlPathFailure alarm of source {} alarmtext {} ", source, alarmText);
         //Invokes JMX clearAlarm method
-        alarmAgent.invokeFMclearmethod( "BgpControlPathFailure",
-                "Clearing Bgp Nbr TCP connection down alarm.",
-                source.toString());
+        alarmAgent.invokeFMclearmethod( "BgpControlPathFailure", alarmText, source.toString());
     }
 }