commit 7db72fc561b94a09508208ddd7bc0ba45c5b48f9
author Andrea Campanella <andrea@opennetworking.org> Wed Jan 24 15:14:03 2018 +0100
committer Andrea Campanella <andrea@opennetworking.org> Thu Jan 25 12:54:45 2018 +0000
tree c744ae339c246769fa9e7fa10820971ca4bdf244
parent 7d3cf65792b19957efc597bb34981dc379ffeb63

T3: Support for Ipv6 in CLI command

Change-Id: I88ca31e60ff5fb0b61206cd13cd62ecaf24fa876
(cherry picked from commit 06d98abf51f9c40c39fd26c20f81e50601f78a73)

src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java

diff --git a/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java b/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
index a42872a..fdeb944 100644
--- a/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
+++ b/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
@@ -18,7 +18,6 @@
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.onlab.packet.EthType;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.TpPort;
@@ -34,6 +33,8 @@
 
 import java.util.List;
 
+import static org.onlab.packet.EthType.EtherType;
+
 /**
  * Starts a Static Packet Trace for a given input and prints the result.
  */
@@ -71,8 +72,8 @@
     @Option(name = "-stp", aliases = "--srcTcpPort", description = "Source TCP Port")
     String srcTcpPort = null;
 
-    @Option(name = "-d", aliases = "--dstIp", description = "Destination IP", valueToShowInHelp = "255.255.255.255")
-    String dstIp = "255.255.255.255";
+    @Option(name = "-d", aliases = "--dstIp", description = "Destination IP")
+    String dstIp = null;
 
     @Option(name = "-dm", aliases = "--dstMac", description = "Destination MAC")
     String dstMac = null;
@@ -90,13 +91,18 @@
     protected void execute() {
         TroubleshootService service = get(TroubleshootService.class);
         ConnectPoint cp = ConnectPoint.deviceConnectPoint(srcPort);
+        EtherType type = EtherType.valueOf(ethType.toUpperCase());
 
         //Input Port must be specified
         TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder()
                 .matchInPort(cp.port());
 
         if (srcIp != null) {
-            selectorBuilder.matchIPSrc(IpAddress.valueOf(srcIp).toIpPrefix());
+            if (type.equals(EtherType.IPV6)) {
+                selectorBuilder.matchIPv6Src(IpAddress.valueOf(srcIp).toIpPrefix());
+            } else {
+                selectorBuilder.matchIPSrc(IpAddress.valueOf(srcIp).toIpPrefix());
+            }
         }
 
         if (srcMac != null) {
@@ -104,14 +110,19 @@
         }
 
         //if EthType option is not specified using IPv4
-        selectorBuilder.matchEthType(EthType.EtherType.valueOf(ethType.toUpperCase()).ethType().toShort());
+        selectorBuilder.matchEthType(type.ethType().toShort());
 
         if (srcTcpPort != null) {
             selectorBuilder.matchTcpSrc(TpPort.tpPort(Integer.parseInt(srcTcpPort)));
         }
 
-        //if destination Ip option is not specified using broadcast 255.255.255.255
-        selectorBuilder.matchIPDst(IpAddress.valueOf(dstIp).toIpPrefix());
+        if (dstIp != null) {
+            if (type.equals(EtherType.IPV6)) {
+                selectorBuilder.matchIPv6Dst(IpAddress.valueOf(dstIp).toIpPrefix());
+            } else {
+                selectorBuilder.matchIPDst(IpAddress.valueOf(dstIp).toIpPrefix());
+            }
+        }
 
         if (dstMac != null) {
             selectorBuilder.matchEthDst(MacAddress.valueOf(dstMac));