commit 8117f36bd0109a1fe0d2ba1dbdb285bfec45af71
author Ayaka Koshibe <ayaka@onlab.us> Tue Jun 02 13:44:01 2015 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Tue Jun 02 13:46:54 2015 -0700
tree 1ff1c836edc5b4bd76850e2487df0770c92d47ad
parent 74bcd92c75961a2820a2f5231b573f55af563058

Fixes for resource-related test CLI commands:

- Tweak to assumptions in base command for ConnectivityIntents
- Check before casting between port types

Change-Id: I5db84ec435029f2de84abb0f3f5ddc726035bf1b

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 2e88c3a..96fc72e 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 = false;
+    private Boolean lambda = null;
 
     @Option(name = "-a", aliases = "--appId", description = "Application Id",
             required = false, multiValued = false)
@@ -189,7 +189,7 @@
         // Set the default EthType based on the IP version if the matching
         // source or destination IP prefixes.
         //
-        short ethType = EthType.IPV4.value();
+        Short ethType = null;
         if ((srcIpPrefix != null) && srcIpPrefix.isIp6()) {
             ethType = EthType.IPV6.value();
         }
@@ -199,8 +199,9 @@
         if (!isNullOrEmpty(ethTypeString)) {
             ethType = EthType.parseFromString(ethTypeString);
         }
-        selectorBuilder.matchEthType(ethType);
-
+        if (ethType != null) {
+            selectorBuilder.matchEthType(ethType);
+        }
         if (!isNullOrEmpty(srcMacString)) {
             selectorBuilder.matchEthSrc(MacAddress.valueOf(srcMacString));
         }
@@ -312,11 +313,12 @@
         }
 
         // Check for a lambda specification
-        if (lambda) {
-            constraints.add(new LambdaConstraint(null));
+        if (lambda != null) {
+            if (lambda) {
+                constraints.add(new LambdaConstraint(null));
+            }
+            constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL));
         }
-        constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL));
-
         return constraints;
     }