Committed by
Thomas Vachuska
Remove constructs deprecated in Emu from old resource API
Change-Id: I384cb924f950e366b2a01f205233ba726dec9eb4
Showing
5 changed files
with
1 additions
and
116 deletions
1 | -/* | ||
2 | - * Copyright 2014 Open Networking Laboratory | ||
3 | - * | ||
4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | - * you may not use this file except in compliance with the License. | ||
6 | - * You may obtain a copy of the License at | ||
7 | - * | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * | ||
10 | - * Unless required by applicable law or agreed to in writing, software | ||
11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | - * See the License for the specific language governing permissions and | ||
14 | - * limitations under the License. | ||
15 | - */ | ||
16 | -package org.onosproject.net.resource; | ||
17 | - | ||
18 | -import com.google.common.annotations.Beta; | ||
19 | - | ||
20 | -/** | ||
21 | - * Abstraction of allocated resource. | ||
22 | - */ | ||
23 | -@Beta | ||
24 | -public interface ResourceAllocation { | ||
25 | -} |
1 | -/* | ||
2 | - * Copyright 2014 Open Networking Laboratory | ||
3 | - * | ||
4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | - * you may not use this file except in compliance with the License. | ||
6 | - * You may obtain a copy of the License at | ||
7 | - * | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * | ||
10 | - * Unless required by applicable law or agreed to in writing, software | ||
11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | - * See the License for the specific language governing permissions and | ||
14 | - * limitations under the License. | ||
15 | - */ | ||
16 | -package org.onosproject.net.resource; | ||
17 | - | ||
18 | -import com.google.common.annotations.Beta; | ||
19 | - | ||
20 | -/** | ||
21 | - * Abstraction of resource request. | ||
22 | - */ | ||
23 | -@Beta | ||
24 | -public interface ResourceRequest { | ||
25 | -} |
1 | -/* | ||
2 | - * Copyright 2014-2015 Open Networking Laboratory | ||
3 | - * | ||
4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | - * you may not use this file except in compliance with the License. | ||
6 | - * You may obtain a copy of the License at | ||
7 | - * | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * | ||
10 | - * Unless required by applicable law or agreed to in writing, software | ||
11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | - * See the License for the specific language governing permissions and | ||
14 | - * limitations under the License. | ||
15 | - */ | ||
16 | -package org.onosproject.net.resource; | ||
17 | - | ||
18 | -import com.google.common.annotations.Beta; | ||
19 | - | ||
20 | -/** | ||
21 | - * Represents types for link resources. | ||
22 | - */ | ||
23 | -@Beta | ||
24 | -public enum ResourceType { | ||
25 | - /** | ||
26 | - * Lambda resource type. | ||
27 | - */ | ||
28 | - LAMBDA, | ||
29 | - | ||
30 | - /** | ||
31 | - * Bandwidth resource type. | ||
32 | - */ | ||
33 | - BANDWIDTH, | ||
34 | - | ||
35 | - /** | ||
36 | - * MPLS label resource type. | ||
37 | - */ | ||
38 | - MPLS_LABEL, | ||
39 | -} |
... | @@ -15,13 +15,11 @@ | ... | @@ -15,13 +15,11 @@ |
15 | */ | 15 | */ |
16 | package org.onosproject.net.resource.link; | 16 | package org.onosproject.net.resource.link; |
17 | 17 | ||
18 | -import org.onosproject.net.resource.ResourceAllocation; | ||
19 | - | ||
20 | /** | 18 | /** |
21 | * Representation of allocated link resources. | 19 | * Representation of allocated link resources. |
22 | * | 20 | * |
23 | * @deprecated 1.4.0 Emu Release | 21 | * @deprecated 1.4.0 Emu Release |
24 | */ | 22 | */ |
25 | @Deprecated | 23 | @Deprecated |
26 | -public interface LinkResourceAllocations extends ResourceAllocation { | 24 | +public interface LinkResourceAllocations { |
27 | } | 25 | } | ... | ... |
1 | -/* | ||
2 | - * Copyright 2014 Open Networking Laboratory | ||
3 | - * | ||
4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | - * you may not use this file except in compliance with the License. | ||
6 | - * You may obtain a copy of the License at | ||
7 | - * | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * | ||
10 | - * Unless required by applicable law or agreed to in writing, software | ||
11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | - * See the License for the specific language governing permissions and | ||
14 | - * limitations under the License. | ||
15 | - */ | ||
16 | - | ||
17 | -/** | ||
18 | - * Abstractions for reserving network resources. | ||
19 | - * <p> | ||
20 | - * Note: Classes under the package will be removed. | ||
21 | - * Developers should not use the classes. | ||
22 | - * </p> | ||
23 | - */ | ||
24 | -package org.onosproject.net.resource; |
-
Please register or login to post a comment