commit 7d20af107ce5573645eb9041fef718a2dffee43a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Oct 01 16:03:51 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Oct 02 22:56:54 2015 +0000
tree deaf0caec7b10eeb56c831326d0c0354a40cb1ad
parent dd106a6d4ecf1c6bc605f115924b24d9092a2542

Refactor: Rename to more descriptive name

Change-Id: I013c45690f7f405b66d656fd8e53d4a41c31e6da

apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index 2c6407f..8466b95 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -46,7 +46,7 @@
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.net.newresource.ResourceService;
-import org.onosproject.net.resource.device.DeviceResourceStore;
+import org.onosproject.net.resource.device.IntentSetMultimap;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.onosproject.net.resource.link.LinkResourceService;
 import org.onosproject.net.topology.LinkWeight;
@@ -98,7 +98,7 @@
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceResourceStore deviceResourceStore;
+    protected IntentSetMultimap intentSetMultimap;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected LinkResourceService linkResourceService;
@@ -385,7 +385,7 @@
                 }
             } else if (intent instanceof OpticalCircuitIntent) {
                 resourceService.release(intent.id());
-                deviceResourceStore.releaseMapping(intent.id());
+                intentSetMultimap.releaseMapping(intent.id());
                 if (lra != null) {
                     linkResourceService.releaseResources(lra);
                 }