Use ResourceId when unregistering resources instead of Resource
Change-Id: Ib3d1c611ad9eb4491693ea10ee50ea0123f20ee2
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));
});
}
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
index 5fc9d55..7ce8c28 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
@@ -178,10 +178,10 @@
}
@Override
- public boolean unregisterResources(List<Resource> resources) {
- checkNotNull(resources);
+ public boolean unregisterResources(List<ResourceId> ids) {
+ checkNotNull(ids);
- return store.unregister(resources);
+ return store.unregister(ids);
}
private class InternalStoreDelegate implements ResourceStoreDelegate {
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
index e98a3c3..39ab964 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
@@ -117,7 +117,7 @@
// FIXME Following should be an update to the value based on port speed
if (!adminService.unregisterResources(Resources.continuous(cp.deviceId(),
cp.port(),
- Bandwidth.class).resource(0))) {
+ Bandwidth.class).id())) {
log.warn("Failed to unregister Bandwidth for {}", cp);
}
break;
@@ -148,7 +148,7 @@
// returns true (success)
if (!adminService.unregisterResources(
- Resources.continuous(cp.deviceId(), cp.port(), Bandwidth.class).resource(0))) {
+ Resources.continuous(cp.deviceId(), cp.port(), Bandwidth.class).id())) {
log.warn("unregisterResources for {} failed", cp);
}
return adminService.registerResources(Resources.continuous(cp.deviceId(),