| commit | 09e5f64886859f7b49ed15525bc004a351ab45a9 | [log] [tgz] |
|---|---|---|
| author | Marc De Leenheer <marc@onlab.us> | Thu Oct 23 13:54:26 2014 -0700 |
| committer | Marc De Leenheer <marc@onlab.us> | Thu Oct 23 13:54:26 2014 -0700 |
| tree | 1ed54ee979d204aedf1c90e33616784a7c30c979 | |
| parent | 4908775b84fe84356e9ebdab5346ba1a0fc0f106 [diff] | |
| parent | 55153ce8bd8da1c0085ae242f2a55f2b97fc6356 [diff] |
Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration
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 1ea5723..e7988df 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
@@ -31,6 +31,14 @@ Iterable<LinkResourceAllocations> getAllocations(); /** + * Returns the resources allocated for an Intent. + * + * @param intentId the target Intent's id + * @return allocated resources for Intent + */ + LinkResourceAllocations getAllocation(IntentId intentId); + + /** * Returns all allocated resources to given link. * * @param link a target link
diff --git a/core/net/src/main/java/org/onlab/onos/net/resource/LinkResourceManager.java b/core/net/src/main/java/org/onlab/onos/net/resource/LinkResourceManager.java index cb14abc..7d4da02 100644 --- a/core/net/src/main/java/org/onlab/onos/net/resource/LinkResourceManager.java +++ b/core/net/src/main/java/org/onlab/onos/net/resource/LinkResourceManager.java
@@ -48,6 +48,12 @@ } @Override + public LinkResourceAllocations getAllocation(IntentId intentId) { + // TODO Auto-generated method stub + return null; + } + + @Override public Iterable<LinkResourceAllocations> getAllocations(Link link) { // TODO Auto-generated method stub return null;