commit 9bc6074f85d088246c8fb33cb7e242d31d44fb61
author Charles Chan <rascov@gmail.com> Sun Nov 19 13:59:59 2017 -0800
committer Charles Chan <charles@opennetworking.org> Mon Nov 20 00:10:34 2017 +0000
tree 1af44b25a882e2bab08378a2d79054782f7297f8
parent 30675ca0b4123753a56fd39a775e486aa2be3f7a

[CORD-2223] Route is not resolved if nexthop moves

Location is deprecated and thus should no longer be used when comparing ResolvedRoute.

Change-Id: I36a516ced8a3b3b14f2bd999e6cda04560affb8c

apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java

diff --git a/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java b/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
index 1795e1e..0d52c8b 100644
--- a/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
+++ b/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
@@ -151,7 +151,7 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(route, nextHopMac, nextHopVlan, location);
+        return Objects.hash(route, nextHopMac, nextHopVlan);
     }
 
     @Override
@@ -168,8 +168,7 @@
 
         return Objects.equals(this.route, that.route) &&
                 Objects.equals(this.nextHopMac, that.nextHopMac) &&
-                Objects.equals(this.nextHopVlan, that.nextHopVlan) &&
-                Objects.equals(this.location, that.location);
+                Objects.equals(this.nextHopVlan, that.nextHopVlan);
     }
 
     @Override
@@ -178,7 +177,6 @@
                 .add("route", route)
                 .add("nextHopMac", nextHopMac)
                 .add("nextHopVlan", nextHopVlan)
-                .add("location", location)
                 .toString();
     }
 }