DHCPv[46] relay must replace the route instead of adding an extra NH
Currently DHCP relay adds an extra next-hop to an already existing route (if any). Instead
it must replace it with the new one.
This patch adds replaceRoute method to the RouteStore interface and corresponding implementations.
The DHCP relay implementation uses the new method instead of updateRoute
Change-Id: I601613168b83290db4e53d2aae5c86e963ae17b0
diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/store/LocalRouteStore.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/store/LocalRouteStore.java
index 7884783..04b0f38 100644
--- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/store/LocalRouteStore.java
+++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/store/LocalRouteStore.java
@@ -87,6 +87,11 @@
}
@Override
+ public void replaceRoute(Route route) {
+ getDefaultRouteTable(route).replace(route);
+ }
+
+ @Override
public Set<RouteTableId> getRouteTables() {
return routeTables.keySet();
}
@@ -175,6 +180,13 @@
}
/**
+ * Replace the route in the route table.
+ */
+ public void replace(Route route) {
+ update(route);
+ }
+
+ /**
* Returns the routes pointing to a particular next hop.
*
* @param ip next hop IP address