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/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java

diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
index 0d9d09c..a8f8f51 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
+++ b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
@@ -33,7 +33,7 @@
 import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.resource.Bandwidth;
 import org.onosproject.net.resource.BandwidthResourceAllocation;
-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.LinkResourceEvent;
@@ -90,7 +90,7 @@
         try {
             int waves = Integer.parseInt(annotations.value(AnnotationKeys.OPTICAL_WAVES));
             for (int i = 1; i <= waves; i++) {
-                allocations.add(new LambdaResourceAllocation(Lambda.valueOf(i)));
+                allocations.add(new LambdaResourceAllocation(LambdaResource.valueOf(i)));
             }
         } catch (NumberFormatException e) {
             log.debug("No optical.wave annotation on link %s", link);