commit | d707d7a88613ede04a5b9e27ec369722228699cc | [log] [tgz] |
---|---|---|
author | Toshio Koide <t-koide@onlab.us> | Thu Oct 23 12:37:51 2014 -0700 |
committer | Toshio Koide <t-koide@onlab.us> | Thu Oct 23 12:37:51 2014 -0700 |
tree | a726924639df4e1069418934ed0b0121eea9d85e | |
parent | 65e890f1531ffb1b2889f9c7ad9f54713aaf570b [diff] |
Update getResourceAllocation() of LinkResourceAllocations to return set of resource allocations
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java index 77db287..86f8b4e 100644 --- a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java +++ b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java
@@ -3,7 +3,8 @@ /** * Representation of allocated bandwidth resource. */ -public class BandwidthResourceAllocation extends BandwidthResourceRequest { +public class BandwidthResourceAllocation extends BandwidthResourceRequest + implements ResourceAllocation { /** * Creates a new {@link BandwidthResourceAllocation} with {@link Bandwidth} * object.
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java index a8686ea..62ce1bd 100644 --- a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java +++ b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java
@@ -3,7 +3,8 @@ /** * Representation of allocated lambda resource. */ -public class LambdaResourceAllocation extends LambdaResourceRequest { +public class LambdaResourceAllocation extends LambdaResourceRequest + implements ResourceAllocation { private final Lambda lambda; /**
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java index a3d3e87..412cecd 100644 --- a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java +++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java
@@ -1,5 +1,7 @@ package org.onlab.onos.net.resource; +import java.util.Set; + import org.onlab.onos.net.Link; /** @@ -12,5 +14,5 @@ * @param link the target link * @return allocated resource for the link */ - ResourceAllocation getResourceAllocation(Link link); + Set<ResourceAllocation> getResourceAllocation(Link link); }