Showing
4 changed files
with
17 additions
and
9 deletions
... | @@ -5,10 +5,4 @@ package org.onlab.onos.net.resource; | ... | @@ -5,10 +5,4 @@ package org.onlab.onos.net.resource; |
5 | */ | 5 | */ |
6 | public interface ResourceAllocation extends ResourceRequest { | 6 | public interface ResourceAllocation extends ResourceRequest { |
7 | 7 | ||
8 | - /** | ||
9 | - * Returns the type of the allocated resource. | ||
10 | - * | ||
11 | - * @return the type of the allocated resource | ||
12 | - */ | ||
13 | - ResourceType type(); | ||
14 | } | 8 | } | ... | ... |
1 | -package org.onlab.onos.net.resource; | 1 | +package org.onlab.onos.net.resource.impl; |
2 | 2 | ||
3 | import java.util.Collection; | 3 | import java.util.Collection; |
4 | import java.util.Collections; | 4 | import java.util.Collections; |
... | @@ -7,6 +7,11 @@ import java.util.Set; | ... | @@ -7,6 +7,11 @@ import java.util.Set; |
7 | 7 | ||
8 | import org.onlab.onos.net.Link; | 8 | import org.onlab.onos.net.Link; |
9 | import org.onlab.onos.net.intent.IntentId; | 9 | import org.onlab.onos.net.intent.IntentId; |
10 | +import org.onlab.onos.net.resource.LinkResourceAllocations; | ||
11 | +import org.onlab.onos.net.resource.LinkResourceRequest; | ||
12 | +import org.onlab.onos.net.resource.ResourceAllocation; | ||
13 | +import org.onlab.onos.net.resource.ResourceRequest; | ||
14 | +import org.onlab.onos.net.resource.ResourceType; | ||
10 | 15 | ||
11 | /** | 16 | /** |
12 | * Implementation of {@link LinkResourceAllocations}. | 17 | * Implementation of {@link LinkResourceAllocations}. | ... | ... |
1 | -package org.onlab.onos.net.resource; | 1 | +package org.onlab.onos.net.resource.impl; |
2 | 2 | ||
3 | import static org.slf4j.LoggerFactory.getLogger; | 3 | import static org.slf4j.LoggerFactory.getLogger; |
4 | 4 | ||
... | @@ -12,6 +12,15 @@ import org.apache.felix.scr.annotations.Deactivate; | ... | @@ -12,6 +12,15 @@ import org.apache.felix.scr.annotations.Deactivate; |
12 | import org.apache.felix.scr.annotations.Service; | 12 | import org.apache.felix.scr.annotations.Service; |
13 | import org.onlab.onos.net.Link; | 13 | import org.onlab.onos.net.Link; |
14 | import org.onlab.onos.net.intent.IntentId; | 14 | import org.onlab.onos.net.intent.IntentId; |
15 | +import org.onlab.onos.net.resource.BandwidthResourceAllocation; | ||
16 | +import org.onlab.onos.net.resource.BandwidthResourceRequest; | ||
17 | +import org.onlab.onos.net.resource.Lambda; | ||
18 | +import org.onlab.onos.net.resource.LambdaResourceAllocation; | ||
19 | +import org.onlab.onos.net.resource.LinkResourceAllocations; | ||
20 | +import org.onlab.onos.net.resource.LinkResourceRequest; | ||
21 | +import org.onlab.onos.net.resource.LinkResourceService; | ||
22 | +import org.onlab.onos.net.resource.ResourceAllocation; | ||
23 | +import org.onlab.onos.net.resource.ResourceRequest; | ||
15 | import org.slf4j.Logger; | 24 | import org.slf4j.Logger; |
16 | 25 | ||
17 | import com.google.common.collect.Sets; | 26 | import com.google.common.collect.Sets; | ... | ... |
-
Please register or login to post a comment