commit 6bb3bddc73c4633dbdc902f9d18b6cc877cfded5
author Saurav Das <sauravdas@alumni.stanford.edu> Thu May 05 09:50:24 2016 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Thu May 05 10:11:09 2016 -0700
tree 20f880b83386031caa502ecf136b1122312b666c
parent 17d38f4c59c0df6d5bb77484067792f687683d15

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

apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java

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 efda592..771448e 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.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 @@
             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;