commit c0e3feaeaa49ec8299e45475e6283e81f4a48da7
author Rusty Eddy <rusty@rustyeddy.com> Mon Sep 28 21:20:41 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Mon Oct 05 17:46:24 2015 +0000
tree a9150d3dce8bc918fdc3bf86afb25c8c335fc342
parent ed0951fc64a35327d95c279c24c5549d73afb707

Added a CODEC for the MRIB to be used by CLI and REST API

Change-Id: Ia57c2862a642f037b2098c4d143822b2d199bc07

apps/mfwd/src/main/java/org/onosproject/mfwd/cli/McastShowCommand.java

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());