From a96aa4442f86a17a753b335665432702fd926417 Mon Sep 17 00:00:00 2001
From: Apurba Mukherjee <apurba.mukherjee@ericsson.com>
Date: Tue, 3 Mar 2020 16:46:23 +0530
Subject: [PATCH] Fix: Datapathfailure observed for unknown tunnels

Alarm was getting raised even when the tunnel state was unknown. Hence
the condition is changed to explicitly check if the tunnel state is
down.

Change-Id: Ia58d52c1994cfe8b943b906e93c61505f5904c95
Signed-off-by: Apurba Mukherjee <apurba.mukherjee@ericsson.com>
---
 .../genius/itm/monitoring/ItmTunnelEventListener.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
index a807b0f44..6f0573631 100644
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
@@ -221,7 +221,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
                 Uint64 srcDpId = internalTunnel.getSourceDPN();
                 Uint64 dstDpId = internalTunnel.getDestinationDPN();
                 String tunnelType = ItmUtils.convertTunnelTypetoString(internalTunnel.getTransportType());
-                if (!isTunnelInterfaceUp(add)) {
+                if (add.getOperState() == TunnelOperStatus.Down) {
                     LOG.trace("ITM Tunnel State during tep add is DOWN b/w srcDpn: {} and dstDpn: {} for tunnelType: "
                                       + "{}", srcDpId, dstDpId, tunnelType);
                     String alarmText = getInternalAlarmText(srcDpId.toString(), dstDpId.toString(), tunnelType);
@@ -239,7 +239,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
                         dstNode = "openflow:" + externalTunnel.getDestinationDevice();
                     }
                     String tunnelType = ItmUtils.convertTunnelTypetoString(externalTunnel.getTransportType());
-                    if (!isTunnelInterfaceUp(add)) {
+                    if (add.getOperState() == TunnelOperStatus.Down) {
                         LOG.trace("ITM Tunnel State during tep add is DOWN b/w srcNode: {} and dstNode: {} for "
                                           + "tunnelType: {}", srcNode, dstNode, tunnelType);
                         String alarmText = getExternalAlarmText(srcNode, dstNode, tunnelType);
-- 
2.36.6