[CORD-2486] Improve Mcast CLI APIs
It adds following commands:
- sr-mcast-tree which shows the mapping group-tree
- sr-mcast-next which shows the mapping device-next
- mcast-routes which is similar to the unicast command (routes)
It improve following commands:
- mcast-join adds completer and improves output
- mcast-delete adds completer and improves output
- mcast-show improves output and adds completer
Change-Id: I4e273ac23b05142026b6b77317b0c9b7af76c3ec
diff --git a/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java b/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java
index cae0bd5..91ab0c4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java
@@ -15,13 +15,19 @@
*/
package org.onosproject.cli.net;
+import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.mcast.McastRoute;
import org.onosproject.net.mcast.MulticastRouteService;
+import java.util.Comparator;
import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
/**
* Displays the source, multicast group flows entries.
@@ -29,20 +35,61 @@
@Command(scope = "onos", name = "mcast-show", description = "Displays the source, multicast group flows")
public class McastShowCommand extends AbstractShellCommand {
- private static final String FORMAT = "route=%s, source=%s, sinks=%s";
+ // Format for group line
+ private static final String FORMAT_MAPPING = "origin=%s, group=%s, source=%s, sinks=%s";
+
+ @Argument(index = 0, name = "mcastIp", description = "mcast Ip",
+ required = false, multiValued = false)
+ String mcastIp;
@Override
protected void execute() {
+ // Get the service
MulticastRouteService mcastService = get(MulticastRouteService.class);
-
+ // Get the routes
Set<McastRoute> routes = mcastService.getRoutes();
-
- for (McastRoute route : routes) {
- Set<ConnectPoint> sinks = mcastService.fetchSinks(route);
- ConnectPoint source = mcastService.fetchSource(route);
-
- print(FORMAT, route, source, sinks);
+ // Verify mcast group
+ if (!isNullOrEmpty(mcastIp)) {
+ // Let's find the group
+ IpAddress mcastGroup = IpAddress.valueOf(mcastIp);
+ McastRoute mcastRoute = routes.stream()
+ .filter(route -> route.group().equals(mcastGroup))
+ .findAny().orElse(null);
+ // If it exists
+ if (mcastRoute != null) {
+ // Get the sinks and print info
+ Set<ConnectPoint> sinks = mcastService.fetchSinks(mcastRoute);
+ print(FORMAT_MAPPING, mcastRoute.type(), mcastRoute.group(),
+ mcastRoute.source(), sinks);
+ }
+ return;
}
+ // Filter ipv4
+ Set<McastRoute> ipv4Routes = routes.stream()
+ .filter(mcastRoute -> mcastRoute.group().isIp4())
+ .collect(Collectors.toSet());
+ // Print ipv4 first
+ ipv4Routes.stream()
+ .sorted(Comparator.comparing(McastRoute::group))
+ .forEach(route -> {
+ // Get sinks
+ Set<ConnectPoint> sinks = mcastService.fetchSinks(route);
+ print(FORMAT_MAPPING, route.type(), route.group(),
+ route.source(), sinks);
+ });
+ // Filter ipv6
+ Set<McastRoute> ipv6Routes = routes.stream()
+ .filter(mcastRoute -> mcastRoute.group().isIp6())
+ .collect(Collectors.toSet());
+ // Then print ipv6
+ ipv6Routes.stream()
+ .sorted(Comparator.comparing(McastRoute::group))
+ .forEach(route -> {
+ // Get sinks
+ Set<ConnectPoint> sinks = mcastService.fetchSinks(route);
+ print(FORMAT_MAPPING, route.type(), route.group(),
+ route.source(), sinks);
+ });
}
}