From 6bb3bddc73c4633dbdc902f9d18b6cc877cfded5 Mon Sep 17 00:00:00 2001 From: Saurav Das Date: Thu, 5 May 2016 09:50:24 -0700 Subject: [PATCH] Temporary fix to route withdrawl problem in Atrium 16A release branch. ONOS FPM manager ignores FPM messages with protocols other than ZEBRA. This change accepts all protocols. Change-Id: I8173d4ddf02a594f81e86c36c823be98b468455a --- .../main/java/org/onosproject/routing/fpm/FpmManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java b/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java index efda592519..771448e40b 100644 --- a/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java +++ b/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java @@ -41,7 +41,8 @@ import org.onosproject.routing.fpm.protocol.RouteAttribute; import org.onosproject.routing.fpm.protocol.RouteAttributeDst; import org.onosproject.routing.fpm.protocol.RouteAttributeGateway; import org.onosproject.routing.fpm.protocol.RtNetlink; -import org.onosproject.routing.fpm.protocol.RtProtocol; +//import org.onosproject.routing.fpm.protocol.RtProtocol; +//import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -146,10 +147,10 @@ public class FpmManager implements RouteSourceService { log.trace("Received FPM message: {}", fpmMessage); } - if (rtNetlink.protocol() != RtProtocol.ZEBRA) { + /*if (rtNetlink.protocol() != RtProtocol.ZEBRA) { log.trace("Ignoring non-zebra route"); return; - } + }*/ IpAddress dstAddress = null; IpAddress gateway = null;