commit 09ca07a7b645f5a49dd8498b22573de53764aaf8
author Andrea Campanella <andrea@opennetworking.org> Thu Jan 25 16:44:04 2018 +0100
committer Andrea Campanella <andrea@opennetworking.org> Mon Jan 29 09:19:46 2018 +0000
tree 4a36aeae4c2fa3bbc8457670a1436545c98d4d2a
parent 13b16818241bf488d9e206f6e83aaf1e01c73245

T3: removed fixed mpls_bos and proper mpls label removal

Change-Id: Iaa122a84a43fedb5a0814d2a34b00a682ce4f741
(cherry picked from commit d293a5aa25937530da1d297589a2e5d7dfb5aef5)

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

diff --git a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
index fdeb944..c809065 100644
--- a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
+++ b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
@@ -20,6 +20,7 @@
 import org.apache.karaf.shell.commands.Option;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
+import org.onlab.packet.MplsLabel;
 import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
 import org.onosproject.cli.AbstractShellCommand;
@@ -84,8 +85,11 @@
     @Option(name = "-vid", aliases = "--vlanId", description = "Vlan of incoming packet", valueToShowInHelp = "None")
     String vlan = "None";
 
+    @Option(name = "-ml", aliases = "--mplsLabel", description = "Mpls label of incoming packet")
+    String mplsLabel = null;
+
     @Option(name = "-mb", aliases = "--mplsBos", description = "MPLS BOS", valueToShowInHelp = "True")
-    String mplsBos = "true";
+    String mplsBos = null;
 
     @Override
     protected void execute() {
@@ -134,8 +138,13 @@
         //if vlan option is not specified using NONE
         selectorBuilder.matchVlanId(VlanId.vlanId(vlan));
 
-        //if mplsBos option is not specified using True
-        selectorBuilder.matchMplsBos(Boolean.valueOf(mplsBos));
+        if (mplsLabel != null) {
+            selectorBuilder.matchMplsLabel(MplsLabel.mplsLabel(Integer.parseInt(mplsLabel)));
+        }
+
+        if (mplsBos != null) {
+            selectorBuilder.matchMplsBos(Boolean.valueOf(mplsBos));
+        }
 
         TrafficSelector packet = selectorBuilder.build();