commit ddef8937fff0122a895f1bd23765f846cc1f7f72
author Rusty Eddy <rusty@rustyeddy.com> Fri Sep 25 01:15:53 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 25 21:55:04 2015 +0000
tree c1abbf7427f81d670cb5931a7b2d11d7b4960804
parent d4db3abe8d8ab010d711bec409b2356278524648

Added McastConnectPoint to track membership source
for egress ConnectPoints by STATIC config, PIM and
IGMP.

Change-Id: Ia913ee697e0cae32dd74db508e5ea2cba0d47c45

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

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 5172691..3ce2925 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
@@ -20,6 +20,7 @@
 import org.onlab.packet.IpPrefix;

 import org.onosproject.cli.AbstractShellCommand;

 

+import org.onosproject.mfwd.impl.McastConnectPoint;

 import org.onosproject.mfwd.impl.McastRouteBase;

 import org.onosproject.mfwd.impl.McastRouteTable;

 

@@ -76,21 +77,13 @@
         if (ingressPort != null) {

             String inCP = ingressPort;

             log.debug("Ingress port provided: " + inCP);

-            String [] cp = inCP.split("/");

-            mr.addIngressPoint(cp[0], Long.parseLong(cp[1]));

-        } else {

-            return;

-        }

-

-        if (ports == null) {

-            return;

+            mr.addIngressPoint(inCP);

         }

 

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

+            mr.addEgressPoint(egCP, McastConnectPoint.JoinSource.STATIC);

         }

         print("Added the mcast route");

     }