commit 792c26ba5e70b4531e9d36bf75cc155634c94527
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jun 08 19:08:32 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jun 09 16:15:39 2015 +0000
tree db08c4168b2c9366a0b6b2286733aa34bc5fea98
parent 132001a14965ca5639373b2f57f460e0c8020b11

Revert changes in 8117f36, which modifies the default behavior

If no command line option regarding lambda is supplied,
optical links need to be execluded, but the previous patch broke it.

Change-Id: Ia95e82f7c31fdb16345eb43f1864b58aa4f25acc

cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
index 96fc72e..8bc0bc4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -115,7 +115,7 @@
 
     @Option(name = "-l", aliases = "--lambda", description = "Lambda",
             required = false, multiValued = false)
-    private Boolean lambda = null;
+    private boolean lambda = false;
 
     @Option(name = "-a", aliases = "--appId", description = "Application Id",
             required = false, multiValued = false)
@@ -313,12 +313,11 @@
         }
 
         // Check for a lambda specification
-        if (lambda != null) {
-            if (lambda) {
-                constraints.add(new LambdaConstraint(null));
-            }
-            constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL));
+        if (lambda) {
+            constraints.add(new LambdaConstraint(null));
         }
+        constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL));
+
         return constraints;
     }