Move multicast CLI commands into the core with the core mcast system.
Change-Id: If442803cf530cfeb949e7fbce34f74db082f30c1
diff --git a/cli/src/main/java/org/onosproject/cli/net/McastDeleteCommand.java b/cli/src/main/java/org/onosproject/cli/net/McastDeleteCommand.java
new file mode 100644
index 0000000..53c4888
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/McastDeleteCommand.java
@@ -0,0 +1,66 @@
+/*
+ * 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.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;
+
+/**
+ * Deletes a multicast route.
+ */
+@Command(scope = "onos", name = "mcast-delete",
+ description = "Delete a multicast route flow")
+public class McastDeleteCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "sAddr",
+ description = "IP Address of the multicast source. '*' can be used for any source (*, G) entry",
+ required = true, multiValued = false)
+ String sAddr = null;
+
+ @Argument(index = 1, name = "gAddr",
+ description = "IP Address of the multicast group",
+ required = true, multiValued = false)
+ String gAddr = null;
+
+ @Argument(index = 2, name = "egressList",
+ description = "Egress id/port",
+ required = false, multiValued = true)
+ String[] egressList = null;
+
+
+ @Override
+ protected void execute() {
+ MulticastRouteService mcastRouteManager = get(MulticastRouteService.class);
+
+ McastRoute mRoute = new McastRoute(IpAddress.valueOf(sAddr),
+ IpAddress.valueOf(gAddr), McastRoute.Type.STATIC);
+
+ if (egressList == null) {
+ mcastRouteManager.remove(mRoute);
+ } else {
+ // check list for validity before we begin to delete.
+ for (String egress : egressList) {
+ ConnectPoint eCp = ConnectPoint.deviceConnectPoint(egress);
+ mcastRouteManager.removeSink(mRoute, eCp);
+ }
+ }
+ }
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/McastJoinCommand.java b/cli/src/main/java/org/onosproject/cli/net/McastJoinCommand.java
new file mode 100644
index 0000000..55050ed
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/McastJoinCommand.java
@@ -0,0 +1,77 @@
+/*
+ * 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.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;
+
+/**
+ * Installs a source, multicast group flow.
+ */
+@Command(scope = "onos", name = "mcast-join",
+ description = "Installs a source, multicast group flow")
+public class McastJoinCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "sAddr",
+ description = "IP Address of the multicast source. '*' can be used for any source (*, G) entry",
+ required = true, multiValued = false)
+ String sAddr = null;
+
+ @Argument(index = 1, name = "gAddr",
+ description = "IP Address of the multicast group",
+ required = true, multiValued = false)
+ String gAddr = null;
+
+ @Argument(index = 2, name = "ingressPort",
+ description = "Ingress port of:XXXXXXXXXX/XX",
+ required = false, multiValued = false)
+ String ingressPort = null;
+
+ @Argument(index = 3, name = "ports",
+ description = "Egress ports of:XXXXXXXXXX/XX...",
+ required = false, multiValued = true)
+ String[] ports = null;
+
+ @Override
+ protected void execute() {
+ MulticastRouteService mcastRouteManager = get(MulticastRouteService.class);
+
+ //McastRoute mRoute = McastForwarding.createStaticRoute(sAddr, gAddr);
+ McastRoute mRoute = new McastRoute(IpAddress.valueOf(sAddr),
+ IpAddress.valueOf(gAddr), McastRoute.Type.STATIC);
+ mcastRouteManager.add(mRoute);
+
+ if (ingressPort != null) {
+ ConnectPoint ingress = ConnectPoint.deviceConnectPoint(ingressPort);
+ mcastRouteManager.addSource(mRoute, ingress);
+ }
+
+ if (ports != null) {
+ for (String egCP : ports) {
+ log.debug("Egress port provided: " + egCP);
+ ConnectPoint egress = ConnectPoint.deviceConnectPoint(egCP);
+ mcastRouteManager.addSink(mRoute, egress);
+
+ }
+ }
+ print("Added the mcast route: %s", mRoute);
+ }
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java b/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java
new file mode 100644
index 0000000..2b9a56a
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/McastShowCommand.java
@@ -0,0 +1,48 @@
+/*
+ * 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.net.ConnectPoint;
+import org.onosproject.net.mcast.McastRoute;
+import org.onosproject.net.mcast.MulticastRouteService;
+
+import java.util.Set;
+
+/**
+ * Displays the source, multicast group flows entries.
+ */
+@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";
+
+ @Override
+ protected void execute() {
+ MulticastRouteService mcastService = get(MulticastRouteService.class);
+
+ 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);
+ }
+ }
+
+}
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 2c75eff..6d5b839 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -93,6 +93,16 @@
</command>
<command>
+ <action class="org.onosproject.cli.net.McastShowCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.McastJoinCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.McastDeleteCommand"/>
+ </command>
+
+ <command>
<action class="org.onosproject.cli.net.DriversListCommand"/>
<completers>
<ref component-id="driverNameCompleter"/>