diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java index 08c49856df..69cc5c077e 100644 --- a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java +++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java @@ -86,7 +86,7 @@ public interface LinkResourceService { * @param allocations allocations to be included as available * @return available resources for the target link */ - ResourceRequest getAvailableResources(Link link, + Iterable getAvailableResources(Link link, LinkResourceAllocations allocations); } diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java index 90e9bece3f..cc2ef75173 100644 --- a/core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java +++ b/core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java @@ -269,7 +269,7 @@ public class IntentTestsMocks { } @Override - public ResourceRequest getAvailableResources(Link link, LinkResourceAllocations allocations) { + public Iterable getAvailableResources(Link link, LinkResourceAllocations allocations) { return null; } } diff --git a/core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java b/core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java index ce01dd126f..e7f22be1be 100644 --- a/core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java +++ b/core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java @@ -156,8 +156,8 @@ public class LinkResourceManager implements LinkResourceService { @Override public LinkResourceAllocations updateResources(LinkResourceRequest req, LinkResourceAllocations oldAllocations) { - // TODO - return null; + releaseResources(oldAllocations); + return requestResources(req); } @Override @@ -196,10 +196,13 @@ public class LinkResourceManager implements LinkResourceService { } @Override - public ResourceRequest getAvailableResources(Link link, + public Iterable getAvailableResources(Link link, LinkResourceAllocations allocations) { - // TODO - return null; + Set result = new HashSet<>(); + Set allocatedRes = allocations.getResourceAllocation(link); + result = (Set) getAvailableResources(link); + result.addAll(allocatedRes); + return result; } }