commit 94b7ff4f7f822cde591975dec57913efe8fec860
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed May 06 17:51:49 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 07 17:11:42 2015 +0000
tree f367cabd2feea385219967ddbd38d4009927915b
parent 100e3b809dff63502a96feae6dd2ff0b93a10033

Rename Lambda in org.onosproject.net.resource to LambdaResource

To avoid naming conflict with Lambda in org.onosproject.net

Change-Id: Ic8a670e7e2fb022f44f5a83cf4805f3ce0f29694

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalPathIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalPathIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalPathIntentCompiler.java
index 3e193ac..e6a20f7 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalPathIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalPathIntentCompiler.java
@@ -37,7 +37,7 @@
 import org.onosproject.net.intent.OpticalPathIntent;
 import org.onosproject.net.intent.impl.IntentCompilationException;
 import org.onosproject.net.resource.DefaultLinkResourceRequest;
-import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LambdaResource;
 import org.onosproject.net.resource.LambdaResourceAllocation;
 import org.onosproject.net.resource.LinkResourceAllocations;
 import org.onosproject.net.resource.LinkResourceRequest;
@@ -110,7 +110,7 @@
                     .filter(x -> x.type() == ResourceType.LAMBDA)
                     .findFirst()
                     .orElseThrow(() -> new IntentCompilationException("Lambda was not assigned successfully"));
-            Lambda la = ((LambdaResourceAllocation) allocation).lambda();
+            LambdaResource la = ((LambdaResourceAllocation) allocation).lambda();
 
             TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder();
             treatmentBuilder.setLambda((short) la.toInt());