Made ResourceManager to accept arbitrary ResourceConsumer implementation. (ONOS-4406)
Change-Id: If41564824770c2a8b78237a206c036df94141117
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
index 00ad671..54751a6 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
@@ -24,7 +24,7 @@
import org.onosproject.net.resource.DiscreteResourceId;
import org.onosproject.net.resource.Resource;
import org.onosproject.net.resource.ResourceAllocation;
-import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.ConsistentMapException;
import org.onosproject.store.service.StorageService;
@@ -132,10 +132,10 @@
});
}
- Stream<ContinuousResource> getResources(ResourceConsumer consumer) {
+ Stream<ContinuousResource> getResources(ResourceConsumerId consumerId) {
return consumers.values().stream()
.flatMap(x -> x.value().allocations().stream())
- .filter(x -> x.consumer().equals(consumer))
+ .filter(x -> x.consumerId().equals(consumerId))
// this cast is safe because this class stores
// continuous resource allocations only
.map(x -> (ContinuousResource) x.resource());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceStore.java
index ce645c0..06b458e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceStore.java
@@ -22,7 +22,7 @@
import org.onosproject.net.resource.DiscreteResourceId;
import org.onosproject.net.resource.Resource;
import org.onosproject.net.resource.ResourceAllocation;
-import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.resource.Resources;
import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.ConsistentMapException;
@@ -41,11 +41,11 @@
import static org.onosproject.store.resource.impl.ConsistentResourceStore.SERIALIZER;
class ConsistentDiscreteResourceStore {
- private ConsistentMap<DiscreteResourceId, ResourceConsumer> consumers;
+ private ConsistentMap<DiscreteResourceId, ResourceConsumerId> consumers;
private ConsistentMap<DiscreteResourceId, Set<DiscreteResource>> childMap;
ConsistentDiscreteResourceStore(StorageService service) {
- this.consumers = service.<DiscreteResourceId, ResourceConsumer>consistentMapBuilder()
+ this.consumers = service.<DiscreteResourceId, ResourceConsumerId>consistentMapBuilder()
.withName(MapNames.DISCRETE_CONSUMER_MAP)
.withSerializer(SERIALIZER)
.build();
@@ -64,12 +64,12 @@
// computational complexity: O(1)
List<ResourceAllocation> getResourceAllocations(DiscreteResourceId resource) {
- Versioned<ResourceConsumer> consumer = consumers.get(resource);
- if (consumer == null) {
+ Versioned<ResourceConsumerId> consumerId = consumers.get(resource);
+ if (consumerId == null) {
return ImmutableList.of();
}
- return ImmutableList.of(new ResourceAllocation(Resources.discrete(resource).resource(), consumer.value()));
+ return ImmutableList.of(new ResourceAllocation(Resources.discrete(resource).resource(), consumerId.value()));
}
Set<DiscreteResource> getChildResources(DiscreteResourceId parent) {
@@ -97,9 +97,9 @@
.filter(x -> consumers.containsKey(x.id()));
}
- Stream<DiscreteResource> getResources(ResourceConsumer consumer) {
+ Stream<DiscreteResource> getResources(ResourceConsumerId consumerId) {
return consumers.entrySet().stream()
- .filter(x -> x.getValue().value().equals(consumer))
+ .filter(x -> x.getValue().value().equals(consumerId))
.map(Map.Entry::getKey)
.map(x -> Resources.discrete(x).resource());
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
index 0be8a37..a11aabc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
@@ -29,6 +29,7 @@
import org.onosproject.net.resource.Resource;
import org.onosproject.net.resource.ResourceAllocation;
import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.resource.ResourceEvent;
import org.onosproject.net.resource.ResourceId;
import org.onosproject.net.resource.ResourceStore;
@@ -208,11 +209,11 @@
TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
for (Resource resource : resources) {
if (resource instanceof DiscreteResource) {
- if (!discreteTxStore.allocate(consumer, (DiscreteResource) resource)) {
+ if (!discreteTxStore.allocate(consumer.consumerId(), (DiscreteResource) resource)) {
return abortTransaction(tx);
}
} else if (resource instanceof ContinuousResource) {
- if (!continuousTxStore.allocate(consumer, (ContinuousResource) resource)) {
+ if (!continuousTxStore.allocate(consumer.consumerId(), (ContinuousResource) resource)) {
return abortTransaction(tx);
}
}
@@ -232,14 +233,14 @@
TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
for (ResourceAllocation allocation : allocations) {
Resource resource = allocation.resource();
- ResourceConsumer consumer = allocation.consumer();
+ ResourceConsumerId consumerId = allocation.consumerId();
if (resource instanceof DiscreteResource) {
- if (!discreteTxStore.release((DiscreteResource) resource, consumer)) {
+ if (!discreteTxStore.release((DiscreteResource) resource, consumerId)) {
return abortTransaction(tx);
}
} else if (resource instanceof ContinuousResource) {
- if (!continuousTxStore.release((ContinuousResource) resource, consumer)) {
+ if (!continuousTxStore.release((ContinuousResource) resource, consumerId)) {
return abortTransaction(tx);
}
}
@@ -269,11 +270,12 @@
@Override
public Collection<Resource> getResources(ResourceConsumer consumer) {
checkNotNull(consumer);
+ ResourceConsumerId consumerId = consumer.consumerId();
// NOTE: getting all entries may become performance bottleneck
// TODO: revisit for better backend data structure
- Stream<DiscreteResource> discrete = discreteStore.getResources(consumer);
- Stream<ContinuousResource> continuous = continuousStore.getResources(consumer);
+ Stream<DiscreteResource> discrete = discreteStore.getResources(consumer.consumerId());
+ Stream<ContinuousResource> continuous = continuousStore.getResources(consumer.consumerId());
return Stream.concat(discrete, continuous).collect(Collectors.toList());
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceStore.java
index 7de85f8..f926369 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceStore.java
@@ -22,7 +22,7 @@
import org.onosproject.net.resource.ContinuousResourceId;
import org.onosproject.net.resource.DiscreteResourceId;
import org.onosproject.net.resource.ResourceAllocation;
-import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.store.service.TransactionContext;
import org.onosproject.store.service.TransactionalMap;
import org.slf4j.Logger;
@@ -133,7 +133,7 @@
return allocations != null && !allocations.allocations().isEmpty();
}
- boolean allocate(ResourceConsumer consumer, ContinuousResource request) {
+ boolean allocate(ResourceConsumerId consumerId, ContinuousResource request) {
// if the resource is not registered, then abort
Optional<ContinuousResource> lookedUp = lookup(request.id());
if (!lookedUp.isPresent()) {
@@ -146,7 +146,7 @@
return false;
}
- return appendValue(original, new ResourceAllocation(request, consumer));
+ return appendValue(original, new ResourceAllocation(request, consumerId));
}
// Appends the specified ResourceAllocation to the existing values stored in the map
@@ -166,16 +166,16 @@
return consumers.replace(original.id(), oldValue, newValue);
}
- boolean release(ContinuousResource resource, ResourceConsumer consumer) {
+ boolean release(ContinuousResource resource, ResourceConsumerId consumerId) {
ContinuousResourceAllocation oldAllocation = consumers.get(resource.id());
List<ResourceAllocation> nonMatched = oldAllocation.allocations().stream()
- .filter(x -> !(x.consumer().equals(consumer) &&
+ .filter(x -> !(x.consumerId().equals(consumerId) &&
((ContinuousResource) x.resource()).value() == resource.value()))
.collect(Collectors.toList());
List<ResourceAllocation> matched = oldAllocation.allocations().stream()
- .filter(x -> (x.consumer().equals(consumer) &&
+ .filter(x -> (x.consumerId().equals(consumerId) &&
((ContinuousResource) x.resource()).value() == resource.value()))
.collect(Collectors.toList());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
index 68194d9..83589dc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
@@ -19,7 +19,7 @@
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceId;
import org.onosproject.net.resource.Resource;
-import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.resource.Resources;
import org.onosproject.store.service.TransactionContext;
import org.onosproject.store.service.TransactionalMap;
@@ -36,7 +36,7 @@
class TransactionalDiscreteResourceStore {
private final Logger log = LoggerFactory.getLogger(getClass());
private final TransactionalMap<DiscreteResourceId, Set<DiscreteResource>> childMap;
- private final TransactionalMap<DiscreteResourceId, ResourceConsumer> consumers;
+ private final TransactionalMap<DiscreteResourceId, ResourceConsumerId> consumers;
TransactionalDiscreteResourceStore(TransactionContext tx) {
this.childMap = tx.getTransactionalMap(MapNames.DISCRETE_CHILD_MAP, SERIALIZER);
@@ -121,21 +121,21 @@
return consumers.get(id) != null;
}
- boolean allocate(ResourceConsumer consumer, DiscreteResource resource) {
+ boolean allocate(ResourceConsumerId consumerId, DiscreteResource resource) {
// if the resource is not registered, then abort
Optional<DiscreteResource> lookedUp = lookup(resource.id());
if (!lookedUp.isPresent()) {
return false;
}
- ResourceConsumer oldValue = consumers.put(resource.id(), consumer);
+ ResourceConsumerId oldValue = consumers.put(resource.id(), consumerId);
return oldValue == null;
}
- boolean release(DiscreteResource resource, ResourceConsumer consumer) {
+ boolean release(DiscreteResource resource, ResourceConsumerId consumerId) {
// if this single release fails (because the resource is allocated to another consumer)
// the whole release fails
- if (!consumers.remove(resource.id(), consumer)) {
+ if (!consumers.remove(resource.id(), consumerId)) {
return false;
}
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index a62d422..c1d25b7 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -199,6 +199,7 @@
import org.onosproject.net.resource.MplsCodec;
import org.onosproject.net.resource.NoOpCodec;
import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.DefaultPacketRequest;
import org.onosproject.net.packet.PacketPriority;
@@ -454,6 +455,7 @@
DiscreteResourceId.class,
ContinuousResourceId.class,
ResourceAllocation.class,
+ ResourceConsumerId.class,
// Constraints
BandwidthConstraint.class,
LinkTypeConstraint.class,
diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index 19abfba..4f245cb 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -67,6 +67,7 @@
import org.onosproject.net.resource.DiscreteResourceSet;
import org.onosproject.net.resource.MplsCodec;
import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.resource.Resources;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.intent.constraint.AnnotationConstraint;
@@ -404,7 +405,7 @@
public void testResourceAllocation() {
testSerializedEquals(new ResourceAllocation(
Resources.discrete(DID1, P1, VLAN1).resource(),
- IntentId.valueOf(30)));
+ ResourceConsumerId.of(30L, IntentId.class)));
}
@Test