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"/>