commit 72f81b1830161a4bf81c0a9cd3658275430b3458
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Feb 09 09:26:17 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 10 20:06:50 2016 +0000
tree f19ac005a30c97fe9ef6d43809f70b14b5d0f115
parent 82bfe99aa8188cfe8637a7823bdb71b58d9f4666

Use ResourceId when unregistering resources instead of Resource

Change-Id: Ib3d1c611ad9eb4491693ea10ee50ea0123f20ee2

core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java

diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
index a8850df..0c94ab5 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
@@ -16,6 +16,7 @@
 package org.onosproject.net.newresource.impl;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
 import org.onlab.util.Bandwidth;
@@ -133,7 +134,7 @@
         executor.submit(() -> {
             DiscreteResource devResource = Resources.discrete(device.id()).resource();
             List<Resource> allResources = getDescendantResources(devResource);
-            adminService.unregisterResources(allResources);
+            adminService.unregisterResources(Lists.transform(allResources, Resource::id));
         });
     }
 
@@ -189,7 +190,7 @@
         executor.submit(() -> {
             DiscreteResource portResource = Resources.discrete(device.id(), port.number()).resource();
             List<Resource> allResources = getDescendantResources(portResource);
-            adminService.unregisterResources(allResources);
+            adminService.unregisterResources(Lists.transform(allResources, Resource::id));
         });
     }