Route CLI improvements and bug fixes
Change-Id: I4b4547f578cc053dc150066dadb68b6b2cbb82ee
diff --git a/cli/src/main/java/org/onosproject/cli/net/NextHopsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/NextHopsListCommand.java
new file mode 100644
index 0000000..8d91130
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/NextHopsListCommand.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.cli.net;
+
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.incubator.net.routing.NextHop;
+import org.onosproject.incubator.net.routing.Route;
+import org.onosproject.incubator.net.routing.RouteService;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * Command to show information about routing next hops.
+ */
+@Command(scope = "onos", name = "next-hops",
+ description = "Lists all next hops in the route store")
+public class NextHopsListCommand extends AbstractShellCommand {
+
+ private static final String FORMAT_HEADER =
+ " Network Next Hop";
+ private static final String FORMAT_ROUTE =
+ " %-18s %-15s";
+
+ private static final String FORMAT_TABLE = "Table: %s";
+ private static final String FORMAT_TOTAL = " Total: %d";
+
+ private static final String FORMAT = "ip=%s, mac=%s, numRoutes=%s";
+
+ @Override
+ protected void execute() {
+ RouteService service = AbstractShellCommand.get(RouteService.class);
+
+ Set<NextHop> nextHops = service.getNextHops();
+
+ nextHops.forEach(nextHop -> {
+ Collection<Route> routes = service.getRoutesForNextHop(nextHop.ip());
+ print(FORMAT, nextHop.ip(), nextHop.mac(), routes.size());
+ });
+
+ }
+
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/RouteRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/RouteRemoveCommand.java
index d8adb61..4992d77 100644
--- a/cli/src/main/java/org/onosproject/cli/net/RouteRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/RouteRemoveCommand.java
@@ -18,6 +18,7 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.Route;
@@ -36,13 +37,18 @@
required = true)
String prefixString = null;
+ @Argument(index = 1, name = "prefix", description = "Next hop IP address",
+ required = true)
+ String nextHopString = null;
+
@Override
protected void execute() {
RouteAdminService service = AbstractShellCommand.get(RouteAdminService.class);
IpPrefix prefix = IpPrefix.valueOf(prefixString);
+ IpAddress nextHop = IpAddress.valueOf(nextHopString);
- service.withdraw(Collections.singleton(new Route(Route.Source.STATIC, prefix, null)));
+ service.withdraw(Collections.singleton(new Route(Route.Source.STATIC, prefix, nextHop)));
}
}
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index cee8561..c92a5cf 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -505,6 +505,9 @@
<command>
<action class="org.onosproject.cli.net.RouteRemoveCommand"/>
</command>
+ <command>
+ <action class="org.onosproject.cli.net.NextHopsListCommand"/>
+ </command>
<command>
<action class="org.onosproject.cli.net.GlobalLabelCommand"/>
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/NextHop.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/NextHop.java
new file mode 100644
index 0000000..418b02f
--- /dev/null
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/NextHop.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.incubator.net.routing;
+
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
+
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+/**
+ * Describes a routing next hop.
+ */
+public class NextHop {
+
+ private final IpAddress ip;
+ private final MacAddress mac;
+
+ /**
+ * Creates a new next hop.
+ *
+ * @param ip IP address
+ * @param mac MAC address
+ */
+ public NextHop(IpAddress ip, MacAddress mac) {
+ this.ip = ip;
+ this.mac = mac;
+ }
+
+ /**
+ * Returns the IP address of the next hop.
+ *
+ * @return IP address
+ */
+ public IpAddress ip() {
+ return ip;
+ }
+
+ /**
+ * Returns the MAC address of the next hop.
+ *
+ * @return MAC address
+ */
+ public MacAddress mac() {
+ return mac;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(ip, mac);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (!(other instanceof NextHop)) {
+ return false;
+ }
+
+ NextHop that = (NextHop) other;
+
+ return Objects.equals(this.ip, that.mac) &&
+ Objects.equals(this.ip, that.mac);
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("ip", ip)
+ .add("mac", mac)
+ .toString();
+ }
+}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/ResolvedRoute.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/ResolvedRoute.java
index e473530..7a47ead 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/ResolvedRoute.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/ResolvedRoute.java
@@ -20,6 +20,8 @@
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
+import static com.google.common.base.MoreObjects.toStringHelper;
+
/**
* Represents a route with the next hop MAC address resolved.
*/
@@ -80,4 +82,13 @@
public MacAddress nextHopMac() {
return nextHopMac;
}
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("prefix", prefix)
+ .add("nextHop", nextHop)
+ .add("nextHopMac", nextHopMac)
+ .toString();
+ }
}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/Route.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/Route.java
index c1cccc3..0ae4952 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/Route.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/Route.java
@@ -21,6 +21,7 @@
import java.util.Objects;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -70,7 +71,8 @@
*/
public Route(Source source, IpPrefix prefix, IpAddress nextHop) {
checkNotNull(prefix);
- checkArgument(nextHop == null || prefix.version().equals(nextHop.version()), VERSION_MISMATCH);
+ checkNotNull(nextHop);
+ checkArgument(prefix.version().equals(nextHop.version()), VERSION_MISMATCH);
this.source = checkNotNull(source);
this.prefix = prefix;
@@ -124,4 +126,12 @@
return Objects.equals(this.prefix, that.prefix) &&
Objects.equals(this.nextHop, that.nextHop);
}
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("prefix", prefix)
+ .add("nextHop", nextHop)
+ .toString();
+ }
}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
index bab595a..4fd99d4 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
@@ -21,6 +21,7 @@
import java.util.Collection;
import java.util.Map;
+import java.util.Set;
/**
* Unicast IP route service.
@@ -44,4 +45,19 @@
*/
Route longestPrefixMatch(IpAddress ip);
+ /**
+ * Returns the routes for the given next hop.
+ *
+ * @param nextHop next hop IP address
+ * @return routes for this next hop
+ */
+ Collection<Route> getRoutesForNextHop(IpAddress nextHop);
+
+ /**
+ * Returns all next hops in the route store.
+ *
+ * @return set of next hops
+ */
+ Set<NextHop> getNextHops();
+
}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStore.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStore.java
index 132afd4..9b75099 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStore.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStore.java
@@ -21,6 +21,7 @@
import org.onosproject.store.Store;
import java.util.Collection;
+import java.util.Map;
import java.util.Set;
/**
@@ -66,6 +67,14 @@
Route longestPrefixMatch(IpAddress ip);
/**
+ * Returns the routes that point to the given next hop IP address.
+ *
+ * @param ip IP address of the next hop
+ * @return routes for the given next hop
+ */
+ Collection<Route> getRoutesForNextHop(IpAddress ip);
+
+ /**
* Updates a next hop IP and MAC in the store.
*
* @param ip IP address
@@ -88,4 +97,11 @@
* @return MAC address
*/
MacAddress getNextHop(IpAddress ip);
+
+ /**
+ * Returns all next hops in the route store.
+ *
+ * @return next hops
+ */
+ Map<IpAddress, MacAddress> getNextHops();
}
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
index 8833c95..4957dad 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
@@ -25,6 +25,7 @@
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onosproject.event.ListenerService;
+import org.onosproject.incubator.net.routing.NextHop;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
@@ -146,6 +147,7 @@
* @param event event
*/
private void post(RouteEvent event) {
+ log.debug("Sending event {}", event);
synchronized (this) {
listeners.values().forEach(l -> l.post(event));
}
@@ -165,9 +167,22 @@
}
@Override
+ public Collection<Route> getRoutesForNextHop(IpAddress nextHop) {
+ return routeStore.getRoutesForNextHop(nextHop);
+ }
+
+ @Override
+ public Set<NextHop> getNextHops() {
+ return routeStore.getNextHops().entrySet().stream()
+ .map(entry -> new NextHop(entry.getKey(), entry.getValue()))
+ .collect(Collectors.toSet());
+ }
+
+ @Override
public void update(Collection<Route> routes) {
synchronized (this) {
routes.forEach(route -> {
+ log.debug("Received update {}", route);
routeStore.updateRoute(route);
resolve(route);
});
@@ -177,7 +192,10 @@
@Override
public void withdraw(Collection<Route> routes) {
synchronized (this) {
- routes.forEach(route -> routeStore.removeRoute(route));
+ routes.forEach(route -> {
+ log.debug("Received withdraw {}", routes);
+ routeStore.removeRoute(route);
+ });
}
}
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/LocalRouteStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/LocalRouteStore.java
index e5e807e..98d008a 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/LocalRouteStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/LocalRouteStore.java
@@ -17,8 +17,10 @@
package org.onosproject.incubator.store.routing.impl;
import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
+import com.googlecode.concurrenttrees.common.KeyValuePair;
import com.googlecode.concurrenttrees.radix.node.concrete.DefaultByteArrayNodeFactory;
import com.googlecode.concurrenttrees.radixinverted.ConcurrentInvertedRadixTree;
import com.googlecode.concurrenttrees.radixinverted.InvertedRadixTree;
@@ -35,10 +37,14 @@
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.store.AbstractStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -51,6 +57,8 @@
public class LocalRouteStore extends AbstractStore<RouteEvent, RouteStoreDelegate>
implements RouteStore {
+ private Logger log = LoggerFactory.getLogger(getClass());
+
private Map<RouteTableId, RouteTable> routeTables;
private static final RouteTableId IPV4 = new RouteTableId("ipv4");
private static final RouteTableId IPV6 = new RouteTableId("ipv6");
@@ -74,7 +82,9 @@
public void removeRoute(Route route) {
RouteTable table = getDefaultRouteTable(route);
table.remove(route);
- if (table.getRoutesForNextHop(route.nextHop()).isEmpty()) {
+ Collection<Route> routes = table.getRoutesForNextHop(route.nextHop());
+
+ if (routes.isEmpty()) {
nextHops.remove(route.nextHop());
}
}
@@ -99,8 +109,14 @@
}
@Override
+ public Collection<Route> getRoutesForNextHop(IpAddress ip) {
+ return getDefaultRouteTable(ip).getRoutesForNextHop(ip);
+ }
+
+ @Override
public void updateNextHop(IpAddress ip, MacAddress mac) {
Collection<Route> routes = getDefaultRouteTable(ip).getRoutesForNextHop(ip);
+
if (!routes.isEmpty() && !mac.equals(nextHops.get(ip))) {
nextHops.put(ip, mac);
@@ -125,6 +141,11 @@
return nextHops.get(ip);
}
+ @Override
+ public Map<IpAddress, MacAddress> getNextHops() {
+ return ImmutableMap.copyOf(nextHops);
+ }
+
private RouteTable getDefaultRouteTable(Route route) {
return getDefaultRouteTable(route.prefix().address());
}
@@ -179,14 +200,27 @@
routeTable.put(createBinaryString(route.prefix()), route);
// TODO manage routes from multiple providers
- reverseIndex.remove(route.nextHop(), oldRoute);
+
reverseIndex.put(route.nextHop(), route);
+ if (oldRoute != null) {
+ reverseIndex.remove(oldRoute.nextHop(), oldRoute);
+
+ if (reverseIndex.get(oldRoute.nextHop()).isEmpty()) {
+ nextHops.remove(oldRoute.nextHop());
+ }
+ }
+
if (oldRoute != null && !oldRoute.nextHop().equals(route.nextHop())) {
// Remove old route because new one is different
// TODO ROUTE_UPDATED?
notifyDelegate(new RouteEvent(RouteEvent.Type.ROUTE_REMOVED, new ResolvedRoute(oldRoute, null)));
}
+
+ MacAddress nextHopMac = nextHops.get(route.nextHop());
+ if (nextHopMac != null) {
+ notifyDelegate(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED, new ResolvedRoute(route, nextHopMac)));
+ }
}
}
@@ -199,9 +233,9 @@
synchronized (this) {
Route removed = routes.remove(route.prefix());
routeTable.remove(createBinaryString(route.prefix()));
- reverseIndex.remove(route.nextHop(), route);
if (removed != null) {
+ reverseIndex.remove(removed.nextHop(), removed);
notifyDelegate(new RouteEvent(RouteEvent.Type.ROUTE_REMOVED, new ResolvedRoute(route, null)));
}
}
@@ -223,7 +257,17 @@
* @return all routes
*/
public Collection<Route> getRoutes() {
- return routes.values();
+ Iterator<KeyValuePair<Route>> it =
+ routeTable.getKeyValuePairsForKeysStartingWith("").iterator();
+
+ List<Route> routes = new LinkedList<>();
+
+ while (it.hasNext()) {
+ KeyValuePair<Route> entry = it.next();
+ routes.add(entry.getValue());
+ }
+
+ return routes;
}
/**