Committed by
Gerrit Code Review
Moving LabelResourceManager to incubator
Breaking apart resource package into {device, link, label}
Refactored cluster serializers so they are visible
Change-Id: I71051bcd5e790ae6abeb154bf58286e584c32858
Showing
115 changed files
with
239 additions
and
214 deletions
| ... | @@ -43,8 +43,8 @@ import org.onosproject.net.intent.IntentService; | ... | @@ -43,8 +43,8 @@ import org.onosproject.net.intent.IntentService; |
| 43 | import org.onosproject.net.intent.IntentState; | 43 | import org.onosproject.net.intent.IntentState; |
| 44 | import org.onosproject.net.intent.OpticalConnectivityIntent; | 44 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
| 45 | import org.onosproject.net.intent.PointToPointIntent; | 45 | import org.onosproject.net.intent.PointToPointIntent; |
| 46 | -import org.onosproject.net.resource.DeviceResourceService; | 46 | +import org.onosproject.net.resource.device.DeviceResourceService; |
| 47 | -import org.onosproject.net.resource.LinkResourceService; | 47 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 48 | import org.onosproject.net.topology.LinkWeight; | 48 | import org.onosproject.net.topology.LinkWeight; |
| 49 | import org.onosproject.net.topology.PathService; | 49 | import org.onosproject.net.topology.PathService; |
| 50 | import org.onosproject.net.topology.TopologyEdge; | 50 | import org.onosproject.net.topology.TopologyEdge; | ... | ... |
| ... | @@ -6,9 +6,9 @@ import java.util.Iterator; | ... | @@ -6,9 +6,9 @@ import java.util.Iterator; |
| 6 | import org.apache.karaf.shell.commands.Argument; | 6 | import org.apache.karaf.shell.commands.Argument; |
| 7 | import org.apache.karaf.shell.commands.Command; | 7 | import org.apache.karaf.shell.commands.Command; |
| 8 | import org.onosproject.cli.AbstractShellCommand; | 8 | import org.onosproject.cli.AbstractShellCommand; |
| 9 | -import org.onosproject.net.resource.DefaultLabelResource; | 9 | +import org.onosproject.incubator.net.resource.label.DefaultLabelResource; |
| 10 | -import org.onosproject.net.resource.LabelResource; | 10 | +import org.onosproject.incubator.net.resource.label.LabelResource; |
| 11 | -import org.onosproject.net.resource.LabelResourceService; | 11 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 12 | 12 | ||
| 13 | @Command(scope = "onos", name = "apply-global-label-resource-pool", | 13 | @Command(scope = "onos", name = "apply-global-label-resource-pool", |
| 14 | description = "Apply global labels from global resource pool") | 14 | description = "Apply global labels from global resource pool") | ... | ... |
| ... | @@ -7,9 +7,9 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -7,9 +7,9 @@ import org.apache.karaf.shell.commands.Argument; |
| 7 | import org.apache.karaf.shell.commands.Command; | 7 | import org.apache.karaf.shell.commands.Command; |
| 8 | import org.onosproject.cli.AbstractShellCommand; | 8 | import org.onosproject.cli.AbstractShellCommand; |
| 9 | import org.onosproject.net.DeviceId; | 9 | import org.onosproject.net.DeviceId; |
| 10 | -import org.onosproject.net.resource.DefaultLabelResource; | 10 | +import org.onosproject.incubator.net.resource.label.DefaultLabelResource; |
| 11 | -import org.onosproject.net.resource.LabelResource; | 11 | +import org.onosproject.incubator.net.resource.label.LabelResource; |
| 12 | -import org.onosproject.net.resource.LabelResourceService; | 12 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 13 | 13 | ||
| 14 | @Command(scope = "onos", name = "apply-label-resource-pool", | 14 | @Command(scope = "onos", name = "apply-label-resource-pool", |
| 15 | description = "Apply label resource from device pool by specific device id") | 15 | description = "Apply label resource from device pool by specific device id") | ... | ... |
| ... | @@ -39,7 +39,7 @@ import org.onosproject.net.intent.Key; | ... | @@ -39,7 +39,7 @@ import org.onosproject.net.intent.Key; |
| 39 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 39 | import org.onosproject.net.intent.constraint.BandwidthConstraint; |
| 40 | import org.onosproject.net.intent.constraint.LambdaConstraint; | 40 | import org.onosproject.net.intent.constraint.LambdaConstraint; |
| 41 | import org.onosproject.net.intent.constraint.LinkTypeConstraint; | 41 | import org.onosproject.net.intent.constraint.LinkTypeConstraint; |
| 42 | -import org.onosproject.net.resource.BandwidthResource; | 42 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 43 | import org.onlab.packet.IpPrefix; | 43 | import org.onlab.packet.IpPrefix; |
| 44 | import org.onlab.packet.MacAddress; | 44 | import org.onlab.packet.MacAddress; |
| 45 | 45 | ... | ... |
| ... | @@ -3,8 +3,8 @@ package org.onosproject.cli.net; | ... | @@ -3,8 +3,8 @@ package org.onosproject.cli.net; |
| 3 | import org.apache.karaf.shell.commands.Argument; | 3 | import org.apache.karaf.shell.commands.Argument; |
| 4 | import org.apache.karaf.shell.commands.Command; | 4 | import org.apache.karaf.shell.commands.Command; |
| 5 | import org.onosproject.cli.AbstractShellCommand; | 5 | import org.onosproject.cli.AbstractShellCommand; |
| 6 | -import org.onosproject.net.resource.LabelResourceAdminService; | 6 | +import org.onosproject.incubator.net.resource.label.LabelResourceAdminService; |
| 7 | -import org.onosproject.net.resource.LabelResourceId; | 7 | +import org.onosproject.incubator.net.resource.label.LabelResourceId; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | * create label resource pool by specific device id. | 10 | * create label resource pool by specific device id. | ... | ... |
| ... | @@ -4,8 +4,8 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -4,8 +4,8 @@ import org.apache.karaf.shell.commands.Argument; |
| 4 | import org.apache.karaf.shell.commands.Command; | 4 | import org.apache.karaf.shell.commands.Command; |
| 5 | import org.onosproject.cli.AbstractShellCommand; | 5 | import org.onosproject.cli.AbstractShellCommand; |
| 6 | import org.onosproject.net.DeviceId; | 6 | import org.onosproject.net.DeviceId; |
| 7 | -import org.onosproject.net.resource.LabelResourceAdminService; | 7 | +import org.onosproject.incubator.net.resource.label.LabelResourceAdminService; |
| 8 | -import org.onosproject.net.resource.LabelResourceId; | 8 | +import org.onosproject.incubator.net.resource.label.LabelResourceId; |
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | * create label resource pool by specific device id. | 11 | * create label resource pool by specific device id. | ... | ... |
| ... | @@ -2,7 +2,7 @@ package org.onosproject.cli.net; | ... | @@ -2,7 +2,7 @@ package org.onosproject.cli.net; |
| 2 | 2 | ||
| 3 | import org.apache.karaf.shell.commands.Command; | 3 | import org.apache.karaf.shell.commands.Command; |
| 4 | import org.onosproject.cli.AbstractShellCommand; | 4 | import org.onosproject.cli.AbstractShellCommand; |
| 5 | -import org.onosproject.net.resource.LabelResourceAdminService; | 5 | +import org.onosproject.incubator.net.resource.label.LabelResourceAdminService; |
| 6 | 6 | ||
| 7 | @Command(scope = "onos", name = "destroy-global-label-resource-pool", | 7 | @Command(scope = "onos", name = "destroy-global-label-resource-pool", |
| 8 | description = "Destroys global label resource pool") | 8 | description = "Destroys global label resource pool") | ... | ... |
| ... | @@ -4,7 +4,7 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -4,7 +4,7 @@ import org.apache.karaf.shell.commands.Argument; |
| 4 | import org.apache.karaf.shell.commands.Command; | 4 | import org.apache.karaf.shell.commands.Command; |
| 5 | import org.onosproject.cli.AbstractShellCommand; | 5 | import org.onosproject.cli.AbstractShellCommand; |
| 6 | import org.onosproject.net.DeviceId; | 6 | import org.onosproject.net.DeviceId; |
| 7 | -import org.onosproject.net.resource.LabelResourceAdminService; | 7 | +import org.onosproject.incubator.net.resource.label.LabelResourceAdminService; |
| 8 | 8 | ||
| 9 | @Command(scope = "onos", name = "destroy-label-resource-pool", | 9 | @Command(scope = "onos", name = "destroy-label-resource-pool", |
| 10 | description = "Destroys label resource pool by a specific device id") | 10 | description = "Destroys label resource pool by a specific device id") | ... | ... |
| ... | @@ -2,8 +2,8 @@ package org.onosproject.cli.net; | ... | @@ -2,8 +2,8 @@ package org.onosproject.cli.net; |
| 2 | 2 | ||
| 3 | import org.apache.karaf.shell.commands.Command; | 3 | import org.apache.karaf.shell.commands.Command; |
| 4 | import org.onosproject.cli.AbstractShellCommand; | 4 | import org.onosproject.cli.AbstractShellCommand; |
| 5 | -import org.onosproject.net.resource.LabelResourcePool; | 5 | +import org.onosproject.incubator.net.resource.label.LabelResourcePool; |
| 6 | -import org.onosproject.net.resource.LabelResourceService; | 6 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 7 | 7 | ||
| 8 | @Command(scope = "onos", name = "get-global-label-resource-pool", | 8 | @Command(scope = "onos", name = "get-global-label-resource-pool", |
| 9 | description = "Gets global label resource pool information.") | 9 | description = "Gets global label resource pool information.") | ... | ... |
| ... | @@ -4,8 +4,8 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -4,8 +4,8 @@ import org.apache.karaf.shell.commands.Argument; |
| 4 | import org.apache.karaf.shell.commands.Command; | 4 | import org.apache.karaf.shell.commands.Command; |
| 5 | import org.onosproject.cli.AbstractShellCommand; | 5 | import org.onosproject.cli.AbstractShellCommand; |
| 6 | import org.onosproject.net.DeviceId; | 6 | import org.onosproject.net.DeviceId; |
| 7 | -import org.onosproject.net.resource.LabelResourcePool; | 7 | +import org.onosproject.incubator.net.resource.label.LabelResourcePool; |
| 8 | -import org.onosproject.net.resource.LabelResourceService; | 8 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 9 | 9 | ||
| 10 | @Command(scope = "onos", name = "get-label-resource-pool", | 10 | @Command(scope = "onos", name = "get-label-resource-pool", |
| 11 | description = "Gets label resource pool information by a specific device id") | 11 | description = "Gets label resource pool information by a specific device id") | ... | ... |
| ... | @@ -8,10 +8,10 @@ import org.apache.karaf.shell.commands.Command; | ... | @@ -8,10 +8,10 @@ import org.apache.karaf.shell.commands.Command; |
| 8 | import org.apache.karaf.shell.commands.Option; | 8 | import org.apache.karaf.shell.commands.Option; |
| 9 | import org.onosproject.cli.AbstractShellCommand; | 9 | import org.onosproject.cli.AbstractShellCommand; |
| 10 | import org.onosproject.net.intent.IntentId; | 10 | import org.onosproject.net.intent.IntentId; |
| 11 | -import org.onosproject.net.resource.DefaultLinkResourceRequest; | 11 | +import org.onosproject.net.resource.link.DefaultLinkResourceRequest; |
| 12 | -import org.onosproject.net.resource.LinkResourceAllocations; | 12 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 13 | -import org.onosproject.net.resource.LinkResourceRequest; | 13 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 14 | -import org.onosproject.net.resource.LinkResourceService; | 14 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 15 | import org.onosproject.net.topology.PathService; | 15 | import org.onosproject.net.topology.PathService; |
| 16 | import org.onosproject.net.DeviceId; | 16 | import org.onosproject.net.DeviceId; |
| 17 | import org.onosproject.net.Link; | 17 | import org.onosproject.net.Link; | ... | ... |
| ... | @@ -6,8 +6,8 @@ import java.util.Set; | ... | @@ -6,8 +6,8 @@ import java.util.Set; |
| 6 | import org.apache.karaf.shell.commands.Argument; | 6 | import org.apache.karaf.shell.commands.Argument; |
| 7 | import org.apache.karaf.shell.commands.Command; | 7 | import org.apache.karaf.shell.commands.Command; |
| 8 | import org.onosproject.cli.AbstractShellCommand; | 8 | import org.onosproject.cli.AbstractShellCommand; |
| 9 | -import org.onosproject.net.resource.LabelResourceId; | 9 | +import org.onosproject.incubator.net.resource.label.LabelResourceId; |
| 10 | -import org.onosproject.net.resource.LabelResourceService; | 10 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 11 | 11 | ||
| 12 | @Command(scope = "onos", name = "release-global-label-resource-pool", | 12 | @Command(scope = "onos", name = "release-global-label-resource-pool", |
| 13 | description = "Releases labels to global label resource pool.") | 13 | description = "Releases labels to global label resource pool.") | ... | ... |
| ... | @@ -4,10 +4,10 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -4,10 +4,10 @@ import org.apache.karaf.shell.commands.Argument; |
| 4 | import org.apache.karaf.shell.commands.Command; | 4 | import org.apache.karaf.shell.commands.Command; |
| 5 | import org.onosproject.cli.AbstractShellCommand; | 5 | import org.onosproject.cli.AbstractShellCommand; |
| 6 | import org.onosproject.net.DeviceId; | 6 | import org.onosproject.net.DeviceId; |
| 7 | -import org.onosproject.net.resource.DefaultLabelResource; | 7 | +import org.onosproject.incubator.net.resource.label.DefaultLabelResource; |
| 8 | -import org.onosproject.net.resource.LabelResource; | 8 | +import org.onosproject.incubator.net.resource.label.LabelResource; |
| 9 | -import org.onosproject.net.resource.LabelResourceId; | 9 | +import org.onosproject.incubator.net.resource.label.LabelResourceId; |
| 10 | -import org.onosproject.net.resource.LabelResourceService; | 10 | +import org.onosproject.incubator.net.resource.label.LabelResourceService; |
| 11 | 11 | ||
| 12 | import com.google.common.collect.ArrayListMultimap; | 12 | import com.google.common.collect.ArrayListMultimap; |
| 13 | import com.google.common.collect.Multimap; | 13 | import com.google.common.collect.Multimap; | ... | ... |
| ... | @@ -21,7 +21,7 @@ import org.onosproject.cli.AbstractShellCommand; | ... | @@ -21,7 +21,7 @@ import org.onosproject.cli.AbstractShellCommand; |
| 21 | import org.onosproject.net.ConnectPoint; | 21 | import org.onosproject.net.ConnectPoint; |
| 22 | import org.onosproject.net.Link; | 22 | import org.onosproject.net.Link; |
| 23 | import org.onosproject.net.link.LinkService; | 23 | import org.onosproject.net.link.LinkService; |
| 24 | -import org.onosproject.net.resource.LinkResourceService; | 24 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * Lists allocations by link. Lists all allocations if link is unspecified. | 27 | * Lists allocations by link. Lists all allocations if link is unspecified. | ... | ... |
| ... | @@ -21,7 +21,7 @@ import org.onosproject.cli.AbstractShellCommand; | ... | @@ -21,7 +21,7 @@ import org.onosproject.cli.AbstractShellCommand; |
| 21 | import org.onosproject.net.ConnectPoint; | 21 | import org.onosproject.net.ConnectPoint; |
| 22 | import org.onosproject.net.Link; | 22 | import org.onosproject.net.Link; |
| 23 | import org.onosproject.net.link.LinkService; | 23 | import org.onosproject.net.link.LinkService; |
| 24 | -import org.onosproject.net.resource.LinkResourceService; | 24 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 25 | import org.onosproject.net.resource.ResourceRequest; | 25 | import org.onosproject.net.resource.ResourceRequest; |
| 26 | 26 | ||
| 27 | /** | 27 | /** | ... | ... |
| ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent; | ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | import org.onosproject.net.Path; | 19 | import org.onosproject.net.Path; |
| 20 | -import org.onosproject.net.resource.LinkResourceService; | 20 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * Representation of a connectivity constraint capable of evaluating a link | 23 | * Representation of a connectivity constraint capable of evaluating a link | ... | ... |
| ... | @@ -15,7 +15,7 @@ | ... | @@ -15,7 +15,7 @@ |
| 15 | */ | 15 | */ |
| 16 | package org.onosproject.net.intent; | 16 | package org.onosproject.net.intent; |
| 17 | 17 | ||
| 18 | -import org.onosproject.net.resource.LinkResourceAllocations; | 18 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 19 | 19 | ||
| 20 | import java.util.List; | 20 | import java.util.List; |
| 21 | import java.util.Set; | 21 | import java.util.Set; | ... | ... |
| ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent.constraint; | ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent.constraint; |
| 17 | 17 | ||
| 18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
| 19 | import org.onosproject.net.Link; | 19 | import org.onosproject.net.Link; |
| 20 | -import org.onosproject.net.resource.LinkResourceService; | 20 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 21 | 21 | ||
| 22 | import java.util.Objects; | 22 | import java.util.Objects; |
| 23 | 23 | ... | ... |
| ... | @@ -18,7 +18,7 @@ package org.onosproject.net.intent.constraint; | ... | @@ -18,7 +18,7 @@ package org.onosproject.net.intent.constraint; |
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | import org.onosproject.net.Path; | 19 | import org.onosproject.net.Path; |
| 20 | import org.onosproject.net.intent.Constraint; | 20 | import org.onosproject.net.intent.Constraint; |
| 21 | -import org.onosproject.net.resource.LinkResourceService; | 21 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 22 | 22 | ||
| 23 | import java.util.Objects; | 23 | import java.util.Objects; |
| 24 | 24 | ... | ... |
| ... | @@ -16,9 +16,9 @@ | ... | @@ -16,9 +16,9 @@ |
| 16 | package org.onosproject.net.intent.constraint; | 16 | package org.onosproject.net.intent.constraint; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | -import org.onosproject.net.resource.BandwidthResource; | 19 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 20 | -import org.onosproject.net.resource.BandwidthResourceRequest; | 20 | +import org.onosproject.net.resource.link.BandwidthResourceRequest; |
| 21 | -import org.onosproject.net.resource.LinkResourceService; | 21 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 22 | import org.onosproject.net.resource.ResourceRequest; | 22 | import org.onosproject.net.resource.ResourceRequest; |
| 23 | import org.onosproject.net.resource.ResourceType; | 23 | import org.onosproject.net.resource.ResourceType; |
| 24 | 24 | ... | ... |
| ... | @@ -18,7 +18,7 @@ package org.onosproject.net.intent.constraint; | ... | @@ -18,7 +18,7 @@ package org.onosproject.net.intent.constraint; |
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | import org.onosproject.net.Path; | 19 | import org.onosproject.net.Path; |
| 20 | import org.onosproject.net.intent.Constraint; | 20 | import org.onosproject.net.intent.Constraint; |
| 21 | -import org.onosproject.net.resource.LinkResourceService; | 21 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * Abstract base class for various constraints that evaluate link viability | 24 | * Abstract base class for various constraints that evaluate link viability | ... | ... |
| ... | @@ -16,8 +16,8 @@ | ... | @@ -16,8 +16,8 @@ |
| 16 | package org.onosproject.net.intent.constraint; | 16 | package org.onosproject.net.intent.constraint; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | -import org.onosproject.net.resource.LambdaResource; | 19 | +import org.onosproject.net.resource.link.LambdaResource; |
| 20 | -import org.onosproject.net.resource.LinkResourceService; | 20 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 21 | import org.onosproject.net.resource.ResourceRequest; | 21 | import org.onosproject.net.resource.ResourceRequest; |
| 22 | import org.onosproject.net.resource.ResourceType; | 22 | import org.onosproject.net.resource.ResourceType; |
| 23 | 23 | ... | ... |
| ... | @@ -19,7 +19,7 @@ import com.google.common.base.MoreObjects; | ... | @@ -19,7 +19,7 @@ import com.google.common.base.MoreObjects; |
| 19 | import org.onosproject.net.Link; | 19 | import org.onosproject.net.Link; |
| 20 | import org.onosproject.net.Path; | 20 | import org.onosproject.net.Path; |
| 21 | import org.onosproject.net.intent.Constraint; | 21 | import org.onosproject.net.intent.Constraint; |
| 22 | -import org.onosproject.net.resource.LinkResourceService; | 22 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 23 | 23 | ||
| 24 | import java.time.Duration; | 24 | import java.time.Duration; |
| 25 | import java.time.temporal.ChronoUnit; | 25 | import java.time.temporal.ChronoUnit; | ... | ... |
| ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent.constraint; | ... | @@ -17,7 +17,7 @@ package org.onosproject.net.intent.constraint; |
| 17 | 17 | ||
| 18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
| 19 | import org.onosproject.net.Link; | 19 | import org.onosproject.net.Link; |
| 20 | -import org.onosproject.net.resource.LinkResourceService; | 20 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 21 | 21 | ||
| 22 | import java.util.Objects; | 22 | import java.util.Objects; |
| 23 | import java.util.Set; | 23 | import java.util.Set; | ... | ... |
| ... | @@ -19,7 +19,7 @@ import com.google.common.base.MoreObjects; | ... | @@ -19,7 +19,7 @@ import com.google.common.base.MoreObjects; |
| 19 | import com.google.common.collect.ImmutableSet; | 19 | import com.google.common.collect.ImmutableSet; |
| 20 | import org.onosproject.net.DeviceId; | 20 | import org.onosproject.net.DeviceId; |
| 21 | import org.onosproject.net.Link; | 21 | import org.onosproject.net.Link; |
| 22 | -import org.onosproject.net.resource.LinkResourceService; | 22 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 23 | 23 | ||
| 24 | import java.util.Collections; | 24 | import java.util.Collections; |
| 25 | import java.util.Objects; | 25 | import java.util.Objects; | ... | ... |
| ... | @@ -21,7 +21,7 @@ import org.onosproject.net.DeviceId; | ... | @@ -21,7 +21,7 @@ import org.onosproject.net.DeviceId; |
| 21 | import org.onosproject.net.Link; | 21 | import org.onosproject.net.Link; |
| 22 | import org.onosproject.net.Path; | 22 | import org.onosproject.net.Path; |
| 23 | import org.onosproject.net.intent.Constraint; | 23 | import org.onosproject.net.intent.Constraint; |
| 24 | -import org.onosproject.net.resource.LinkResourceService; | 24 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 25 | 25 | ||
| 26 | import java.util.Collections; | 26 | import java.util.Collections; |
| 27 | import java.util.LinkedList; | 27 | import java.util.LinkedList; | ... | ... |
| ... | @@ -16,7 +16,7 @@ | ... | @@ -16,7 +16,7 @@ |
| 16 | package org.onosproject.net.resource; | 16 | package org.onosproject.net.resource; |
| 17 | 17 | ||
| 18 | /** | 18 | /** |
| 19 | - * Representation of ID for allocated resource. | 19 | + * Resource identifier. |
| 20 | */ | 20 | */ |
| 21 | public interface ResourceId { | 21 | public interface ResourceId { |
| 22 | 22 | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.device; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.Port; | 18 | import org.onosproject.net.Port; |
| 19 | import org.onosproject.net.intent.Intent; | 19 | import org.onosproject.net.intent.Intent; | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.device; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.DeviceId; | 18 | import org.onosproject.net.DeviceId; |
| 19 | import org.onosproject.net.Port; | 19 | import org.onosproject.net.Port; | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import org.onlab.util.Bandwidth; | 18 | import org.onlab.util.Bandwidth; |
| 19 | 19 | ... | ... |
| ... | @@ -13,9 +13,11 @@ | ... | @@ -13,9 +13,11 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
| 19 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 20 | +import org.onosproject.net.resource.ResourceType; | ||
| 19 | 21 | ||
| 20 | /** | 22 | /** |
| 21 | * Representation of allocated bandwidth resource. | 23 | * Representation of allocated bandwidth resource. | ... | ... |
| ... | @@ -13,11 +13,13 @@ | ... | @@ -13,11 +13,13 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Objects; | 18 | import java.util.Objects; |
| 19 | 19 | ||
| 20 | import com.google.common.base.MoreObjects; | 20 | import com.google.common.base.MoreObjects; |
| 21 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 22 | +import org.onosproject.net.resource.ResourceType; | ||
| 21 | 23 | ||
| 22 | /** | 24 | /** |
| 23 | * Representation of a request for bandwidth resource. | 25 | * Representation of a request for bandwidth resource. | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import static com.google.common.base.Preconditions.checkNotNull; | 18 | import static com.google.common.base.Preconditions.checkNotNull; |
| 19 | 19 | ||
| ... | @@ -23,6 +23,9 @@ import com.google.common.collect.ImmutableSet; | ... | @@ -23,6 +23,9 @@ import com.google.common.collect.ImmutableSet; |
| 23 | 23 | ||
| 24 | import org.onosproject.net.Link; | 24 | import org.onosproject.net.Link; |
| 25 | import org.onosproject.net.intent.IntentId; | 25 | import org.onosproject.net.intent.IntentId; |
| 26 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 27 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 28 | +import org.onosproject.net.resource.ResourceType; | ||
| 26 | 29 | ||
| 27 | import java.util.Collection; | 30 | import java.util.Collection; |
| 28 | import java.util.Collections; | 31 | import java.util.Collections; | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Collection; | 18 | import java.util.Collection; |
| 19 | import java.util.HashSet; | 19 | import java.util.HashSet; |
| ... | @@ -29,6 +29,8 @@ import com.google.common.collect.ImmutableSet; | ... | @@ -29,6 +29,8 @@ import com.google.common.collect.ImmutableSet; |
| 29 | 29 | ||
| 30 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 30 | import org.onosproject.net.intent.constraint.BandwidthConstraint; |
| 31 | import org.onosproject.net.intent.constraint.LambdaConstraint; | 31 | import org.onosproject.net.intent.constraint.LambdaConstraint; |
| 32 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 33 | +import org.onosproject.net.resource.ResourceType; | ||
| 32 | 34 | ||
| 33 | /** | 35 | /** |
| 34 | * Implementation of {@link LinkResourceRequest}. | 36 | * Implementation of {@link LinkResourceRequest}. | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.IndexedLambda; | 18 | import org.onosproject.net.IndexedLambda; |
| 19 | 19 | ... | ... |
| ... | @@ -13,9 +13,11 @@ | ... | @@ -13,9 +13,11 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
| 19 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 20 | +import org.onosproject.net.resource.ResourceType; | ||
| 19 | 21 | ||
| 20 | import java.util.Objects; | 22 | import java.util.Objects; |
| 21 | 23 | ... | ... |
| ... | @@ -13,9 +13,11 @@ | ... | @@ -13,9 +13,11 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
| 19 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 20 | +import org.onosproject.net.resource.ResourceType; | ||
| 19 | 21 | ||
| 20 | /** | 22 | /** |
| 21 | * Representation of a request for lambda resource. | 23 | * Representation of a request for lambda resource. | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | /** | 18 | /** |
| 19 | * Abstraction of link resource. | 19 | * Abstraction of link resource. | ... | ... |
| ... | @@ -13,11 +13,12 @@ | ... | @@ -13,11 +13,12 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Set; | 18 | import java.util.Set; |
| 19 | 19 | ||
| 20 | import org.onosproject.net.Link; | 20 | import org.onosproject.net.Link; |
| 21 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 21 | 22 | ||
| 22 | /** | 23 | /** |
| 23 | * Representation of allocated link resources. | 24 | * Representation of allocated link resources. | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Collection; | 18 | import java.util.Collection; |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import org.onosproject.event.EventListener; | 18 | import org.onosproject.event.EventListener; |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Collection; | 18 | import java.util.Collection; |
| 19 | import java.util.Set; | 19 | import java.util.Set; |
| ... | @@ -21,6 +21,7 @@ import java.util.Set; | ... | @@ -21,6 +21,7 @@ import java.util.Set; |
| 21 | import org.onosproject.net.Link; | 21 | import org.onosproject.net.Link; |
| 22 | import org.onosproject.net.intent.Constraint; | 22 | import org.onosproject.net.intent.Constraint; |
| 23 | import org.onosproject.net.intent.IntentId; | 23 | import org.onosproject.net.intent.IntentId; |
| 24 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 24 | 25 | ||
| 25 | /** | 26 | /** |
| 26 | * Representation of a request for link resource. | 27 | * Representation of a request for link resource. | ... | ... |
| ... | @@ -13,10 +13,11 @@ | ... | @@ -13,10 +13,11 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import org.onosproject.net.Link; | 18 | import org.onosproject.net.Link; |
| 19 | import org.onosproject.net.intent.IntentId; | 19 | import org.onosproject.net.intent.IntentId; |
| 20 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 20 | 21 | ||
| 21 | /** | 22 | /** |
| 22 | * Service for providing link resource allocation. | 23 | * Service for providing link resource allocation. | ... | ... |
| ... | @@ -13,12 +13,13 @@ | ... | @@ -13,12 +13,13 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Set; | 18 | import java.util.Set; |
| 19 | 19 | ||
| 20 | import org.onosproject.net.Link; | 20 | import org.onosproject.net.Link; |
| 21 | import org.onosproject.net.intent.IntentId; | 21 | import org.onosproject.net.intent.IntentId; |
| 22 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 22 | 23 | ||
| 23 | /** | 24 | /** |
| 24 | * Manages link resources. | 25 | * Manages link resources. | ... | ... |
| ... | @@ -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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import java.util.Set; | 18 | import java.util.Set; |
| 19 | 19 | ... | ... |
| ... | @@ -14,9 +14,11 @@ | ... | @@ -14,9 +14,11 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.net.resource; | 17 | +package org.onosproject.net.resource.link; |
| 18 | 18 | ||
| 19 | import com.google.common.base.MoreObjects; | 19 | import com.google.common.base.MoreObjects; |
| 20 | +import org.onosproject.net.resource.ResourceAllocation; | ||
| 21 | +import org.onosproject.net.resource.ResourceType; | ||
| 20 | 22 | ||
| 21 | import java.util.Objects; | 23 | import java.util.Objects; |
| 22 | 24 | ... | ... |
| ... | @@ -13,9 +13,11 @@ | ... | @@ -13,9 +13,11 @@ |
| 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.resource; | 16 | +package org.onosproject.net.resource.link; |
| 17 | 17 | ||
| 18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
| 19 | +import org.onosproject.net.resource.ResourceRequest; | ||
| 20 | +import org.onosproject.net.resource.ResourceType; | ||
| 19 | 21 | ||
| 20 | /** | 22 | /** |
| 21 | * Representation of a request for lambda resource. | 23 | * Representation of a request for lambda resource. | ... | ... |
| ... | @@ -19,7 +19,7 @@ import org.junit.After; | ... | @@ -19,7 +19,7 @@ import org.junit.After; |
| 19 | import org.junit.Before; | 19 | import org.junit.Before; |
| 20 | import org.junit.Test; | 20 | import org.junit.Test; |
| 21 | import org.onosproject.core.IdGenerator; | 21 | import org.onosproject.core.IdGenerator; |
| 22 | -import org.onosproject.net.resource.LinkResourceAllocations; | 22 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 23 | 23 | ||
| 24 | import java.util.ArrayList; | 24 | import java.util.ArrayList; |
| 25 | import java.util.Arrays; | 25 | import java.util.Arrays; | ... | ... |
| ... | @@ -36,17 +36,17 @@ import org.onosproject.net.flow.criteria.Criterion; | ... | @@ -36,17 +36,17 @@ import org.onosproject.net.flow.criteria.Criterion; |
| 36 | import org.onosproject.net.flow.criteria.Criterion.Type; | 36 | import org.onosproject.net.flow.criteria.Criterion.Type; |
| 37 | import org.onosproject.net.flow.instructions.Instruction; | 37 | import org.onosproject.net.flow.instructions.Instruction; |
| 38 | import org.onosproject.net.flow.instructions.Instructions; | 38 | import org.onosproject.net.flow.instructions.Instructions; |
| 39 | -import org.onosproject.net.resource.BandwidthResource; | 39 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 40 | -import org.onosproject.net.resource.BandwidthResourceRequest; | 40 | +import org.onosproject.net.resource.link.BandwidthResourceRequest; |
| 41 | -import org.onosproject.net.resource.LambdaResource; | 41 | +import org.onosproject.net.resource.link.LambdaResource; |
| 42 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 42 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 43 | -import org.onosproject.net.resource.LambdaResourceRequest; | 43 | +import org.onosproject.net.resource.link.LambdaResourceRequest; |
| 44 | -import org.onosproject.net.resource.LinkResourceAllocations; | 44 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 45 | -import org.onosproject.net.resource.LinkResourceListener; | 45 | +import org.onosproject.net.resource.link.LinkResourceListener; |
| 46 | -import org.onosproject.net.resource.LinkResourceRequest; | 46 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 47 | -import org.onosproject.net.resource.LinkResourceService; | 47 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 48 | -import org.onosproject.net.resource.MplsLabel; | 48 | +import org.onosproject.net.resource.link.MplsLabel; |
| 49 | -import org.onosproject.net.resource.MplsLabelResourceAllocation; | 49 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; |
| 50 | import org.onosproject.net.resource.ResourceAllocation; | 50 | import org.onosproject.net.resource.ResourceAllocation; |
| 51 | import org.onosproject.net.resource.ResourceRequest; | 51 | import org.onosproject.net.resource.ResourceRequest; |
| 52 | import org.onosproject.net.resource.ResourceType; | 52 | import org.onosproject.net.resource.ResourceType; | ... | ... |
| ... | @@ -26,7 +26,7 @@ import org.onosproject.net.Link; | ... | @@ -26,7 +26,7 @@ import org.onosproject.net.Link; |
| 26 | import org.onosproject.net.NetTestTools; | 26 | import org.onosproject.net.NetTestTools; |
| 27 | import org.onosproject.net.flow.TrafficSelector; | 27 | import org.onosproject.net.flow.TrafficSelector; |
| 28 | import org.onosproject.net.intent.constraint.LambdaConstraint; | 28 | import org.onosproject.net.intent.constraint.LambdaConstraint; |
| 29 | -import org.onosproject.net.resource.LambdaResource; | 29 | +import org.onosproject.net.resource.link.LambdaResource; |
| 30 | 30 | ||
| 31 | import com.google.common.collect.ImmutableSet; | 31 | import com.google.common.collect.ImmutableSet; |
| 32 | import com.google.common.testing.EqualsTester; | 32 | import com.google.common.testing.EqualsTester; | ... | ... |
| ... | @@ -24,7 +24,7 @@ import org.onosproject.net.DeviceId; | ... | @@ -24,7 +24,7 @@ import org.onosproject.net.DeviceId; |
| 24 | import org.onosproject.net.Link; | 24 | import org.onosproject.net.Link; |
| 25 | import org.onosproject.net.PortNumber; | 25 | import org.onosproject.net.PortNumber; |
| 26 | import org.onosproject.net.provider.ProviderId; | 26 | import org.onosproject.net.provider.ProviderId; |
| 27 | -import org.onosproject.net.resource.LinkResourceService; | 27 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 28 | 28 | ||
| 29 | import static org.easymock.EasyMock.createMock; | 29 | import static org.easymock.EasyMock.createMock; |
| 30 | import static org.hamcrest.Matchers.closeTo; | 30 | import static org.hamcrest.Matchers.closeTo; | ... | ... |
| ... | @@ -18,8 +18,8 @@ package org.onosproject.net.intent.constraint; | ... | @@ -18,8 +18,8 @@ package org.onosproject.net.intent.constraint; |
| 18 | import org.junit.Test; | 18 | import org.junit.Test; |
| 19 | import org.onlab.util.Bandwidth; | 19 | import org.onlab.util.Bandwidth; |
| 20 | import org.onosproject.net.Link; | 20 | import org.onosproject.net.Link; |
| 21 | -import org.onosproject.net.resource.BandwidthResource; | 21 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 22 | -import org.onosproject.net.resource.LambdaResource; | 22 | +import org.onosproject.net.resource.link.LambdaResource; |
| 23 | 23 | ||
| 24 | import com.google.common.testing.EqualsTester; | 24 | import com.google.common.testing.EqualsTester; |
| 25 | 25 | ... | ... |
| ... | @@ -27,7 +27,7 @@ import org.onosproject.net.Link; | ... | @@ -27,7 +27,7 @@ import org.onosproject.net.Link; |
| 27 | import org.onosproject.net.Path; | 27 | import org.onosproject.net.Path; |
| 28 | import org.onosproject.net.PortNumber; | 28 | import org.onosproject.net.PortNumber; |
| 29 | import org.onosproject.net.provider.ProviderId; | 29 | import org.onosproject.net.provider.ProviderId; |
| 30 | -import org.onosproject.net.resource.LinkResourceService; | 30 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 31 | 31 | ||
| 32 | import java.time.Duration; | 32 | import java.time.Duration; |
| 33 | import java.time.temporal.ChronoUnit; | 33 | import java.time.temporal.ChronoUnit; | ... | ... |
| ... | @@ -27,7 +27,7 @@ import org.onosproject.net.DeviceId; | ... | @@ -27,7 +27,7 @@ import org.onosproject.net.DeviceId; |
| 27 | import org.onosproject.net.Path; | 27 | import org.onosproject.net.Path; |
| 28 | import org.onosproject.net.PortNumber; | 28 | import org.onosproject.net.PortNumber; |
| 29 | import org.onosproject.net.provider.ProviderId; | 29 | import org.onosproject.net.provider.ProviderId; |
| 30 | -import org.onosproject.net.resource.LinkResourceService; | 30 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 31 | 31 | ||
| 32 | import java.util.Arrays; | 32 | import java.util.Arrays; |
| 33 | 33 | ... | ... |
| ... | @@ -25,7 +25,7 @@ import org.onosproject.net.Path; | ... | @@ -25,7 +25,7 @@ import org.onosproject.net.Path; |
| 25 | import org.onosproject.net.PortNumber; | 25 | import org.onosproject.net.PortNumber; |
| 26 | import org.onosproject.net.intent.Constraint; | 26 | import org.onosproject.net.intent.Constraint; |
| 27 | import org.onosproject.net.provider.ProviderId; | 27 | import org.onosproject.net.provider.ProviderId; |
| 28 | -import org.onosproject.net.resource.LinkResourceService; | 28 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 29 | 29 | ||
| 30 | import java.util.Arrays; | 30 | import java.util.Arrays; |
| 31 | 31 | ... | ... |
| ... | @@ -18,6 +18,8 @@ package org.onosproject.net.resource; | ... | @@ -18,6 +18,8 @@ package org.onosproject.net.resource; |
| 18 | import org.junit.Test; | 18 | import org.junit.Test; |
| 19 | 19 | ||
| 20 | import com.google.common.testing.EqualsTester; | 20 | import com.google.common.testing.EqualsTester; |
| 21 | +import org.onosproject.net.resource.link.MplsLabel; | ||
| 22 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; | ||
| 21 | 23 | ||
| 22 | import static org.hamcrest.MatcherAssert.assertThat; | 24 | import static org.hamcrest.MatcherAssert.assertThat; |
| 23 | import static org.hamcrest.Matchers.is; | 25 | import static org.hamcrest.Matchers.is; | ... | ... |
| ... | @@ -49,8 +49,8 @@ import org.onosproject.net.intent.constraint.LambdaConstraint; | ... | @@ -49,8 +49,8 @@ import org.onosproject.net.intent.constraint.LambdaConstraint; |
| 49 | import org.onosproject.net.intent.constraint.LatencyConstraint; | 49 | import org.onosproject.net.intent.constraint.LatencyConstraint; |
| 50 | import org.onosproject.net.intent.constraint.ObstacleConstraint; | 50 | import org.onosproject.net.intent.constraint.ObstacleConstraint; |
| 51 | import org.onosproject.net.intent.constraint.WaypointConstraint; | 51 | import org.onosproject.net.intent.constraint.WaypointConstraint; |
| 52 | -import org.onosproject.net.resource.BandwidthResource; | 52 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 53 | -import org.onosproject.net.resource.LambdaResource; | 53 | +import org.onosproject.net.resource.link.LambdaResource; |
| 54 | 54 | ||
| 55 | import com.fasterxml.jackson.databind.node.ObjectNode; | 55 | import com.fasterxml.jackson.databind.node.ObjectNode; |
| 56 | import com.google.common.collect.ImmutableList; | 56 | import com.google.common.collect.ImmutableList; | ... | ... |
| ... | @@ -41,9 +41,9 @@ import org.onosproject.net.host.HostService; | ... | @@ -41,9 +41,9 @@ import org.onosproject.net.host.HostService; |
| 41 | import org.onosproject.net.intent.IntentService; | 41 | import org.onosproject.net.intent.IntentService; |
| 42 | import org.onosproject.net.intent.Key; | 42 | import org.onosproject.net.intent.Key; |
| 43 | import org.onosproject.net.link.LinkEvent; | 43 | import org.onosproject.net.link.LinkEvent; |
| 44 | -import org.onosproject.net.resource.LinkResourceEvent; | 44 | +import org.onosproject.net.resource.link.LinkResourceEvent; |
| 45 | -import org.onosproject.net.resource.LinkResourceListener; | 45 | +import org.onosproject.net.resource.link.LinkResourceListener; |
| 46 | -import org.onosproject.net.resource.LinkResourceService; | 46 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 47 | import org.onosproject.net.topology.TopologyEvent; | 47 | import org.onosproject.net.topology.TopologyEvent; |
| 48 | import org.onosproject.net.topology.TopologyListener; | 48 | import org.onosproject.net.topology.TopologyListener; |
| 49 | import org.onosproject.net.topology.TopologyService; | 49 | import org.onosproject.net.topology.TopologyService; | ... | ... |
| ... | @@ -29,7 +29,7 @@ import org.onosproject.net.intent.IntentCompiler; | ... | @@ -29,7 +29,7 @@ import org.onosproject.net.intent.IntentCompiler; |
| 29 | import org.onosproject.net.intent.IntentExtensionService; | 29 | import org.onosproject.net.intent.IntentExtensionService; |
| 30 | import org.onosproject.net.intent.impl.PathNotFoundException; | 30 | import org.onosproject.net.intent.impl.PathNotFoundException; |
| 31 | import org.onosproject.net.provider.ProviderId; | 31 | import org.onosproject.net.provider.ProviderId; |
| 32 | -import org.onosproject.net.resource.LinkResourceService; | 32 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 33 | import org.onosproject.net.topology.LinkWeight; | 33 | import org.onosproject.net.topology.LinkWeight; |
| 34 | import org.onosproject.net.topology.PathService; | 34 | import org.onosproject.net.topology.PathService; |
| 35 | import org.onosproject.net.topology.TopologyEdge; | 35 | import org.onosproject.net.topology.TopologyEdge; | ... | ... |
| ... | @@ -31,7 +31,7 @@ import org.onosproject.net.intent.HostToHostIntent; | ... | @@ -31,7 +31,7 @@ import org.onosproject.net.intent.HostToHostIntent; |
| 31 | import org.onosproject.net.intent.Intent; | 31 | import org.onosproject.net.intent.Intent; |
| 32 | import org.onosproject.net.intent.PathIntent; | 32 | import org.onosproject.net.intent.PathIntent; |
| 33 | import org.onosproject.net.intent.constraint.AsymmetricPathConstraint; | 33 | import org.onosproject.net.intent.constraint.AsymmetricPathConstraint; |
| 34 | -import org.onosproject.net.resource.LinkResourceAllocations; | 34 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 35 | 35 | ||
| 36 | import java.util.ArrayList; | 36 | import java.util.ArrayList; |
| 37 | import java.util.Arrays; | 37 | import java.util.Arrays; | ... | ... |
| ... | @@ -41,7 +41,7 @@ import org.onosproject.net.intent.Intent; | ... | @@ -41,7 +41,7 @@ import org.onosproject.net.intent.Intent; |
| 41 | import org.onosproject.net.intent.IntentCompiler; | 41 | import org.onosproject.net.intent.IntentCompiler; |
| 42 | import org.onosproject.net.intent.IntentExtensionService; | 42 | import org.onosproject.net.intent.IntentExtensionService; |
| 43 | import org.onosproject.net.intent.LinkCollectionIntent; | 43 | import org.onosproject.net.intent.LinkCollectionIntent; |
| 44 | -import org.onosproject.net.resource.LinkResourceAllocations; | 44 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 45 | 45 | ||
| 46 | import java.util.ArrayList; | 46 | import java.util.ArrayList; |
| 47 | import java.util.Collections; | 47 | import java.util.Collections; | ... | ... |
| ... | @@ -19,7 +19,7 @@ import org.onosproject.net.intent.Intent; | ... | @@ -19,7 +19,7 @@ import org.onosproject.net.intent.Intent; |
| 19 | import org.onosproject.net.intent.MplsIntent; | 19 | import org.onosproject.net.intent.MplsIntent; |
| 20 | import org.onosproject.net.intent.MplsPathIntent; | 20 | import org.onosproject.net.intent.MplsPathIntent; |
| 21 | import org.onosproject.net.provider.ProviderId; | 21 | import org.onosproject.net.provider.ProviderId; |
| 22 | -import org.onosproject.net.resource.LinkResourceAllocations; | 22 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | @Component(immediate = true) | 25 | @Component(immediate = true) | ... | ... |
| ... | @@ -42,12 +42,12 @@ import org.onosproject.net.intent.IntentCompiler; | ... | @@ -42,12 +42,12 @@ import org.onosproject.net.intent.IntentCompiler; |
| 42 | import org.onosproject.net.intent.IntentExtensionService; | 42 | import org.onosproject.net.intent.IntentExtensionService; |
| 43 | import org.onosproject.net.intent.MplsPathIntent; | 43 | import org.onosproject.net.intent.MplsPathIntent; |
| 44 | import org.onosproject.net.link.LinkStore; | 44 | import org.onosproject.net.link.LinkStore; |
| 45 | -import org.onosproject.net.resource.DefaultLinkResourceRequest; | 45 | +import org.onosproject.net.resource.link.DefaultLinkResourceRequest; |
| 46 | -import org.onosproject.net.resource.LinkResourceAllocations; | 46 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 47 | -import org.onosproject.net.resource.LinkResourceRequest; | 47 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 48 | -import org.onosproject.net.resource.LinkResourceService; | 48 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 49 | -import org.onosproject.net.resource.MplsLabel; | 49 | +import org.onosproject.net.resource.link.MplsLabel; |
| 50 | -import org.onosproject.net.resource.MplsLabelResourceAllocation; | 50 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; |
| 51 | import org.onosproject.net.resource.ResourceAllocation; | 51 | import org.onosproject.net.resource.ResourceAllocation; |
| 52 | import org.onosproject.net.resource.ResourceType; | 52 | import org.onosproject.net.resource.ResourceType; |
| 53 | import org.slf4j.Logger; | 53 | import org.slf4j.Logger; | ... | ... |
| ... | @@ -37,7 +37,7 @@ import org.onosproject.net.intent.LinkCollectionIntent; | ... | @@ -37,7 +37,7 @@ import org.onosproject.net.intent.LinkCollectionIntent; |
| 37 | import org.onosproject.net.intent.MultiPointToSinglePointIntent; | 37 | import org.onosproject.net.intent.MultiPointToSinglePointIntent; |
| 38 | import org.onosproject.net.intent.PointToPointIntent; | 38 | import org.onosproject.net.intent.PointToPointIntent; |
| 39 | import org.onosproject.net.intent.impl.PathNotFoundException; | 39 | import org.onosproject.net.intent.impl.PathNotFoundException; |
| 40 | -import org.onosproject.net.resource.LinkResourceAllocations; | 40 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 41 | import org.onosproject.net.topology.PathService; | 41 | import org.onosproject.net.topology.PathService; |
| 42 | 42 | ||
| 43 | import com.google.common.collect.ImmutableSet; | 43 | import com.google.common.collect.ImmutableSet; | ... | ... |
| ... | @@ -40,13 +40,13 @@ import org.onosproject.net.intent.IntentCompiler; | ... | @@ -40,13 +40,13 @@ import org.onosproject.net.intent.IntentCompiler; |
| 40 | import org.onosproject.net.intent.IntentExtensionService; | 40 | import org.onosproject.net.intent.IntentExtensionService; |
| 41 | import org.onosproject.net.intent.OpticalConnectivityIntent; | 41 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
| 42 | import org.onosproject.net.intent.OpticalPathIntent; | 42 | import org.onosproject.net.intent.OpticalPathIntent; |
| 43 | -import org.onosproject.net.resource.DefaultLinkResourceRequest; | 43 | +import org.onosproject.net.resource.link.DefaultLinkResourceRequest; |
| 44 | -import org.onosproject.net.resource.DeviceResourceService; | 44 | +import org.onosproject.net.resource.device.DeviceResourceService; |
| 45 | -import org.onosproject.net.resource.LambdaResource; | 45 | +import org.onosproject.net.resource.link.LambdaResource; |
| 46 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 46 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 47 | -import org.onosproject.net.resource.LinkResourceAllocations; | 47 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 48 | -import org.onosproject.net.resource.LinkResourceRequest; | 48 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 49 | -import org.onosproject.net.resource.LinkResourceService; | 49 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 50 | import org.onosproject.net.resource.ResourceAllocation; | 50 | import org.onosproject.net.resource.ResourceAllocation; |
| 51 | import org.onosproject.net.resource.ResourceType; | 51 | import org.onosproject.net.resource.ResourceType; |
| 52 | import org.onosproject.net.topology.LinkWeight; | 52 | import org.onosproject.net.topology.LinkWeight; | ... | ... |
| ... | @@ -37,8 +37,8 @@ import org.onosproject.net.intent.Intent; | ... | @@ -37,8 +37,8 @@ import org.onosproject.net.intent.Intent; |
| 37 | import org.onosproject.net.intent.IntentCompiler; | 37 | import org.onosproject.net.intent.IntentCompiler; |
| 38 | import org.onosproject.net.intent.IntentExtensionService; | 38 | import org.onosproject.net.intent.IntentExtensionService; |
| 39 | import org.onosproject.net.intent.OpticalPathIntent; | 39 | import org.onosproject.net.intent.OpticalPathIntent; |
| 40 | -import org.onosproject.net.resource.LinkResourceAllocations; | 40 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 41 | -import org.onosproject.net.resource.LinkResourceService; | 41 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 42 | 42 | ||
| 43 | import java.util.Collections; | 43 | import java.util.Collections; |
| 44 | import java.util.LinkedList; | 44 | import java.util.LinkedList; | ... | ... |
| ... | @@ -35,7 +35,7 @@ import org.onosproject.net.intent.Intent; | ... | @@ -35,7 +35,7 @@ import org.onosproject.net.intent.Intent; |
| 35 | import org.onosproject.net.intent.IntentCompiler; | 35 | import org.onosproject.net.intent.IntentCompiler; |
| 36 | import org.onosproject.net.intent.IntentExtensionService; | 36 | import org.onosproject.net.intent.IntentExtensionService; |
| 37 | import org.onosproject.net.intent.PathIntent; | 37 | import org.onosproject.net.intent.PathIntent; |
| 38 | -import org.onosproject.net.resource.LinkResourceAllocations; | 38 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 39 | 39 | ||
| 40 | import java.util.ArrayList; | 40 | import java.util.ArrayList; |
| 41 | import java.util.Collections; | 41 | import java.util.Collections; | ... | ... |
| ... | @@ -26,7 +26,7 @@ import org.onosproject.net.intent.Intent; | ... | @@ -26,7 +26,7 @@ import org.onosproject.net.intent.Intent; |
| 26 | import org.onosproject.net.intent.PathIntent; | 26 | import org.onosproject.net.intent.PathIntent; |
| 27 | import org.onosproject.net.intent.PointToPointIntent; | 27 | import org.onosproject.net.intent.PointToPointIntent; |
| 28 | import org.onosproject.net.provider.ProviderId; | 28 | import org.onosproject.net.provider.ProviderId; |
| 29 | -import org.onosproject.net.resource.LinkResourceAllocations; | 29 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 30 | 30 | ||
| 31 | import java.util.ArrayList; | 31 | import java.util.ArrayList; |
| 32 | import java.util.List; | 32 | import java.util.List; | ... | ... |
| ... | @@ -30,7 +30,7 @@ import org.onosproject.net.intent.Intent; | ... | @@ -30,7 +30,7 @@ import org.onosproject.net.intent.Intent; |
| 30 | import org.onosproject.net.intent.LinkCollectionIntent; | 30 | import org.onosproject.net.intent.LinkCollectionIntent; |
| 31 | import org.onosproject.net.intent.SinglePointToMultiPointIntent; | 31 | import org.onosproject.net.intent.SinglePointToMultiPointIntent; |
| 32 | import org.onosproject.net.provider.ProviderId; | 32 | import org.onosproject.net.provider.ProviderId; |
| 33 | -import org.onosproject.net.resource.LinkResourceAllocations; | 33 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 34 | 34 | ||
| 35 | import com.google.common.collect.ImmutableSet; | 35 | import com.google.common.collect.ImmutableSet; |
| 36 | 36 | ... | ... |
| ... | @@ -22,7 +22,7 @@ import org.apache.felix.scr.annotations.Deactivate; | ... | @@ -22,7 +22,7 @@ import org.apache.felix.scr.annotations.Deactivate; |
| 22 | import org.onosproject.net.intent.Intent; | 22 | import org.onosproject.net.intent.Intent; |
| 23 | import org.onosproject.net.intent.PointToPointIntent; | 23 | import org.onosproject.net.intent.PointToPointIntent; |
| 24 | import org.onosproject.net.intent.TwoWayP2PIntent; | 24 | import org.onosproject.net.intent.TwoWayP2PIntent; |
| 25 | -import org.onosproject.net.resource.LinkResourceAllocations; | 25 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 26 | 26 | ||
| 27 | import java.util.List; | 27 | import java.util.List; |
| 28 | import java.util.Set; | 28 | import java.util.Set; | ... | ... |
| ... | @@ -25,8 +25,8 @@ import org.onosproject.net.Port; | ... | @@ -25,8 +25,8 @@ import org.onosproject.net.Port; |
| 25 | import org.onosproject.net.intent.Intent; | 25 | import org.onosproject.net.intent.Intent; |
| 26 | import org.onosproject.net.intent.IntentId; | 26 | import org.onosproject.net.intent.IntentId; |
| 27 | import org.onosproject.net.intent.OpticalConnectivityIntent; | 27 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
| 28 | -import org.onosproject.net.resource.DeviceResourceService; | 28 | +import org.onosproject.net.resource.device.DeviceResourceService; |
| 29 | -import org.onosproject.net.resource.DeviceResourceStore; | 29 | +import org.onosproject.net.resource.device.DeviceResourceStore; |
| 30 | import org.slf4j.Logger; | 30 | import org.slf4j.Logger; |
| 31 | 31 | ||
| 32 | import java.util.Arrays; | 32 | import java.util.Arrays; | ... | ... |
| ... | @@ -25,22 +25,22 @@ import org.onosproject.event.ListenerRegistry; | ... | @@ -25,22 +25,22 @@ import org.onosproject.event.ListenerRegistry; |
| 25 | import org.onosproject.event.EventDeliveryService; | 25 | import org.onosproject.event.EventDeliveryService; |
| 26 | import org.onosproject.net.Link; | 26 | import org.onosproject.net.Link; |
| 27 | import org.onosproject.net.intent.IntentId; | 27 | import org.onosproject.net.intent.IntentId; |
| 28 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 28 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 29 | -import org.onosproject.net.resource.BandwidthResourceRequest; | 29 | +import org.onosproject.net.resource.link.BandwidthResourceRequest; |
| 30 | -import org.onosproject.net.resource.DefaultLinkResourceAllocations; | 30 | +import org.onosproject.net.resource.link.DefaultLinkResourceAllocations; |
| 31 | -import org.onosproject.net.resource.LambdaResource; | 31 | +import org.onosproject.net.resource.link.LambdaResource; |
| 32 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 32 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 33 | -import org.onosproject.net.resource.LambdaResourceRequest; | 33 | +import org.onosproject.net.resource.link.LambdaResourceRequest; |
| 34 | -import org.onosproject.net.resource.LinkResourceAllocations; | 34 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 35 | -import org.onosproject.net.resource.LinkResourceEvent; | 35 | +import org.onosproject.net.resource.link.LinkResourceEvent; |
| 36 | -import org.onosproject.net.resource.LinkResourceListener; | 36 | +import org.onosproject.net.resource.link.LinkResourceListener; |
| 37 | -import org.onosproject.net.resource.LinkResourceRequest; | 37 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 38 | -import org.onosproject.net.resource.LinkResourceService; | 38 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 39 | -import org.onosproject.net.resource.LinkResourceStore; | 39 | +import org.onosproject.net.resource.link.LinkResourceStore; |
| 40 | -import org.onosproject.net.resource.LinkResourceStoreDelegate; | 40 | +import org.onosproject.net.resource.link.LinkResourceStoreDelegate; |
| 41 | -import org.onosproject.net.resource.MplsLabel; | 41 | +import org.onosproject.net.resource.link.MplsLabel; |
| 42 | -import org.onosproject.net.resource.MplsLabelResourceAllocation; | 42 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; |
| 43 | -import org.onosproject.net.resource.MplsLabelResourceRequest; | 43 | +import org.onosproject.net.resource.link.MplsLabelResourceRequest; |
| 44 | import org.onosproject.net.resource.ResourceAllocation; | 44 | import org.onosproject.net.resource.ResourceAllocation; |
| 45 | import org.onosproject.net.resource.ResourceRequest; | 45 | import org.onosproject.net.resource.ResourceRequest; |
| 46 | import org.onosproject.net.resource.ResourceType; | 46 | import org.onosproject.net.resource.ResourceType; | ... | ... |
| ... | @@ -43,7 +43,7 @@ import org.onosproject.net.intent.IntentListener; | ... | @@ -43,7 +43,7 @@ import org.onosproject.net.intent.IntentListener; |
| 43 | import org.onosproject.net.intent.IntentService; | 43 | import org.onosproject.net.intent.IntentService; |
| 44 | import org.onosproject.net.intent.IntentState; | 44 | import org.onosproject.net.intent.IntentState; |
| 45 | import org.onosproject.net.intent.Key; | 45 | import org.onosproject.net.intent.Key; |
| 46 | -import org.onosproject.net.resource.LinkResourceAllocations; | 46 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 47 | import org.onosproject.store.trivial.impl.SimpleIntentStore; | 47 | import org.onosproject.store.trivial.impl.SimpleIntentStore; |
| 48 | 48 | ||
| 49 | import java.util.Collection; | 49 | import java.util.Collection; | ... | ... |
| ... | @@ -38,8 +38,8 @@ import org.onosproject.net.intent.Intent; | ... | @@ -38,8 +38,8 @@ import org.onosproject.net.intent.Intent; |
| 38 | import org.onosproject.net.intent.Key; | 38 | import org.onosproject.net.intent.Key; |
| 39 | import org.onosproject.net.intent.MockIdGenerator; | 39 | import org.onosproject.net.intent.MockIdGenerator; |
| 40 | import org.onosproject.net.link.LinkEvent; | 40 | import org.onosproject.net.link.LinkEvent; |
| 41 | -import org.onosproject.net.resource.LinkResourceEvent; | 41 | +import org.onosproject.net.resource.link.LinkResourceEvent; |
| 42 | -import org.onosproject.net.resource.LinkResourceListener; | 42 | +import org.onosproject.net.resource.link.LinkResourceListener; |
| 43 | import org.onosproject.net.topology.Topology; | 43 | import org.onosproject.net.topology.Topology; |
| 44 | import org.onosproject.net.topology.TopologyEvent; | 44 | import org.onosproject.net.topology.TopologyEvent; |
| 45 | import org.onosproject.net.topology.TopologyListener; | 45 | import org.onosproject.net.topology.TopologyListener; | ... | ... |
| ... | @@ -34,9 +34,9 @@ import org.onosproject.net.intent.PointToPointIntent; | ... | @@ -34,9 +34,9 @@ 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.constraint.LambdaConstraint; | 35 | import org.onosproject.net.intent.constraint.LambdaConstraint; |
| 36 | import org.onosproject.net.intent.impl.PathNotFoundException; | 36 | import org.onosproject.net.intent.impl.PathNotFoundException; |
| 37 | -import org.onosproject.net.resource.BandwidthResource; | 37 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 38 | -import org.onosproject.net.resource.LambdaResource; | 38 | +import org.onosproject.net.resource.link.LambdaResource; |
| 39 | -import org.onosproject.net.resource.LinkResourceService; | 39 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 40 | 40 | ||
| 41 | import java.util.Collections; | 41 | import java.util.Collections; |
| 42 | import java.util.List; | 42 | import java.util.List; | ... | ... |
| ... | @@ -36,9 +36,7 @@ import org.onosproject.net.link.LinkAdminService; | ... | @@ -36,9 +36,7 @@ import org.onosproject.net.link.LinkAdminService; |
| 36 | import org.onosproject.net.link.LinkService; | 36 | import org.onosproject.net.link.LinkService; |
| 37 | import org.onosproject.net.packet.PacketService; | 37 | import org.onosproject.net.packet.PacketService; |
| 38 | import org.onosproject.net.proxyarp.ProxyArpService; | 38 | import org.onosproject.net.proxyarp.ProxyArpService; |
| 39 | -import org.onosproject.net.resource.LabelResourceAdminService; | 39 | +import org.onosproject.net.resource.link.LinkResourceService; |
| 40 | -import org.onosproject.net.resource.LinkResourceService; | ||
| 41 | -import org.onosproject.net.resource.LabelResourceService; | ||
| 42 | import org.onosproject.net.statistic.StatisticService; | 40 | import org.onosproject.net.statistic.StatisticService; |
| 43 | import org.onosproject.net.topology.PathService; | 41 | import org.onosproject.net.topology.PathService; |
| 44 | import org.onosproject.net.topology.TopologyService; | 42 | import org.onosproject.net.topology.TopologyService; |
| ... | @@ -107,8 +105,8 @@ public final class PolicyBuilder { | ... | @@ -107,8 +105,8 @@ public final class PolicyBuilder { |
| 107 | DriverAdminService.class.getName(), ServicePermission.GET), | 105 | DriverAdminService.class.getName(), ServicePermission.GET), |
| 108 | new PermissionInfo(ServicePermission.class.getName(), | 106 | new PermissionInfo(ServicePermission.class.getName(), |
| 109 | StorageAdminService.class.getName(), ServicePermission.GET), | 107 | StorageAdminService.class.getName(), ServicePermission.GET), |
| 110 | - new PermissionInfo(ServicePermission.class.getName(), | 108 | +// new PermissionInfo(ServicePermission.class.getName(), |
| 111 | - LabelResourceAdminService.class.getName(), ServicePermission.GET), | 109 | +// LabelResourceAdminService.class.getName(), ServicePermission.GET), |
| 112 | // new PermissionInfo(ServicePermission.class.getName(), | 110 | // new PermissionInfo(ServicePermission.class.getName(), |
| 113 | // TunnelAdminService.class.getName(), ServicePermission.GET), | 111 | // TunnelAdminService.class.getName(), ServicePermission.GET), |
| 114 | new PermissionInfo(ServicePermission.class.getName(), | 112 | new PermissionInfo(ServicePermission.class.getName(), |
| ... | @@ -151,8 +149,8 @@ public final class PolicyBuilder { | ... | @@ -151,8 +149,8 @@ public final class PolicyBuilder { |
| 151 | LinkService.class.getName(), ServicePermission.GET), | 149 | LinkService.class.getName(), ServicePermission.GET), |
| 152 | new PermissionInfo(ServicePermission.class.getName(), | 150 | new PermissionInfo(ServicePermission.class.getName(), |
| 153 | LinkResourceService.class.getName(), ServicePermission.GET), | 151 | LinkResourceService.class.getName(), ServicePermission.GET), |
| 154 | - new PermissionInfo(ServicePermission.class.getName(), | 152 | +// new PermissionInfo(ServicePermission.class.getName(), |
| 155 | - LabelResourceService.class.getName(), ServicePermission.GET), | 153 | +// LabelResourceService.class.getName(), ServicePermission.GET), |
| 156 | new PermissionInfo(ServicePermission.class.getName(), | 154 | new PermissionInfo(ServicePermission.class.getName(), |
| 157 | PacketService.class.getName(), ServicePermission.GET), | 155 | PacketService.class.getName(), ServicePermission.GET), |
| 158 | new PermissionInfo(ServicePermission.class.getName(), | 156 | new PermissionInfo(ServicePermission.class.getName(), |
| ... | @@ -224,14 +222,14 @@ public final class PolicyBuilder { | ... | @@ -224,14 +222,14 @@ public final class PolicyBuilder { |
| 224 | IntentService.class.getName())); | 222 | IntentService.class.getName())); |
| 225 | serviceDirectory.put(Permission.INTENT_EVENT, ImmutableSet.of( | 223 | serviceDirectory.put(Permission.INTENT_EVENT, ImmutableSet.of( |
| 226 | IntentService.class.getName())); | 224 | IntentService.class.getName())); |
| 227 | - serviceDirectory.put(Permission.LINK_READ, ImmutableSet.of( | 225 | +// serviceDirectory.put(Permission.LINK_READ, ImmutableSet.of( |
| 228 | - LinkService.class.getName(), LinkResourceService.class.getName(), | 226 | +// LinkService.class.getName(), LinkResourceService.class.getName(), |
| 229 | - LabelResourceService.class.getName())); | 227 | +// LabelResourceService.class.getName())); |
| 230 | - serviceDirectory.put(Permission.LINK_WRITE, ImmutableSet.of( | 228 | +// serviceDirectory.put(Permission.LINK_WRITE, ImmutableSet.of( |
| 231 | - LinkResourceService.class.getName(), LabelResourceService.class.getName())); | 229 | +// LinkResourceService.class.getName(), LabelResourceService.class.getName())); |
| 232 | - serviceDirectory.put(Permission.LINK_EVENT, ImmutableSet.of( | 230 | +// serviceDirectory.put(Permission.LINK_EVENT, ImmutableSet.of( |
| 233 | - LinkService.class.getName(), LinkResourceService.class.getName(), | 231 | +// LinkService.class.getName(), LinkResourceService.class.getName(), |
| 234 | - LabelResourceService.class.getName())); | 232 | +// LabelResourceService.class.getName())); |
| 235 | serviceDirectory.put(Permission.PACKET_READ, ImmutableSet.of( | 233 | serviceDirectory.put(Permission.PACKET_READ, ImmutableSet.of( |
| 236 | PacketService.class.getName(), ProxyArpService.class.getName())); | 234 | PacketService.class.getName(), ProxyArpService.class.getName())); |
| 237 | serviceDirectory.put(Permission.PACKET_WRITE, ImmutableSet.of( | 235 | serviceDirectory.put(Permission.PACKET_WRITE, ImmutableSet.of( | ... | ... |
| ... | @@ -69,7 +69,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; | ... | @@ -69,7 +69,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; |
| 69 | import org.onosproject.store.cluster.messaging.MessageSubject; | 69 | import org.onosproject.store.cluster.messaging.MessageSubject; |
| 70 | import org.onosproject.store.impl.Timestamped; | 70 | import org.onosproject.store.impl.Timestamped; |
| 71 | import org.onosproject.store.serializers.KryoSerializer; | 71 | import org.onosproject.store.serializers.KryoSerializer; |
| 72 | -import org.onosproject.store.serializers.impl.DistributedStoreSerializers; | 72 | +import org.onosproject.store.serializers.custom.DistributedStoreSerializers; |
| 73 | import org.slf4j.Logger; | 73 | import org.slf4j.Logger; |
| 74 | 74 | ||
| 75 | import java.io.IOException; | 75 | import java.io.IOException; | ... | ... |
| ... | @@ -66,7 +66,7 @@ import org.onosproject.store.flow.ReplicaInfoEventListener; | ... | @@ -66,7 +66,7 @@ import org.onosproject.store.flow.ReplicaInfoEventListener; |
| 66 | import org.onosproject.store.flow.ReplicaInfoService; | 66 | import org.onosproject.store.flow.ReplicaInfoService; |
| 67 | import org.onosproject.store.serializers.KryoSerializer; | 67 | import org.onosproject.store.serializers.KryoSerializer; |
| 68 | import org.onosproject.store.serializers.StoreSerializer; | 68 | import org.onosproject.store.serializers.StoreSerializer; |
| 69 | -import org.onosproject.store.serializers.impl.DistributedStoreSerializers; | 69 | +import org.onosproject.store.serializers.custom.DistributedStoreSerializers; |
| 70 | import org.osgi.service.component.ComponentContext; | 70 | import org.osgi.service.component.ComponentContext; |
| 71 | import org.slf4j.Logger; | 71 | import org.slf4j.Logger; |
| 72 | 72 | ... | ... |
| ... | @@ -62,7 +62,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; | ... | @@ -62,7 +62,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; |
| 62 | import org.onosproject.store.cluster.messaging.MessageSubject; | 62 | import org.onosproject.store.cluster.messaging.MessageSubject; |
| 63 | import org.onosproject.store.impl.Timestamped; | 63 | import org.onosproject.store.impl.Timestamped; |
| 64 | import org.onosproject.store.serializers.KryoSerializer; | 64 | import org.onosproject.store.serializers.KryoSerializer; |
| 65 | -import org.onosproject.store.serializers.impl.DistributedStoreSerializers; | 65 | +import org.onosproject.store.serializers.custom.DistributedStoreSerializers; |
| 66 | import org.slf4j.Logger; | 66 | import org.slf4j.Logger; |
| 67 | 67 | ||
| 68 | import java.io.IOException; | 68 | import java.io.IOException; | ... | ... |
| ... | @@ -58,7 +58,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; | ... | @@ -58,7 +58,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; |
| 58 | import org.onosproject.store.cluster.messaging.MessageSubject; | 58 | import org.onosproject.store.cluster.messaging.MessageSubject; |
| 59 | import org.onosproject.store.impl.Timestamped; | 59 | import org.onosproject.store.impl.Timestamped; |
| 60 | import org.onosproject.store.serializers.KryoSerializer; | 60 | import org.onosproject.store.serializers.KryoSerializer; |
| 61 | -import org.onosproject.store.serializers.impl.DistributedStoreSerializers; | 61 | +import org.onosproject.store.serializers.custom.DistributedStoreSerializers; |
| 62 | import org.slf4j.Logger; | 62 | import org.slf4j.Logger; |
| 63 | 63 | ||
| 64 | import java.io.IOException; | 64 | import java.io.IOException; | ... | ... |
core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
| ... | @@ -26,7 +26,7 @@ import org.onosproject.net.DeviceId; | ... | @@ -26,7 +26,7 @@ import org.onosproject.net.DeviceId; |
| 26 | import org.onosproject.net.Port; | 26 | import org.onosproject.net.Port; |
| 27 | import org.onosproject.net.device.DeviceService; | 27 | import org.onosproject.net.device.DeviceService; |
| 28 | import org.onosproject.net.intent.IntentId; | 28 | import org.onosproject.net.intent.IntentId; |
| 29 | -import org.onosproject.net.resource.DeviceResourceStore; | 29 | +import org.onosproject.net.resource.device.DeviceResourceStore; |
| 30 | import org.onosproject.store.serializers.KryoNamespaces; | 30 | import org.onosproject.store.serializers.KryoNamespaces; |
| 31 | import org.onosproject.store.service.ConsistentMap; | 31 | import org.onosproject.store.service.ConsistentMap; |
| 32 | import org.onosproject.store.service.Serializer; | 32 | import org.onosproject.store.service.Serializer; | ... | ... |
| ... | @@ -26,16 +26,16 @@ import org.onosproject.net.Link; | ... | @@ -26,16 +26,16 @@ import org.onosproject.net.Link; |
| 26 | import org.onosproject.net.LinkKey; | 26 | import org.onosproject.net.LinkKey; |
| 27 | import org.onosproject.net.intent.IntentId; | 27 | import org.onosproject.net.intent.IntentId; |
| 28 | import org.onosproject.net.link.LinkService; | 28 | import org.onosproject.net.link.LinkService; |
| 29 | -import org.onosproject.net.resource.BandwidthResource; | 29 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 30 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 30 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 31 | -import org.onosproject.net.resource.LambdaResource; | 31 | +import org.onosproject.net.resource.link.LambdaResource; |
| 32 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 32 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 33 | -import org.onosproject.net.resource.LinkResourceAllocations; | 33 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 34 | -import org.onosproject.net.resource.LinkResourceEvent; | 34 | +import org.onosproject.net.resource.link.LinkResourceEvent; |
| 35 | -import org.onosproject.net.resource.LinkResourceStore; | 35 | +import org.onosproject.net.resource.link.LinkResourceStore; |
| 36 | -import org.onosproject.net.resource.LinkResourceStoreDelegate; | 36 | +import org.onosproject.net.resource.link.LinkResourceStoreDelegate; |
| 37 | -import org.onosproject.net.resource.MplsLabel; | 37 | +import org.onosproject.net.resource.link.MplsLabel; |
| 38 | -import org.onosproject.net.resource.MplsLabelResourceAllocation; | 38 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; |
| 39 | import org.onosproject.net.resource.ResourceAllocation; | 39 | import org.onosproject.net.resource.ResourceAllocation; |
| 40 | import org.onosproject.net.resource.ResourceAllocationException; | 40 | import org.onosproject.net.resource.ResourceAllocationException; |
| 41 | import org.onosproject.net.resource.ResourceType; | 41 | import org.onosproject.net.resource.ResourceType; | ... | ... |
| ... | @@ -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.serializers.impl; | 16 | +package org.onosproject.store.serializers.custom; |
| 17 | 17 | ||
| 18 | import org.onosproject.cluster.NodeId; | 18 | import org.onosproject.cluster.NodeId; |
| 19 | import org.onosproject.store.cluster.messaging.ClusterMessage; | 19 | import org.onosproject.store.cluster.messaging.ClusterMessage; | ... | ... |
| ... | @@ -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.serializers.impl; | 16 | +package org.onosproject.store.serializers.custom; |
| 17 | 17 | ||
| 18 | import org.onosproject.store.impl.MastershipBasedTimestamp; | 18 | import org.onosproject.store.impl.MastershipBasedTimestamp; |
| 19 | import org.onosproject.store.impl.Timestamped; | 19 | import org.onosproject.store.impl.Timestamped; | ... | ... |
| ... | @@ -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.serializers.impl; | 16 | +package org.onosproject.store.serializers.custom; |
| 17 | 17 | ||
| 18 | import org.onosproject.store.impl.MastershipBasedTimestamp; | 18 | import org.onosproject.store.impl.MastershipBasedTimestamp; |
| 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.store.serializers.impl; | 16 | +package org.onosproject.store.serializers.custom; |
| 17 | 17 | ||
| 18 | import org.onosproject.store.cluster.messaging.MessageSubject; | 18 | import org.onosproject.store.cluster.messaging.MessageSubject; |
| 19 | 19 | ... | ... |
| ... | @@ -17,4 +17,6 @@ | ... | @@ -17,4 +17,6 @@ |
| 17 | /** | 17 | /** |
| 18 | * Cluster messaging and distributed store serializers. | 18 | * Cluster messaging and distributed store serializers. |
| 19 | */ | 19 | */ |
| 20 | -package org.onosproject.store.serializers.impl; | 20 | +//FIXME what is the right name for this package? |
| 21 | +//FIXME can this be moved to onos-core-serializers? | ||
| 22 | +package org.onosproject.store.serializers.custom; | ... | ... |
| ... | @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; | ... | @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; |
| 21 | 21 | ||
| 22 | import org.junit.Test; | 22 | import org.junit.Test; |
| 23 | import org.onosproject.store.Timestamp; | 23 | import org.onosproject.store.Timestamp; |
| 24 | -import org.onosproject.store.serializers.impl.MastershipBasedTimestampSerializer; | 24 | +import org.onosproject.store.serializers.custom.MastershipBasedTimestampSerializer; |
| 25 | import org.onlab.util.KryoNamespace; | 25 | import org.onlab.util.KryoNamespace; |
| 26 | 26 | ||
| 27 | import com.google.common.testing.EqualsTester; | 27 | import com.google.common.testing.EqualsTester; | ... | ... |
| ... | @@ -152,18 +152,18 @@ import org.onosproject.net.packet.DefaultOutboundPacket; | ... | @@ -152,18 +152,18 @@ import org.onosproject.net.packet.DefaultOutboundPacket; |
| 152 | import org.onosproject.net.packet.DefaultPacketRequest; | 152 | import org.onosproject.net.packet.DefaultPacketRequest; |
| 153 | import org.onosproject.net.packet.PacketPriority; | 153 | import org.onosproject.net.packet.PacketPriority; |
| 154 | import org.onosproject.net.provider.ProviderId; | 154 | import org.onosproject.net.provider.ProviderId; |
| 155 | -import org.onosproject.net.resource.BandwidthResource; | 155 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 156 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 156 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 157 | -import org.onosproject.net.resource.BandwidthResourceRequest; | 157 | +import org.onosproject.net.resource.link.BandwidthResourceRequest; |
| 158 | -import org.onosproject.net.resource.DefaultLinkResourceAllocations; | 158 | +import org.onosproject.net.resource.link.DefaultLinkResourceAllocations; |
| 159 | -import org.onosproject.net.resource.DefaultLinkResourceRequest; | 159 | +import org.onosproject.net.resource.link.DefaultLinkResourceRequest; |
| 160 | -import org.onosproject.net.resource.LambdaResource; | 160 | +import org.onosproject.net.resource.link.LambdaResource; |
| 161 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 161 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 162 | -import org.onosproject.net.resource.LambdaResourceRequest; | 162 | +import org.onosproject.net.resource.link.LambdaResourceRequest; |
| 163 | -import org.onosproject.net.resource.LinkResourceRequest; | 163 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 164 | -import org.onosproject.net.resource.MplsLabel; | 164 | +import org.onosproject.net.resource.link.MplsLabel; |
| 165 | -import org.onosproject.net.resource.MplsLabelResourceAllocation; | 165 | +import org.onosproject.net.resource.link.MplsLabelResourceAllocation; |
| 166 | -import org.onosproject.net.resource.MplsLabelResourceRequest; | 166 | +import org.onosproject.net.resource.link.MplsLabelResourceRequest; |
| 167 | import org.onosproject.store.Timestamp; | 167 | import org.onosproject.store.Timestamp; |
| 168 | import org.onosproject.store.service.Versioned; | 168 | import org.onosproject.store.service.Versioned; |
| 169 | 169 | ... | ... |
| ... | @@ -59,13 +59,13 @@ import org.onosproject.net.flow.FlowRule; | ... | @@ -59,13 +59,13 @@ import org.onosproject.net.flow.FlowRule; |
| 59 | import org.onosproject.net.flow.FlowRuleBatchEntry; | 59 | import org.onosproject.net.flow.FlowRuleBatchEntry; |
| 60 | import org.onosproject.net.intent.IntentId; | 60 | import org.onosproject.net.intent.IntentId; |
| 61 | import org.onosproject.net.provider.ProviderId; | 61 | import org.onosproject.net.provider.ProviderId; |
| 62 | -import org.onosproject.net.resource.BandwidthResource; | 62 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 63 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 63 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 64 | -import org.onosproject.net.resource.DefaultLinkResourceAllocations; | 64 | +import org.onosproject.net.resource.link.DefaultLinkResourceAllocations; |
| 65 | -import org.onosproject.net.resource.DefaultLinkResourceRequest; | 65 | +import org.onosproject.net.resource.link.DefaultLinkResourceRequest; |
| 66 | -import org.onosproject.net.resource.LambdaResource; | 66 | +import org.onosproject.net.resource.link.LambdaResource; |
| 67 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 67 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 68 | -import org.onosproject.net.resource.LinkResourceRequest; | 68 | +import org.onosproject.net.resource.link.LinkResourceRequest; |
| 69 | import org.onosproject.net.resource.ResourceAllocation; | 69 | import org.onosproject.net.resource.ResourceAllocation; |
| 70 | import org.onosproject.net.intent.constraint.AnnotationConstraint; | 70 | import org.onosproject.net.intent.constraint.AnnotationConstraint; |
| 71 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 71 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | ... | ... |
| ... | @@ -32,13 +32,13 @@ import org.onosproject.net.AnnotationKeys; | ... | @@ -32,13 +32,13 @@ import org.onosproject.net.AnnotationKeys; |
| 32 | import org.onosproject.net.Annotations; | 32 | import org.onosproject.net.Annotations; |
| 33 | import org.onosproject.net.Link; | 33 | import org.onosproject.net.Link; |
| 34 | import org.onosproject.net.intent.IntentId; | 34 | import org.onosproject.net.intent.IntentId; |
| 35 | -import org.onosproject.net.resource.BandwidthResource; | 35 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 36 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 36 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 37 | -import org.onosproject.net.resource.LambdaResource; | 37 | +import org.onosproject.net.resource.link.LambdaResource; |
| 38 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 38 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 39 | -import org.onosproject.net.resource.LinkResourceAllocations; | 39 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 40 | -import org.onosproject.net.resource.LinkResourceEvent; | 40 | +import org.onosproject.net.resource.link.LinkResourceEvent; |
| 41 | -import org.onosproject.net.resource.LinkResourceStore; | 41 | +import org.onosproject.net.resource.link.LinkResourceStore; |
| 42 | import org.onosproject.net.resource.ResourceAllocation; | 42 | import org.onosproject.net.resource.ResourceAllocation; |
| 43 | import org.onosproject.net.resource.ResourceAllocationException; | 43 | import org.onosproject.net.resource.ResourceAllocationException; |
| 44 | import org.onosproject.net.resource.ResourceType; | 44 | import org.onosproject.net.resource.ResourceType; | ... | ... |
core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java
| ... | @@ -31,12 +31,12 @@ import org.onosproject.net.DefaultLink; | ... | @@ -31,12 +31,12 @@ import org.onosproject.net.DefaultLink; |
| 31 | import org.onosproject.net.Link; | 31 | import org.onosproject.net.Link; |
| 32 | import org.onosproject.net.intent.IntentId; | 32 | import org.onosproject.net.intent.IntentId; |
| 33 | import org.onosproject.net.provider.ProviderId; | 33 | import org.onosproject.net.provider.ProviderId; |
| 34 | -import org.onosproject.net.resource.BandwidthResource; | 34 | +import org.onosproject.net.resource.link.BandwidthResource; |
| 35 | -import org.onosproject.net.resource.BandwidthResourceAllocation; | 35 | +import org.onosproject.net.resource.link.BandwidthResourceAllocation; |
| 36 | -import org.onosproject.net.resource.LambdaResource; | 36 | +import org.onosproject.net.resource.link.LambdaResource; |
| 37 | -import org.onosproject.net.resource.LambdaResourceAllocation; | 37 | +import org.onosproject.net.resource.link.LambdaResourceAllocation; |
| 38 | -import org.onosproject.net.resource.LinkResourceAllocations; | 38 | +import org.onosproject.net.resource.link.LinkResourceAllocations; |
| 39 | -import org.onosproject.net.resource.LinkResourceStore; | 39 | +import org.onosproject.net.resource.link.LinkResourceStore; |
| 40 | import org.onosproject.net.resource.ResourceAllocation; | 40 | import org.onosproject.net.resource.ResourceAllocation; |
| 41 | import org.onosproject.net.resource.ResourceAllocationException; | 41 | import org.onosproject.net.resource.ResourceAllocationException; |
| 42 | import org.onosproject.net.resource.ResourceRequest; | 42 | import org.onosproject.net.resource.ResourceRequest; | ... | ... |
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
-
Please register or login to post a comment