Added a CODEC for the MRIB to be used by CLI and REST API
Change-Id: Ia57c2862a642f037b2098c4d143822b2d199bc07
diff --git a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastDeleteCommand.java b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastDeleteCommand.java
index ded5a1a..ae5d9e9 100644
--- a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastDeleteCommand.java
+++ b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastDeleteCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2015 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.
@@ -18,11 +18,10 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
-
import org.onosproject.mfwd.impl.McastRouteTable;
/**
- * Delete a multicast route.
+ * Deletes a multicast route.
*/
@Command(scope = "onos", name = "mcast-delete",
description = "Delete a multicast route flow")
@@ -43,5 +42,4 @@
McastRouteTable mrib = McastRouteTable.getInstance();
mrib.removeRoute(sAddr, gAddr);
}
-}
-
+}
\ No newline at end of file
diff --git a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
index 3ce2925..7260fde 100644
--- a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
+++ b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastJoinCommand.java
@@ -17,7 +17,6 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.packet.IpPrefix;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mfwd.impl.McastConnectPoint;
@@ -54,24 +53,7 @@
@Override
protected void execute() {
McastRouteTable mrib = McastRouteTable.getInstance();
- IpPrefix mcast = IpPrefix.valueOf("224.0.0.0/4");
- IpPrefix saddr = IpPrefix.valueOf(sAddr);
- if (mcast.contains(saddr)) {
- print("Error: the source address " + sAddr + " must be an IPv4 unicast address");
- return;
- }
-
- IpPrefix gaddr = IpPrefix.valueOf(gAddr);
- if (!mcast.contains(gaddr)) {
- print("Error: " + gAddr + " must be a multicast group address");
- return;
- }
-
McastRouteBase mr = mrib.addRoute(sAddr, gAddr);
- if (mr == null) {
- print("Error: unable to save the multicast state");
- return;
- }
// Port format "of:0000000000000023/4"
if (ingressPort != null) {
diff --git a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
index 215ee84..7fa3a13 100644
--- a/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
+++ b/apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java
@@ -16,21 +16,15 @@
package org.onosproject.mfwd.cli;
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 com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.mfwd.impl.McastRouteTable;
+import org.onosproject.mfwd.impl.MRibCodec;
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;
/**
@@ -40,6 +34,7 @@
public class McastShowCommand extends AbstractShellCommand {
private final Logger log = getLogger(getClass());
+ private static final String MCAST_GROUP = "mcastgroup";
@Override
protected void execute() {
@@ -52,43 +47,14 @@
}
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.getEgressConnectPoints();
- 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;
+ ObjectNode pushContent = new MRibCodec().encode(mrt , this);
+ return pushContent;
}
/**
* Displays multicast route table entries.
*
- * @param mrt route table
+ * @param mrt Mutlicast Route Table
*/
protected void printMrib4(McastRouteTable mrt) {
print(mrt.printMcastRouteTable());