Committed by
Gerrit Code Review
Move files under newresource package to resource package
Change-Id: Ifedb99be4671ada97fafe3ecfd196939207baa86
Showing
56 changed files
with
156 additions
and
195 deletions
| ... | @@ -23,6 +23,7 @@ import java.util.HashSet; | ... | @@ -23,6 +23,7 @@ import java.util.HashSet; |
| 23 | import java.util.Set; | 23 | import java.util.Set; |
| 24 | import java.util.stream.StreamSupport; | 24 | import java.util.stream.StreamSupport; |
| 25 | 25 | ||
| 26 | +import com.google.common.base.Strings; | ||
| 26 | import com.google.common.collect.ImmutableSet; | 27 | import com.google.common.collect.ImmutableSet; |
| 27 | import org.apache.karaf.shell.commands.Argument; | 28 | import org.apache.karaf.shell.commands.Argument; |
| 28 | import org.apache.karaf.shell.commands.Command; | 29 | import org.apache.karaf.shell.commands.Command; |
| ... | @@ -36,13 +37,11 @@ import org.onosproject.net.OchSignal; | ... | @@ -36,13 +37,11 @@ import org.onosproject.net.OchSignal; |
| 36 | import org.onosproject.net.Port; | 37 | import org.onosproject.net.Port; |
| 37 | import org.onosproject.net.PortNumber; | 38 | import org.onosproject.net.PortNumber; |
| 38 | import org.onosproject.net.device.DeviceService; | 39 | import org.onosproject.net.device.DeviceService; |
| 39 | -import org.onosproject.net.newresource.DiscreteResourceId; | ||
| 40 | import org.onosproject.net.intent.IntentId; | 40 | import org.onosproject.net.intent.IntentId; |
| 41 | -import org.onosproject.net.newresource.ResourceAllocation; | 41 | +import org.onosproject.net.resource.Resources; |
| 42 | -import org.onosproject.net.newresource.ResourceService; | 42 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 43 | - | 43 | +import org.onosproject.net.resource.ResourceAllocation; |
| 44 | -import com.google.common.base.Strings; | 44 | +import org.onosproject.net.resource.ResourceService; |
| 45 | -import org.onosproject.net.newresource.Resources; | ||
| 46 | 45 | ||
| 47 | /** | 46 | /** |
| 48 | * Lists allocated resources. | 47 | * Lists allocated resources. | ... | ... |
| ... | @@ -34,11 +34,11 @@ import org.onosproject.cli.AbstractShellCommand; | ... | @@ -34,11 +34,11 @@ import org.onosproject.cli.AbstractShellCommand; |
| 34 | import org.onosproject.net.DeviceId; | 34 | import org.onosproject.net.DeviceId; |
| 35 | import org.onosproject.net.PortNumber; | 35 | import org.onosproject.net.PortNumber; |
| 36 | import org.onosproject.net.TributarySlot; | 36 | import org.onosproject.net.TributarySlot; |
| 37 | -import org.onosproject.net.newresource.ContinuousResource; | 37 | +import org.onosproject.net.resource.ContinuousResource; |
| 38 | -import org.onosproject.net.newresource.DiscreteResource; | 38 | +import org.onosproject.net.resource.DiscreteResource; |
| 39 | -import org.onosproject.net.newresource.Resource; | 39 | +import org.onosproject.net.resource.Resource; |
| 40 | -import org.onosproject.net.newresource.Resources; | 40 | +import org.onosproject.net.resource.Resources; |
| 41 | -import org.onosproject.net.newresource.ResourceService; | 41 | +import org.onosproject.net.resource.ResourceService; |
| 42 | 42 | ||
| 43 | import com.google.common.base.Strings; | 43 | import com.google.common.base.Strings; |
| 44 | import com.google.common.collect.ArrayListMultimap; | 44 | import com.google.common.collect.ArrayListMultimap; | ... | ... |
| ... | @@ -27,11 +27,11 @@ import org.onosproject.net.GridType; | ... | @@ -27,11 +27,11 @@ import org.onosproject.net.GridType; |
| 27 | import org.onosproject.net.OchSignal; | 27 | import org.onosproject.net.OchSignal; |
| 28 | import org.onosproject.net.PortNumber; | 28 | import org.onosproject.net.PortNumber; |
| 29 | import org.onosproject.net.intent.IntentId; | 29 | import org.onosproject.net.intent.IntentId; |
| 30 | -import org.onosproject.net.newresource.ResourceAllocation; | 30 | +import org.onosproject.net.resource.ResourceAllocation; |
| 31 | -import org.onosproject.net.newresource.ResourceConsumer; | 31 | +import org.onosproject.net.resource.ResourceConsumer; |
| 32 | -import org.onosproject.net.newresource.Resource; | 32 | +import org.onosproject.net.resource.Resource; |
| 33 | -import org.onosproject.net.newresource.ResourceService; | 33 | +import org.onosproject.net.resource.ResourceService; |
| 34 | -import org.onosproject.net.newresource.Resources; | 34 | +import org.onosproject.net.resource.Resources; |
| 35 | 35 | ||
| 36 | /** | 36 | /** |
| 37 | * Test tool to allocate resources. | 37 | * Test tool to allocate resources. | ... | ... |
| ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent; | ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import org.onlab.util.Identifier; | 19 | import org.onlab.util.Identifier; |
| 20 | -import org.onosproject.net.newresource.ResourceConsumer; | 20 | +import org.onosproject.net.resource.ResourceConsumer; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * Intent identifier suitable as an external key. | 23 | * Intent identifier suitable as an external key. | ... | ... |
| ... | @@ -16,7 +16,7 @@ | ... | @@ -16,7 +16,7 @@ |
| 16 | package org.onosproject.net.intent; | 16 | package org.onosproject.net.intent; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | -import org.onosproject.net.newresource.Resource; | 19 | +import org.onosproject.net.resource.Resource; |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * Class providing resource information to constraints. | 22 | * Class providing resource information to constraints. | ... | ... |
| ... | @@ -21,7 +21,7 @@ import org.onlab.util.Bandwidth; | ... | @@ -21,7 +21,7 @@ import org.onlab.util.Bandwidth; |
| 21 | import org.onlab.util.DataRateUnit; | 21 | import org.onlab.util.DataRateUnit; |
| 22 | import org.onosproject.net.Link; | 22 | import org.onosproject.net.Link; |
| 23 | import org.onosproject.net.intent.ResourceContext; | 23 | import org.onosproject.net.intent.ResourceContext; |
| 24 | -import org.onosproject.net.newresource.Resources; | 24 | +import org.onosproject.net.resource.Resources; |
| 25 | 25 | ||
| 26 | import java.util.Objects; | 26 | import java.util.Objects; |
| 27 | import java.util.stream.Stream; | 27 | import java.util.stream.Stream; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import static com.google.common.base.Preconditions.checkNotNull; | 18 | import static com.google.common.base.Preconditions.checkNotNull; |
| 19 | 19 | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | 19 | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.base.MoreObjects; | 19 | import com.google.common.base.MoreObjects; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | 19 | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.base.MoreObjects; | 19 | import com.google.common.base.MoreObjects; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | 19 | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.base.MoreObjects; | 19 | import com.google.common.base.MoreObjects; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | 19 | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import org.onosproject.event.AbstractEvent; | 19 | import org.onosproject.event.AbstractEvent; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import org.onosproject.event.EventListener; | 19 | import org.onosproject.event.EventListener; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import org.onosproject.store.Store; | 19 | import org.onosproject.store.Store; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import org.onosproject.store.StoreDelegate; | 18 | import org.onosproject.store.StoreDelegate; |
| 19 | 19 | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -18,4 +18,4 @@ | ... | @@ -18,4 +18,4 @@ |
| 18 | * Generic network resource model and services for resource allocation and | 18 | * Generic network resource model and services for resource allocation and |
| 19 | * resource tracking. | 19 | * resource tracking. |
| 20 | */ | 20 | */ |
| 21 | -package org.onosproject.net.newresource; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 21 | +package org.onosproject.net.resource; | ... | ... |
| ... | @@ -35,13 +35,13 @@ import org.onosproject.net.flow.criteria.Criterion.Type; | ... | @@ -35,13 +35,13 @@ import org.onosproject.net.flow.criteria.Criterion.Type; |
| 35 | import org.onosproject.net.flow.instructions.Instruction; | 35 | import org.onosproject.net.flow.instructions.Instruction; |
| 36 | import org.onosproject.net.flow.instructions.Instructions; | 36 | import org.onosproject.net.flow.instructions.Instructions; |
| 37 | import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction; | 37 | import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction; |
| 38 | -import org.onosproject.net.newresource.DiscreteResourceId; | 38 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 39 | -import org.onosproject.net.newresource.Resource; | 39 | +import org.onosproject.net.resource.Resource; |
| 40 | -import org.onosproject.net.newresource.ResourceAllocation; | 40 | +import org.onosproject.net.resource.ResourceAllocation; |
| 41 | -import org.onosproject.net.newresource.ResourceConsumer; | 41 | +import org.onosproject.net.resource.ResourceConsumer; |
| 42 | -import org.onosproject.net.newresource.ResourceId; | 42 | +import org.onosproject.net.resource.ResourceId; |
| 43 | -import org.onosproject.net.newresource.ResourceListener; | 43 | +import org.onosproject.net.resource.ResourceListener; |
| 44 | -import org.onosproject.net.newresource.ResourceService; | 44 | +import org.onosproject.net.resource.ResourceService; |
| 45 | import org.onosproject.net.topology.DefaultTopologyEdge; | 45 | import org.onosproject.net.topology.DefaultTopologyEdge; |
| 46 | import org.onosproject.net.topology.DefaultTopologyVertex; | 46 | import org.onosproject.net.topology.DefaultTopologyVertex; |
| 47 | import org.onosproject.net.topology.LinkWeight; | 47 | import org.onosproject.net.topology.LinkWeight; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.testing.EqualsTester; | 18 | import com.google.common.testing.EqualsTester; |
| 19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.testing.EqualsTester; | 18 | import com.google.common.testing.EqualsTester; |
| 19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.testing.EqualsTester; | 18 | import com.google.common.testing.EqualsTester; |
| 19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.testing.EqualsTester; | 18 | import com.google.common.testing.EqualsTester; |
| 19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import com.google.common.testing.EqualsTester; | 18 | import com.google.common.testing.EqualsTester; |
| 19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource; | 16 | +package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | import org.junit.Test; | 18 | import org.junit.Test; |
| 19 | import org.onlab.util.Bandwidth; | 19 | import org.onlab.util.Bandwidth; | ... | ... |
| ... | @@ -44,8 +44,8 @@ import org.onosproject.net.intent.IntentStoreDelegate; | ... | @@ -44,8 +44,8 @@ import org.onosproject.net.intent.IntentStoreDelegate; |
| 44 | import org.onosproject.net.intent.Key; | 44 | import org.onosproject.net.intent.Key; |
| 45 | import org.onosproject.net.intent.impl.phase.FinalIntentProcessPhase; | 45 | import org.onosproject.net.intent.impl.phase.FinalIntentProcessPhase; |
| 46 | import org.onosproject.net.intent.impl.phase.IntentProcessPhase; | 46 | import org.onosproject.net.intent.impl.phase.IntentProcessPhase; |
| 47 | -import org.onosproject.net.newresource.ResourceService; | ||
| 48 | import org.osgi.service.component.ComponentContext; | 47 | import org.osgi.service.component.ComponentContext; |
| 48 | +import org.onosproject.net.resource.ResourceService; | ||
| 49 | import org.slf4j.Logger; | 49 | import org.slf4j.Logger; |
| 50 | 50 | ||
| 51 | import java.util.Collection; | 51 | import java.util.Collection; | ... | ... |
| ... | @@ -49,9 +49,9 @@ import org.onosproject.net.intent.IntentPartitionEvent; | ... | @@ -49,9 +49,9 @@ import org.onosproject.net.intent.IntentPartitionEvent; |
| 49 | import org.onosproject.net.intent.IntentPartitionEventListener; | 49 | import org.onosproject.net.intent.IntentPartitionEventListener; |
| 50 | import org.onosproject.net.intent.IntentPartitionService; | 50 | import org.onosproject.net.intent.IntentPartitionService; |
| 51 | import org.onosproject.net.link.LinkEvent; | 51 | import org.onosproject.net.link.LinkEvent; |
| 52 | -import org.onosproject.net.newresource.ResourceEvent; | 52 | +import org.onosproject.net.resource.ResourceEvent; |
| 53 | -import org.onosproject.net.newresource.ResourceListener; | 53 | +import org.onosproject.net.resource.ResourceListener; |
| 54 | -import org.onosproject.net.newresource.ResourceService; | 54 | +import org.onosproject.net.resource.ResourceService; |
| 55 | import org.onosproject.net.topology.TopologyEvent; | 55 | import org.onosproject.net.topology.TopologyEvent; |
| 56 | import org.onosproject.net.topology.TopologyListener; | 56 | import org.onosproject.net.topology.TopologyListener; |
| 57 | import org.onosproject.net.topology.TopologyService; | 57 | import org.onosproject.net.topology.TopologyService; | ... | ... |
| ... | @@ -27,7 +27,7 @@ import org.onosproject.net.intent.Constraint; | ... | @@ -27,7 +27,7 @@ import org.onosproject.net.intent.Constraint; |
| 27 | import org.onosproject.net.intent.IntentCompiler; | 27 | import org.onosproject.net.intent.IntentCompiler; |
| 28 | import org.onosproject.net.intent.IntentExtensionService; | 28 | import org.onosproject.net.intent.IntentExtensionService; |
| 29 | import org.onosproject.net.intent.impl.PathNotFoundException; | 29 | import org.onosproject.net.intent.impl.PathNotFoundException; |
| 30 | -import org.onosproject.net.newresource.ResourceService; | 30 | +import org.onosproject.net.resource.ResourceService; |
| 31 | import org.onosproject.net.provider.ProviderId; | 31 | import org.onosproject.net.provider.ProviderId; |
| 32 | import org.onosproject.net.topology.LinkWeight; | 32 | import org.onosproject.net.topology.LinkWeight; |
| 33 | import org.onosproject.net.topology.PathService; | 33 | import org.onosproject.net.topology.PathService; | ... | ... |
| ... | @@ -48,9 +48,10 @@ import org.onosproject.net.intent.Intent; | ... | @@ -48,9 +48,10 @@ import org.onosproject.net.intent.Intent; |
| 48 | import org.onosproject.net.intent.IntentCompiler; | 48 | import org.onosproject.net.intent.IntentCompiler; |
| 49 | import org.onosproject.net.intent.IntentExtensionService; | 49 | import org.onosproject.net.intent.IntentExtensionService; |
| 50 | import org.onosproject.net.intent.MplsPathIntent; | 50 | import org.onosproject.net.intent.MplsPathIntent; |
| 51 | -import org.onosproject.net.newresource.Resource; | 51 | +import org.onosproject.net.resource.Resource; |
| 52 | -import org.onosproject.net.newresource.ResourceService; | 52 | +import org.onosproject.net.resource.ResourceAllocation; |
| 53 | -import org.onosproject.net.newresource.Resources; | 53 | +import org.onosproject.net.resource.ResourceService; |
| 54 | +import org.onosproject.net.resource.Resources; | ||
| 54 | import org.slf4j.Logger; | 55 | import org.slf4j.Logger; |
| 55 | 56 | ||
| 56 | import java.util.Collections; | 57 | import java.util.Collections; |
| ... | @@ -134,7 +135,7 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> { | ... | @@ -134,7 +135,7 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> { |
| 134 | .resource() | 135 | .resource() |
| 135 | )) | 136 | )) |
| 136 | .collect(Collectors.toSet()); | 137 | .collect(Collectors.toSet()); |
| 137 | - List<org.onosproject.net.newresource.ResourceAllocation> allocations = | 138 | + List<ResourceAllocation> allocations = |
| 138 | resourceService.allocate(intent.id(), ImmutableList.copyOf(resources)); | 139 | resourceService.allocate(intent.id(), ImmutableList.copyOf(resources)); |
| 139 | if (allocations.isEmpty()) { | 140 | if (allocations.isEmpty()) { |
| 140 | Collections.emptyMap(); | 141 | Collections.emptyMap(); | ... | ... |
| ... | @@ -59,11 +59,11 @@ import org.onosproject.net.intent.IntentService; | ... | @@ -59,11 +59,11 @@ import org.onosproject.net.intent.IntentService; |
| 59 | import org.onosproject.net.intent.OpticalCircuitIntent; | 59 | import org.onosproject.net.intent.OpticalCircuitIntent; |
| 60 | import org.onosproject.net.intent.OpticalConnectivityIntent; | 60 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
| 61 | import org.onosproject.net.intent.impl.IntentCompilationException; | 61 | import org.onosproject.net.intent.impl.IntentCompilationException; |
| 62 | -import org.onosproject.net.newresource.ResourceAllocation; | ||
| 63 | -import org.onosproject.net.newresource.Resource; | ||
| 64 | -import org.onosproject.net.newresource.ResourceService; | ||
| 65 | -import org.onosproject.net.newresource.Resources; | ||
| 66 | import org.onosproject.net.intent.IntentSetMultimap; | 62 | import org.onosproject.net.intent.IntentSetMultimap; |
| 63 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 64 | +import org.onosproject.net.resource.Resource; | ||
| 65 | +import org.onosproject.net.resource.ResourceService; | ||
| 66 | +import org.onosproject.net.resource.Resources; | ||
| 67 | import org.osgi.service.component.ComponentContext; | 67 | import org.osgi.service.component.ComponentContext; |
| 68 | import org.slf4j.Logger; | 68 | import org.slf4j.Logger; |
| 69 | import org.slf4j.LoggerFactory; | 69 | import org.slf4j.LoggerFactory; | ... | ... |
| ... | @@ -43,10 +43,10 @@ import org.onosproject.net.intent.IntentExtensionService; | ... | @@ -43,10 +43,10 @@ import org.onosproject.net.intent.IntentExtensionService; |
| 43 | import org.onosproject.net.intent.OpticalConnectivityIntent; | 43 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
| 44 | import org.onosproject.net.intent.OpticalPathIntent; | 44 | import org.onosproject.net.intent.OpticalPathIntent; |
| 45 | import org.onosproject.net.intent.impl.IntentCompilationException; | 45 | import org.onosproject.net.intent.impl.IntentCompilationException; |
| 46 | -import org.onosproject.net.newresource.ResourceAllocation; | 46 | +import org.onosproject.net.resource.ResourceAllocation; |
| 47 | -import org.onosproject.net.newresource.Resource; | 47 | +import org.onosproject.net.resource.Resource; |
| 48 | -import org.onosproject.net.newresource.ResourceService; | 48 | +import org.onosproject.net.resource.ResourceService; |
| 49 | -import org.onosproject.net.newresource.Resources; | 49 | +import org.onosproject.net.resource.Resources; |
| 50 | import org.onosproject.net.topology.LinkWeight; | 50 | import org.onosproject.net.topology.LinkWeight; |
| 51 | import org.onosproject.net.topology.Topology; | 51 | import org.onosproject.net.topology.Topology; |
| 52 | import org.onosproject.net.topology.TopologyService; | 52 | import org.onosproject.net.topology.TopologyService; | ... | ... |
| ... | @@ -46,10 +46,10 @@ import org.onosproject.net.flow.instructions.L2ModificationInstruction; | ... | @@ -46,10 +46,10 @@ import org.onosproject.net.flow.instructions.L2ModificationInstruction; |
| 46 | import org.onosproject.net.intent.PathIntent; | 46 | import org.onosproject.net.intent.PathIntent; |
| 47 | import org.onosproject.net.intent.constraint.EncapsulationConstraint; | 47 | import org.onosproject.net.intent.constraint.EncapsulationConstraint; |
| 48 | import org.onosproject.net.intent.impl.IntentCompilationException; | 48 | import org.onosproject.net.intent.impl.IntentCompilationException; |
| 49 | -import org.onosproject.net.newresource.Resource; | 49 | +import org.onosproject.net.resource.Resource; |
| 50 | -import org.onosproject.net.newresource.ResourceAllocation; | 50 | +import org.onosproject.net.resource.ResourceAllocation; |
| 51 | -import org.onosproject.net.newresource.ResourceService; | 51 | +import org.onosproject.net.resource.ResourceService; |
| 52 | -import org.onosproject.net.newresource.Resources; | 52 | +import org.onosproject.net.resource.Resources; |
| 53 | import org.slf4j.Logger; | 53 | import org.slf4j.Logger; |
| 54 | 54 | ||
| 55 | import com.google.common.collect.ImmutableList; | 55 | import com.google.common.collect.ImmutableList; |
| ... | @@ -112,7 +112,7 @@ public class PathCompiler<T> { | ... | @@ -112,7 +112,7 @@ public class PathCompiler<T> { |
| 112 | .resource() | 112 | .resource() |
| 113 | )) | 113 | )) |
| 114 | .collect(Collectors.toSet()); | 114 | .collect(Collectors.toSet()); |
| 115 | - List<org.onosproject.net.newresource.ResourceAllocation> allocations = | 115 | + List<ResourceAllocation> allocations = |
| 116 | creator.resourceService().allocate(intent.id(), ImmutableList.copyOf(resources)); | 116 | creator.resourceService().allocate(intent.id(), ImmutableList.copyOf(resources)); |
| 117 | if (allocations.isEmpty()) { | 117 | if (allocations.isEmpty()) { |
| 118 | Collections.emptyMap(); | 118 | Collections.emptyMap(); | ... | ... |
| ... | @@ -35,7 +35,7 @@ import org.onosproject.net.intent.FlowRuleIntent; | ... | @@ -35,7 +35,7 @@ import org.onosproject.net.intent.FlowRuleIntent; |
| 35 | import org.onosproject.net.intent.Intent; | 35 | import org.onosproject.net.intent.Intent; |
| 36 | import org.onosproject.net.intent.IntentCompiler; | 36 | import org.onosproject.net.intent.IntentCompiler; |
| 37 | import org.onosproject.net.intent.PathIntent; | 37 | import org.onosproject.net.intent.PathIntent; |
| 38 | -import org.onosproject.net.newresource.ResourceService; | 38 | +import org.onosproject.net.resource.ResourceService; |
| 39 | import org.slf4j.Logger; | 39 | import org.slf4j.Logger; |
| 40 | 40 | ||
| 41 | import java.util.LinkedList; | 41 | import java.util.LinkedList; | ... | ... |
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentFlowObjectiveCompiler.java
| ... | @@ -38,7 +38,7 @@ import org.onosproject.net.intent.FlowObjectiveIntent; | ... | @@ -38,7 +38,7 @@ import org.onosproject.net.intent.FlowObjectiveIntent; |
| 38 | import org.onosproject.net.intent.Intent; | 38 | import org.onosproject.net.intent.Intent; |
| 39 | import org.onosproject.net.intent.IntentCompiler; | 39 | import org.onosproject.net.intent.IntentCompiler; |
| 40 | import org.onosproject.net.intent.PathIntent; | 40 | import org.onosproject.net.intent.PathIntent; |
| 41 | -import org.onosproject.net.newresource.ResourceService; | 41 | +import org.onosproject.net.resource.ResourceService; |
| 42 | import org.slf4j.Logger; | 42 | import org.slf4j.Logger; |
| 43 | 43 | ||
| 44 | import com.google.common.collect.ImmutableList; | 44 | import com.google.common.collect.ImmutableList; | ... | ... |
| 1 | -/* | ||
| 2 | - * Copyright 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 | - | ||
| 17 | -/** | ||
| 18 | - * Implementation of the generic network resource subsystem. | ||
| 19 | - */ | ||
| 20 | -package org.onosproject.net.newresource.impl; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource.impl; | 16 | +package org.onosproject.net.resource.impl; |
| 17 | 17 | ||
| 18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
| 19 | import com.google.common.collect.Lists; | 19 | import com.google.common.collect.Lists; |
| ... | @@ -39,12 +39,12 @@ import org.onosproject.net.device.DeviceListener; | ... | @@ -39,12 +39,12 @@ import org.onosproject.net.device.DeviceListener; |
| 39 | import org.onosproject.net.device.DeviceService; | 39 | import org.onosproject.net.device.DeviceService; |
| 40 | import org.onosproject.net.driver.DriverHandler; | 40 | import org.onosproject.net.driver.DriverHandler; |
| 41 | import org.onosproject.net.driver.DriverService; | 41 | import org.onosproject.net.driver.DriverService; |
| 42 | -import org.onosproject.net.newresource.DiscreteResource; | 42 | +import org.onosproject.net.resource.DiscreteResource; |
| 43 | -import org.onosproject.net.newresource.ResourceAdminService; | 43 | +import org.onosproject.net.resource.ResourceAdminService; |
| 44 | -import org.onosproject.net.newresource.BandwidthCapacity; | 44 | +import org.onosproject.net.resource.BandwidthCapacity; |
| 45 | -import org.onosproject.net.newresource.Resource; | 45 | +import org.onosproject.net.resource.Resource; |
| 46 | -import org.onosproject.net.newresource.Resources; | 46 | +import org.onosproject.net.resource.Resources; |
| 47 | -import org.onosproject.net.newresource.ResourceService; | 47 | +import org.onosproject.net.resource.ResourceService; |
| 48 | import org.slf4j.Logger; | 48 | import org.slf4j.Logger; |
| 49 | import org.slf4j.LoggerFactory; | 49 | import org.slf4j.LoggerFactory; |
| 50 | 50 | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource.impl; | 16 | +package org.onosproject.net.resource.impl; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; |
| ... | @@ -26,17 +26,17 @@ import org.apache.felix.scr.annotations.Service; | ... | @@ -26,17 +26,17 @@ import org.apache.felix.scr.annotations.Service; |
| 26 | import org.onlab.util.GuavaCollectors; | 26 | import org.onlab.util.GuavaCollectors; |
| 27 | import org.onlab.util.Tools; | 27 | import org.onlab.util.Tools; |
| 28 | import org.onosproject.event.AbstractListenerManager; | 28 | import org.onosproject.event.AbstractListenerManager; |
| 29 | -import org.onosproject.net.newresource.DiscreteResourceId; | 29 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 30 | -import org.onosproject.net.newresource.ResourceAdminService; | 30 | +import org.onosproject.net.resource.ResourceAdminService; |
| 31 | -import org.onosproject.net.newresource.ResourceAllocation; | 31 | +import org.onosproject.net.resource.ResourceAllocation; |
| 32 | -import org.onosproject.net.newresource.ResourceConsumer; | 32 | +import org.onosproject.net.resource.ResourceConsumer; |
| 33 | -import org.onosproject.net.newresource.ResourceEvent; | 33 | +import org.onosproject.net.resource.ResourceEvent; |
| 34 | -import org.onosproject.net.newresource.ResourceId; | 34 | +import org.onosproject.net.resource.ResourceId; |
| 35 | -import org.onosproject.net.newresource.ResourceListener; | 35 | +import org.onosproject.net.resource.ResourceListener; |
| 36 | -import org.onosproject.net.newresource.ResourceService; | 36 | +import org.onosproject.net.resource.ResourceService; |
| 37 | -import org.onosproject.net.newresource.Resource; | 37 | +import org.onosproject.net.resource.Resource; |
| 38 | -import org.onosproject.net.newresource.ResourceStore; | 38 | +import org.onosproject.net.resource.ResourceStore; |
| 39 | -import org.onosproject.net.newresource.ResourceStoreDelegate; | 39 | +import org.onosproject.net.resource.ResourceStoreDelegate; |
| 40 | import org.slf4j.Logger; | 40 | import org.slf4j.Logger; |
| 41 | 41 | ||
| 42 | import java.util.Collection; | 42 | import java.util.Collection; | ... | ... |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource.impl; | 16 | +package org.onosproject.net.resource.impl; |
| 17 | 17 | ||
| 18 | import static com.google.common.base.Preconditions.checkArgument; | 18 | import static com.google.common.base.Preconditions.checkArgument; |
| 19 | import static com.google.common.base.Preconditions.checkNotNull; | 19 | import static com.google.common.base.Preconditions.checkNotNull; |
| ... | @@ -28,9 +28,9 @@ import org.onosproject.net.ConnectPoint; | ... | @@ -28,9 +28,9 @@ import org.onosproject.net.ConnectPoint; |
| 28 | import org.onosproject.net.config.NetworkConfigEvent; | 28 | import org.onosproject.net.config.NetworkConfigEvent; |
| 29 | import org.onosproject.net.config.NetworkConfigListener; | 29 | import org.onosproject.net.config.NetworkConfigListener; |
| 30 | import org.onosproject.net.config.NetworkConfigService; | 30 | import org.onosproject.net.config.NetworkConfigService; |
| 31 | -import org.onosproject.net.newresource.BandwidthCapacity; | 31 | +import org.onosproject.net.resource.BandwidthCapacity; |
| 32 | -import org.onosproject.net.newresource.ResourceAdminService; | 32 | +import org.onosproject.net.resource.ResourceAdminService; |
| 33 | -import org.onosproject.net.newresource.Resources; | 33 | +import org.onosproject.net.resource.Resources; |
| 34 | import org.slf4j.Logger; | 34 | import org.slf4j.Logger; |
| 35 | 35 | ||
| 36 | import com.google.common.annotations.Beta; | 36 | import com.google.common.annotations.Beta; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2015 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.net.newresource.impl; | 16 | +package org.onosproject.net.resource.impl; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; |
| ... | @@ -31,9 +31,9 @@ import org.onosproject.net.config.NetworkConfigRegistry; | ... | @@ -31,9 +31,9 @@ import org.onosproject.net.config.NetworkConfigRegistry; |
| 31 | import org.onosproject.net.device.DeviceListener; | 31 | import org.onosproject.net.device.DeviceListener; |
| 32 | import org.onosproject.net.device.DeviceService; | 32 | import org.onosproject.net.device.DeviceService; |
| 33 | import org.onosproject.net.driver.DriverService; | 33 | import org.onosproject.net.driver.DriverService; |
| 34 | -import org.onosproject.net.newresource.BandwidthCapacity; | 34 | +import org.onosproject.net.resource.BandwidthCapacity; |
| 35 | -import org.onosproject.net.newresource.ResourceAdminService; | 35 | +import org.onosproject.net.resource.ResourceAdminService; |
| 36 | -import org.onosproject.net.newresource.ResourceService; | 36 | +import org.onosproject.net.resource.ResourceService; |
| 37 | import org.slf4j.Logger; | 37 | import org.slf4j.Logger; |
| 38 | 38 | ||
| 39 | import java.util.List; | 39 | import java.util.List; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2014 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -15,6 +15,6 @@ | ... | @@ -15,6 +15,6 @@ |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | /** | 17 | /** |
| 18 | - * Services for reserving network resources, e.g. bandwidth, lambdas. | 18 | + * Implementation of the generic network resource subsystem. |
| 19 | */ | 19 | */ |
| 20 | package org.onosproject.net.resource.impl; | 20 | package org.onosproject.net.resource.impl; | ... | ... |
| ... | @@ -39,9 +39,9 @@ import org.onosproject.net.intent.Intent; | ... | @@ -39,9 +39,9 @@ import org.onosproject.net.intent.Intent; |
| 39 | import org.onosproject.net.intent.Key; | 39 | import org.onosproject.net.intent.Key; |
| 40 | import org.onosproject.net.intent.MockIdGenerator; | 40 | import org.onosproject.net.intent.MockIdGenerator; |
| 41 | import org.onosproject.net.link.LinkEvent; | 41 | import org.onosproject.net.link.LinkEvent; |
| 42 | -import org.onosproject.net.newresource.ResourceEvent; | 42 | +import org.onosproject.net.resource.ResourceEvent; |
| 43 | -import org.onosproject.net.newresource.ResourceListener; | 43 | +import org.onosproject.net.resource.ResourceListener; |
| 44 | -import org.onosproject.net.newresource.Resources; | 44 | +import org.onosproject.net.resource.Resources; |
| 45 | import org.onosproject.net.topology.Topology; | 45 | import org.onosproject.net.topology.Topology; |
| 46 | import org.onosproject.net.topology.TopologyEvent; | 46 | import org.onosproject.net.topology.TopologyEvent; |
| 47 | import org.onosproject.net.topology.TopologyListener; | 47 | import org.onosproject.net.topology.TopologyListener; |
| ... | @@ -54,7 +54,7 @@ import static org.hamcrest.MatcherAssert.assertThat; | ... | @@ -54,7 +54,7 @@ import static org.hamcrest.MatcherAssert.assertThat; |
| 54 | import static org.hamcrest.Matchers.equalTo; | 54 | import static org.hamcrest.Matchers.equalTo; |
| 55 | import static org.hamcrest.Matchers.hasSize; | 55 | import static org.hamcrest.Matchers.hasSize; |
| 56 | import static org.hamcrest.Matchers.is; | 56 | import static org.hamcrest.Matchers.is; |
| 57 | -import static org.onosproject.net.newresource.ResourceEvent.Type.*; | 57 | +import static org.onosproject.net.resource.ResourceEvent.Type.*; |
| 58 | import static org.onosproject.net.NetTestTools.APP_ID; | 58 | import static org.onosproject.net.NetTestTools.APP_ID; |
| 59 | import static org.onosproject.net.NetTestTools.device; | 59 | import static org.onosproject.net.NetTestTools.device; |
| 60 | import static org.onosproject.net.NetTestTools.link; | 60 | import static org.onosproject.net.NetTestTools.link; | ... | ... |
| ... | @@ -22,16 +22,16 @@ import org.onlab.packet.MplsLabel; | ... | @@ -22,16 +22,16 @@ import org.onlab.packet.MplsLabel; |
| 22 | import org.onlab.packet.VlanId; | 22 | import org.onlab.packet.VlanId; |
| 23 | import org.onlab.util.Tools; | 23 | import org.onlab.util.Tools; |
| 24 | import org.onosproject.net.TributarySlot; | 24 | import org.onosproject.net.TributarySlot; |
| 25 | -import org.onosproject.net.newresource.ContinuousResourceId; | 25 | +import org.onosproject.net.resource.ContinuousResourceId; |
| 26 | -import org.onosproject.net.newresource.DiscreteResource; | 26 | +import org.onosproject.net.resource.DiscreteResource; |
| 27 | -import org.onosproject.net.newresource.DiscreteResourceId; | 27 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 28 | -import org.onosproject.net.newresource.ResourceAllocation; | 28 | +import org.onosproject.net.resource.ResourceAllocation; |
| 29 | -import org.onosproject.net.newresource.ResourceConsumer; | 29 | +import org.onosproject.net.resource.ResourceConsumer; |
| 30 | -import org.onosproject.net.newresource.ResourceId; | 30 | +import org.onosproject.net.resource.ResourceId; |
| 31 | -import org.onosproject.net.newresource.ResourceListener; | 31 | +import org.onosproject.net.resource.ResourceListener; |
| 32 | -import org.onosproject.net.newresource.Resource; | 32 | +import org.onosproject.net.resource.Resource; |
| 33 | -import org.onosproject.net.newresource.ResourceService; | 33 | +import org.onosproject.net.resource.ResourceService; |
| 34 | -import org.onosproject.net.newresource.Resources; | 34 | +import org.onosproject.net.resource.Resources; |
| 35 | 35 | ||
| 36 | import java.util.Collection; | 36 | import java.util.Collection; |
| 37 | import java.util.HashMap; | 37 | import java.util.HashMap; | ... | ... |
| ... | @@ -33,7 +33,7 @@ import org.onosproject.net.intent.PathIntent; | ... | @@ -33,7 +33,7 @@ import org.onosproject.net.intent.PathIntent; |
| 33 | import org.onosproject.net.intent.PointToPointIntent; | 33 | import org.onosproject.net.intent.PointToPointIntent; |
| 34 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 34 | import org.onosproject.net.intent.constraint.BandwidthConstraint; |
| 35 | import org.onosproject.net.intent.impl.PathNotFoundException; | 35 | import org.onosproject.net.intent.impl.PathNotFoundException; |
| 36 | -import org.onosproject.net.newresource.ResourceService; | 36 | +import org.onosproject.net.resource.ResourceService; |
| 37 | 37 | ||
| 38 | import java.util.Collections; | 38 | import java.util.Collections; |
| 39 | import java.util.List; | 39 | import java.util.List; | ... | ... |
| ... | @@ -33,8 +33,8 @@ import org.onosproject.net.config.NetworkConfigService; | ... | @@ -33,8 +33,8 @@ import org.onosproject.net.config.NetworkConfigService; |
| 33 | import org.onosproject.net.edge.EdgePortService; | 33 | import org.onosproject.net.edge.EdgePortService; |
| 34 | import org.onosproject.net.key.DeviceKeyAdminService; | 34 | import org.onosproject.net.key.DeviceKeyAdminService; |
| 35 | import org.onosproject.net.key.DeviceKeyService; | 35 | import org.onosproject.net.key.DeviceKeyService; |
| 36 | -import org.onosproject.net.newresource.ResourceAdminService; | 36 | +import org.onosproject.net.resource.ResourceAdminService; |
| 37 | -import org.onosproject.net.newresource.ResourceService; | 37 | +import org.onosproject.net.resource.ResourceService; |
| 38 | import org.onosproject.net.region.RegionAdminService; | 38 | import org.onosproject.net.region.RegionAdminService; |
| 39 | import org.onosproject.net.region.RegionService; | 39 | import org.onosproject.net.region.RegionService; |
| 40 | import org.onosproject.net.statistic.FlowStatisticService; | 40 | import org.onosproject.net.statistic.FlowStatisticService; | ... | ... |
core/store/dist/src/main/java/org/onosproject/store/newresource/impl/package-info.java
deleted
100644 → 0
| 1 | -/* | ||
| 2 | - * Copyright 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 | - | ||
| 17 | -/** | ||
| 18 | - * Implementation of the network resource distributed store. | ||
| 19 | - */ | ||
| 20 | -package org.onosproject.store.newresource.impl; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.store.newresource.impl; | 16 | +package org.onosproject.store.resource.impl; |
| 17 | 17 | ||
| 18 | import com.google.common.annotations.Beta; | 18 | import com.google.common.annotations.Beta; |
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; |
| ... | @@ -27,18 +27,18 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; | ... | @@ -27,18 +27,18 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; |
| 27 | import org.apache.felix.scr.annotations.Service; | 27 | import org.apache.felix.scr.annotations.Service; |
| 28 | import org.onlab.util.GuavaCollectors; | 28 | import org.onlab.util.GuavaCollectors; |
| 29 | import org.onlab.util.Tools; | 29 | import org.onlab.util.Tools; |
| 30 | -import org.onosproject.net.newresource.ContinuousResource; | 30 | +import org.onosproject.net.resource.ContinuousResource; |
| 31 | -import org.onosproject.net.newresource.ContinuousResourceId; | 31 | +import org.onosproject.net.resource.ContinuousResourceId; |
| 32 | -import org.onosproject.net.newresource.DiscreteResource; | 32 | +import org.onosproject.net.resource.DiscreteResource; |
| 33 | -import org.onosproject.net.newresource.DiscreteResourceId; | 33 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 34 | -import org.onosproject.net.newresource.ResourceAllocation; | 34 | +import org.onosproject.net.resource.ResourceAllocation; |
| 35 | -import org.onosproject.net.newresource.ResourceConsumer; | 35 | +import org.onosproject.net.resource.ResourceConsumer; |
| 36 | -import org.onosproject.net.newresource.ResourceEvent; | 36 | +import org.onosproject.net.resource.ResourceEvent; |
| 37 | -import org.onosproject.net.newresource.ResourceId; | 37 | +import org.onosproject.net.resource.ResourceId; |
| 38 | -import org.onosproject.net.newresource.Resource; | 38 | +import org.onosproject.net.resource.Resource; |
| 39 | -import org.onosproject.net.newresource.ResourceStore; | 39 | +import org.onosproject.net.resource.ResourceStore; |
| 40 | -import org.onosproject.net.newresource.ResourceStoreDelegate; | 40 | +import org.onosproject.net.resource.ResourceStoreDelegate; |
| 41 | -import org.onosproject.net.newresource.Resources; | 41 | +import org.onosproject.net.resource.Resources; |
| 42 | import org.onosproject.store.AbstractStore; | 42 | import org.onosproject.store.AbstractStore; |
| 43 | import org.onosproject.store.serializers.KryoNamespaces; | 43 | import org.onosproject.store.serializers.KryoNamespaces; |
| 44 | import org.onosproject.store.service.ConsistentMap; | 44 | import org.onosproject.store.service.ConsistentMap; |
| ... | @@ -64,7 +64,7 @@ import java.util.stream.Stream; | ... | @@ -64,7 +64,7 @@ import java.util.stream.Stream; |
| 64 | 64 | ||
| 65 | import static com.google.common.base.Preconditions.checkArgument; | 65 | import static com.google.common.base.Preconditions.checkArgument; |
| 66 | import static com.google.common.base.Preconditions.checkNotNull; | 66 | import static com.google.common.base.Preconditions.checkNotNull; |
| 67 | -import static org.onosproject.net.newresource.ResourceEvent.Type.*; | 67 | +import static org.onosproject.net.resource.ResourceEvent.Type.*; |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * Implementation of ResourceStore using TransactionalMap. | 70 | * Implementation of ResourceStore using TransactionalMap. | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2014 Open Networking Laboratory | 2 | + * Copyright 2015-2016 Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -15,6 +15,6 @@ | ... | @@ -15,6 +15,6 @@ |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | /** | 17 | /** |
| 18 | - * Implementation of distributed packet store. | 18 | + * Implementation of the network resource distributed store. |
| 19 | */ | 19 | */ |
| 20 | package org.onosproject.store.resource.impl; | 20 | package org.onosproject.store.resource.impl; | ... | ... |
| ... | @@ -179,11 +179,11 @@ import org.onosproject.net.intent.constraint.PartialFailureConstraint; | ... | @@ -179,11 +179,11 @@ import org.onosproject.net.intent.constraint.PartialFailureConstraint; |
| 179 | import org.onosproject.net.intent.constraint.WaypointConstraint; | 179 | import org.onosproject.net.intent.constraint.WaypointConstraint; |
| 180 | import org.onosproject.net.link.DefaultLinkDescription; | 180 | import org.onosproject.net.link.DefaultLinkDescription; |
| 181 | import org.onosproject.net.meter.MeterId; | 181 | import org.onosproject.net.meter.MeterId; |
| 182 | -import org.onosproject.net.newresource.ContinuousResource; | 182 | +import org.onosproject.net.resource.ContinuousResource; |
| 183 | -import org.onosproject.net.newresource.ContinuousResourceId; | 183 | +import org.onosproject.net.resource.ContinuousResourceId; |
| 184 | -import org.onosproject.net.newresource.DiscreteResource; | 184 | +import org.onosproject.net.resource.DiscreteResource; |
| 185 | -import org.onosproject.net.newresource.DiscreteResourceId; | 185 | +import org.onosproject.net.resource.DiscreteResourceId; |
| 186 | -import org.onosproject.net.newresource.ResourceAllocation; | 186 | +import org.onosproject.net.resource.ResourceAllocation; |
| 187 | import org.onosproject.net.packet.DefaultOutboundPacket; | 187 | import org.onosproject.net.packet.DefaultOutboundPacket; |
| 188 | import org.onosproject.net.packet.DefaultPacketRequest; | 188 | import org.onosproject.net.packet.DefaultPacketRequest; |
| 189 | import org.onosproject.net.packet.PacketPriority; | 189 | import org.onosproject.net.packet.PacketPriority; | ... | ... |
| ... | @@ -62,7 +62,8 @@ import org.onosproject.net.flow.FlowId; | ... | @@ -62,7 +62,8 @@ import org.onosproject.net.flow.FlowId; |
| 62 | import org.onosproject.net.flow.FlowRule; | 62 | import org.onosproject.net.flow.FlowRule; |
| 63 | import org.onosproject.net.flow.FlowRuleBatchEntry; | 63 | import org.onosproject.net.flow.FlowRuleBatchEntry; |
| 64 | import org.onosproject.net.intent.IntentId; | 64 | import org.onosproject.net.intent.IntentId; |
| 65 | -import org.onosproject.net.newresource.Resources; | 65 | +import org.onosproject.net.resource.ResourceAllocation; |
| 66 | +import org.onosproject.net.resource.Resources; | ||
| 66 | import org.onosproject.net.provider.ProviderId; | 67 | import org.onosproject.net.provider.ProviderId; |
| 67 | import org.onosproject.net.intent.constraint.AnnotationConstraint; | 68 | import org.onosproject.net.intent.constraint.AnnotationConstraint; |
| 68 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 69 | import org.onosproject.net.intent.constraint.BandwidthConstraint; |
| ... | @@ -366,7 +367,7 @@ public class KryoSerializerTest { | ... | @@ -366,7 +367,7 @@ public class KryoSerializerTest { |
| 366 | 367 | ||
| 367 | @Test | 368 | @Test |
| 368 | public void testResourceAllocation() { | 369 | public void testResourceAllocation() { |
| 369 | - testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation( | 370 | + testSerializedEquals(new ResourceAllocation( |
| 370 | Resources.discrete(DID1, P1, VLAN1).resource(), | 371 | Resources.discrete(DID1, P1, VLAN1).resource(), |
| 371 | IntentId.valueOf(30))); | 372 | IntentId.valueOf(30))); |
| 372 | } | 373 | } | ... | ... |
-
Please register or login to post a comment