Added mcast join command and mcast-show --json
Change-Id: I0c89b9f0af076b4f35671d8fe5e86b500941815e
diff --git a/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java b/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
index 7016c58..5c78cbd 100644
--- a/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
+++ b/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
@@ -15,13 +15,13 @@
*/
package org.onosproject.mfwd.cli;
-//import org.onosproject.mfwd.impl.McastRouteTable;
-//import org.onosproject.mfwd.impl.McastRouteGroup;
-//import org.onosproject.mfwd.impl.McastRouteSource;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.mfwd.impl.McastRouteBase;
+import org.onosproject.mfwd.impl.McastRouteTable;
+
/**
* Installs a source, multicast group flow.
*/
@@ -29,31 +29,45 @@
description = "Installs a source, multicast group flow")
public class McastJoinCommand extends AbstractShellCommand {
- @Argument(index = 0, name = "sourceIp",
+ @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;
+ String sAddr = null;
- @Argument(index = 1, name = "multicastIp",
+ @Argument(index = 1, name = "gAddr",
description = "IP Address of the multicast group",
required = true, multiValued = false)
- String maddr = null;
+ String gAddr = null;
- @Argument(index = 3, name = "ingressPort",
- description = "Ingress ports",
+ @Argument(index = 2, name = "ingressPort",
+ description = "Ingress port and Egress ports",
required = false, multiValued = false)
- String[] ingressPorts = null;
+ String ingressPort = null;
- @Argument(index = 4, name = "egressPorts",
- description = "Egress ports",
+ @Argument(index = 3, name = "ports",
+ description = "Ingress port and Egress ports",
required = false, multiValued = true)
- String[] egressPorts = null;
+ String[] ports = null;
- /**
- * All static multicast joins.
- * TODO: Make this function work!
- */
@Override
protected void execute() {
+ McastRouteTable mrib = McastRouteTable.getInstance();
+ McastRouteBase mr = mrib.addRoute(sAddr, gAddr);
+
+ // Port format "of:0000000000000023/4"
+ if (ingressPort != null) {
+ String inCP = ingressPort;
+ log.debug("Ingress port provided: " + inCP);
+ String [] cp = inCP.split("/");
+ mr.addIngressPoint(cp[0], Long.parseLong(cp[1]));
+ }
+
+ for (int i = 0; i < ports.length; i++) {
+ String egCP = ports[i];
+ log.debug("Egress port provided: " + egCP);
+ String [] cp = egCP.split("/");
+ mr.addEgressPoint(cp[0], Long.parseLong(cp[1]));
+ }
+ print("Added the mcast route");
}
}
diff --git a/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java b/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
index cc7db29..9359205 100644
--- a/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
+++ b/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
@@ -17,10 +17,21 @@
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onlab.packet.IpPrefix;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
import org.onosproject.mfwd.impl.McastRouteTable;
+import org.onosproject.mfwd.impl.McastRouteGroup;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
import static org.slf4j.LoggerFactory.getLogger;
-import org.slf4j.Logger;
/**
* Displays the source, multicast group flows entries.
@@ -29,16 +40,57 @@
public class McastShowCommand extends AbstractShellCommand {
private final Logger log = getLogger(getClass());
- private static final String FMT = "(%s, %s) ingress=%s, egress=%s";
@Override
protected void execute() {
McastRouteTable mrt = McastRouteTable.getInstance();
if (outputJson()) {
- log.error("Not implemented yet");
+ print("%s", json(mrt));
} else {
- print(mrt.printMcastRouteTable());
+ printMrib4(mrt);
}
}
-}
+ public JsonNode json(McastRouteTable mrt) {
+ ObjectMapper mapper = new ObjectMapper();
+ ArrayNode result = mapper.createArrayNode();
+ Map<IpPrefix, McastRouteGroup> mrib4 = mrt.getMrib4();
+ for (McastRouteGroup mg : mrib4.values()) {
+ String sAddr = "";
+ String gAddr = "";
+ String inPort = "";
+ String outPorts = "";
+ if (mg.getSaddr() != null) {
+ sAddr = mg.getSaddr().toString();
+ log.info("Multicast Source: " + sAddr);
+ }
+ if (mg.getGaddr() != null) {
+ gAddr = mg.getGaddr().toString();
+ log.info("Multicast Group: " + gAddr);
+ }
+ if (mg.getIngressPoint() != null) {
+ inPort = mg.getIngressPoint().toString();
+ log.info("Multicast Ingress: " + inPort);
+ }
+ Set<ConnectPoint> eps = mg.getEgressPoints();
+ if (eps != null && !eps.isEmpty()) {
+ outPorts = eps.toString();
+ }
+ result.add(mapper.createObjectNode()
+ .put("src", sAddr)
+ .put("grp", gAddr)
+ .put("inPort", inPort)
+ .put("outPorts", outPorts));
+ }
+ return result;
+ }
+
+ /**
+ * Displays multicast route table entries.
+ *
+ * @param mrt
+ */
+ protected void printMrib4(McastRouteTable mrt) {
+ print(mrt.printMcastRouteTable());
+ }
+}
diff --git a/mfwd/src/main/java/org/onosproject/mfwd/impl/McastForwarding.java b/mfwd/src/main/java/org/onosproject/mfwd/impl/McastForwarding.java
index 3898577..69b4dbd 100644
--- a/mfwd/src/main/java/org/onosproject/mfwd/impl/McastForwarding.java
+++ b/mfwd/src/main/java/org/onosproject/mfwd/impl/McastForwarding.java
@@ -79,7 +79,6 @@
//packetService.requestPackets(selector.build(), PacketPriority.REACTIVE, appId);
mrib = McastRouteTable.getInstance();
- mrib.addStaticRoutes();
log.info("Started");
}
diff --git a/mfwd/src/main/java/org/onosproject/mfwd/impl/McastRouteTable.java b/mfwd/src/main/java/org/onosproject/mfwd/impl/McastRouteTable.java
index 6837ebb..9ef7f7a 100644
--- a/mfwd/src/main/java/org/onosproject/mfwd/impl/McastRouteTable.java
+++ b/mfwd/src/main/java/org/onosproject/mfwd/impl/McastRouteTable.java
@@ -253,22 +253,6 @@
}
/**
- * Temporary method to add routes to the mfwd module to test data flow.
- *
- * TODO: this function will be removed after we get the cli working.
- */
- public void addStaticRoutes() {
-
- // Hard code group interest for a couple different groups and some receive points.
- // XXX this will go away as soon as the mcast-join cli command has been added
- McastRouteBase s1 = this.addRoute("10.1.1.1/32", "225.1.1.1/32");
- s1.addIngressPoint("of:0000000000000001", 1);
- s1.addEgressPoint("of:000000000000002", 1);
- s1.addEgressPoint("of:000000000000003", 1);
- s1.addEgressPoint("of:000000000000004", 1);
- }
-
- /**
* Print out the multicast route table in it's entirety.
*
* TODO: Eventually we will have to implement paging and how to handle large tables.
@@ -286,7 +270,6 @@
return out;
}
-
/**
* Print out a summary of groups in the MRIB.
*