Sho SHIMIZU
Committed by Thomas Vachuska

Remove methods in the deprecated old resource API

Change-Id: I5ccb8e30fc1a48208f28384d4c444f864ffe9cb7
...@@ -22,10 +22,4 @@ import com.google.common.annotations.Beta; ...@@ -22,10 +22,4 @@ import com.google.common.annotations.Beta;
22 */ 22 */
23 @Beta 23 @Beta
24 public interface ResourceAllocation { 24 public interface ResourceAllocation {
25 - /**
26 - * Returns the resource type.
27 - *
28 - * @return the resource type
29 - */
30 - ResourceType type();
31 } 25 }
......
...@@ -22,11 +22,4 @@ import com.google.common.annotations.Beta; ...@@ -22,11 +22,4 @@ import com.google.common.annotations.Beta;
22 */ 22 */
23 @Beta 23 @Beta
24 public interface ResourceRequest { 24 public interface ResourceRequest {
25 - /**
26 - * Returns the resource type.
27 - *
28 - * @return the resource type
29 - */
30 - ResourceType type();
31 -
32 } 25 }
......
...@@ -15,13 +15,7 @@ ...@@ -15,13 +15,7 @@
15 */ 15 */
16 package org.onosproject.net.resource.link; 16 package org.onosproject.net.resource.link;
17 17
18 -import java.util.Collection;
19 -import java.util.Set;
20 -
21 -import org.onosproject.net.Link;
22 -import org.onosproject.net.intent.IntentId;
23 import org.onosproject.net.resource.ResourceAllocation; 18 import org.onosproject.net.resource.ResourceAllocation;
24 -import org.onosproject.net.resource.ResourceRequest;
25 19
26 /** 20 /**
27 * Representation of allocated link resources. 21 * Representation of allocated link resources.
...@@ -30,33 +24,4 @@ import org.onosproject.net.resource.ResourceRequest; ...@@ -30,33 +24,4 @@ import org.onosproject.net.resource.ResourceRequest;
30 */ 24 */
31 @Deprecated 25 @Deprecated
32 public interface LinkResourceAllocations extends ResourceAllocation { 26 public interface LinkResourceAllocations extends ResourceAllocation {
33 -
34 - /**
35 - * Returns the {@link IntentId} associated with the request.
36 - *
37 - * @return the {@link IntentId} associated with the request
38 - */
39 - IntentId intentId();
40 -
41 - /**
42 - * Returns the set of target links.
43 - *
44 - * @return the set of target links
45 - */
46 - Collection<Link> links();
47 -
48 - /**
49 - * Returns the set of resource requests.
50 - *
51 - * @return the set of resource requests
52 - */
53 - Set<ResourceRequest> resources();
54 -
55 - /**
56 - * Returns allocated resource for the given link.
57 - *
58 - * @param link the target link
59 - * @return allocated resource for the link
60 - */
61 - Set<ResourceAllocation> getResourceAllocation(Link link);
62 } 27 }
......