Refactored Mfwd to use new mcastroutemanager
Change-Id: I7aca7f118221ed505aeb7fcace0ef9dccb468a34
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 c794c80..5ef4dce 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
@@ -15,10 +15,15 @@
*/
package org.onosproject.mfwd.cli;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
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;
+import org.onosproject.mfwd.impl.McastForwarding;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.mcast.McastRoute;
+import org.onosproject.net.mcast.MulticastRouteService;
/**
* Deletes a multicast route.
@@ -27,6 +32,9 @@
description = "Delete a multicast route flow")
public class McastDeleteCommand extends AbstractShellCommand {
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ MulticastRouteService mcastRouteManager = AbstractShellCommand.get(MulticastRouteService.class);
+
@Argument(index = 0, name = "sAddr",
description = "IP Address of the multicast source. '*' can be used for any source (*, G) entry",
required = true, multiValued = false)
@@ -46,23 +54,16 @@
@Override
protected void execute() {
- boolean deleted = false;
- McastRouteTable mrib = McastRouteTable.getInstance();
+ McastRoute mRoute = McastForwarding.createStaticRoute(sAddr, gAddr);
if (egressList == null) {
- mrib.removeRoute(sAddr, gAddr);
- deleted = true;
+ mcastRouteManager.remove(mRoute);
} else {
// check list for validity before we begin to delete.
for (String egress : egressList) {
- deleted = mrib.removeEgress(sAddr, gAddr, egress);
+ ConnectPoint eCp = ConnectPoint.deviceConnectPoint(egress);
+ mcastRouteManager.removeSink(mRoute, eCp);
}
}
-
- if (deleted) {
- print("Successful delete");
- } else {
- print("Failed to delete");
- }
}
}
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 7260fde..3f22e7a 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
@@ -15,13 +15,15 @@
*/
package org.onosproject.mfwd.cli;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
-
-import org.onosproject.mfwd.impl.McastConnectPoint;
-import org.onosproject.mfwd.impl.McastRouteBase;
-import org.onosproject.mfwd.impl.McastRouteTable;
+import org.onosproject.mfwd.impl.McastForwarding;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.mcast.McastRoute;
+import org.onosproject.net.mcast.MulticastRouteService;
/**
* Installs a source, multicast group flow.
@@ -30,6 +32,9 @@
description = "Installs a source, multicast group flow")
public class McastJoinCommand extends AbstractShellCommand {
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ MulticastRouteService mcastRouteManager = AbstractShellCommand.get(MulticastRouteService.class);
+
@Argument(index = 0, name = "sAddr",
description = "IP Address of the multicast source. '*' can be used for any source (*, G) entry",
required = true, multiValued = false)
@@ -41,31 +46,29 @@
String gAddr = null;
@Argument(index = 2, name = "ingressPort",
- description = "Ingress port and Egress ports",
+ description = "Ingress port of:XXXXXXXXXX/XX",
required = false, multiValued = false)
String ingressPort = null;
@Argument(index = 3, name = "ports",
- description = "Ingress port and Egress ports",
+ description = "Egress ports of:XXXXXXXXXX/XX...",
required = false, multiValued = true)
String[] ports = null;
@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);
- mr.addIngressPoint(inCP);
- }
+ McastRoute mRoute = McastForwarding.createStaticRoute(sAddr, gAddr);
+ mcastRouteManager.add(mRoute);
- for (int i = 0; i < ports.length; i++) {
- String egCP = ports[i];
+ ConnectPoint ingress = ConnectPoint.deviceConnectPoint(ingressPort);
+ mcastRouteManager.addSource(mRoute, ingress);
+
+ for (String egCP : ports) {
log.debug("Egress port provided: " + egCP);
- mr.addEgressPoint(egCP, McastConnectPoint.JoinSource.STATIC);
+ ConnectPoint egress = ConnectPoint.deviceConnectPoint(egCP);
+ mcastRouteManager.addSink(mRoute, egress);
+
}
print("Added the mcast route");
}
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 7fa3a13..1d3f850 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
@@ -15,15 +15,13 @@
*/
package org.onosproject.mfwd.cli;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.karaf.shell.commands.Command;
-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.onosproject.net.mcast.MulticastRouteService;
import org.slf4j.Logger;
import static org.slf4j.LoggerFactory.getLogger;
@@ -33,30 +31,15 @@
@Command(scope = "onos", name = "mcast-show", description = "Displays the source, multicast group flows")
public class McastShowCommand extends AbstractShellCommand {
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ MulticastRouteService mcastRouteManager = AbstractShellCommand.get(MulticastRouteService.class);
+
private final Logger log = getLogger(getClass());
private static final String MCAST_GROUP = "mcastgroup";
@Override
protected void execute() {
- McastRouteTable mrt = McastRouteTable.getInstance();
- if (outputJson()) {
- print("%s", json(mrt));
- } else {
- printMrib4(mrt);
- }
+ //TODO
}
- public JsonNode json(McastRouteTable mrt) {
- ObjectNode pushContent = new MRibCodec().encode(mrt , this);
- return pushContent;
- }
-
- /**
- * Displays multicast route table entries.
- *
- * @param mrt Mutlicast Route Table
- */
- protected void printMrib4(McastRouteTable mrt) {
- print(mrt.printMcastRouteTable());
- }
}