From 00c94f5533e29f98104a1a57b72dc8dbd63be72f Mon Sep 17 00:00:00 2001
From: weibit <weibit@gmail.com>
Date: Sun, 16 Nov 2014 07:09:05 -0800
Subject: [PATCH] update and get available link resource consindering existing
 linkAllocations

Change-Id: Iee93253d253ff38d23630a2c5ac9c0a14329d92f
---
 .../onos/net/resource/LinkResourceService.java      |  2 +-
 .../org/onlab/onos/net/intent/IntentTestsMocks.java |  2 +-
 .../onos/net/resource/impl/LinkResourceManager.java | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

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<ResourceRequest> 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<ResourceRequest> 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<ResourceRequest> getAvailableResources(Link link,
             LinkResourceAllocations allocations) {
-        // TODO
-        return null;
+        Set<ResourceRequest> result = new HashSet<>();
+        Set<ResourceAllocation> allocatedRes = allocations.getResourceAllocation(link);
+        result = (Set<ResourceRequest>) getAvailableResources(link);
+        result.addAll(allocatedRes);
+        return result;
     }
 
 }