Committed by
Ray Milkey
ONOS-1066: Move IntentCompilers to the dedicated package
Change-Id: I3e588cab0559093d389c9d44d2c7df536cabe953
Showing
12 changed files
with
16 additions
and
12 deletions
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import com.google.common.base.Predicate; | 18 | import com.google.common.base.Predicate; |
19 | import com.google.common.collect.FluentIterable; | 19 | import com.google.common.collect.FluentIterable; |
... | @@ -27,6 +27,7 @@ import org.onosproject.net.intent.ConnectivityIntent; | ... | @@ -27,6 +27,7 @@ import org.onosproject.net.intent.ConnectivityIntent; |
27 | import org.onosproject.net.intent.Constraint; | 27 | import org.onosproject.net.intent.Constraint; |
28 | import org.onosproject.net.intent.IntentCompiler; | 28 | 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.provider.ProviderId; | 31 | import org.onosproject.net.provider.ProviderId; |
31 | import org.onosproject.net.resource.LinkResourceService; | 32 | import org.onosproject.net.resource.LinkResourceService; |
32 | import org.onosproject.net.topology.LinkWeight; | 33 | import org.onosproject.net.topology.LinkWeight; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.net.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import org.apache.felix.scr.annotations.Activate; | 18 | import org.apache.felix.scr.annotations.Activate; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
1 | -package org.onosproject.net.intent.impl; | 1 | +package org.onosproject.net.intent.impl.compiler; |
2 | 2 | ||
3 | import static java.util.Arrays.asList; | 3 | import static java.util.Arrays.asList; |
4 | import static org.onosproject.net.DefaultEdgeLink.createEdgeLink; | 4 | import static org.onosproject.net.DefaultEdgeLink.createEdgeLink; | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import java.util.Arrays; | 18 | import java.util.Arrays; |
19 | import java.util.HashMap; | 19 | import java.util.HashMap; |
... | @@ -36,6 +36,7 @@ import org.onosproject.net.intent.IntentExtensionService; | ... | @@ -36,6 +36,7 @@ import org.onosproject.net.intent.IntentExtensionService; |
36 | import org.onosproject.net.intent.LinkCollectionIntent; | 36 | 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.resource.LinkResourceAllocations; | 40 | import org.onosproject.net.resource.LinkResourceAllocations; |
40 | import org.onosproject.net.topology.PathService; | 41 | import org.onosproject.net.topology.PathService; |
41 | 42 | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import com.google.common.collect.ImmutableList; | 18 | import com.google.common.collect.ImmutableList; |
19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; |
... | @@ -29,6 +29,7 @@ import org.onosproject.net.intent.IntentCompiler; | ... | @@ -29,6 +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.OpticalConnectivityIntent; | 30 | import org.onosproject.net.intent.OpticalConnectivityIntent; |
31 | import org.onosproject.net.intent.OpticalPathIntent; | 31 | import org.onosproject.net.intent.OpticalPathIntent; |
32 | +import org.onosproject.net.intent.impl.PathNotFoundException; | ||
32 | import org.onosproject.net.resource.LinkResourceAllocations; | 33 | import org.onosproject.net.resource.LinkResourceAllocations; |
33 | import org.onosproject.net.topology.LinkWeight; | 34 | import org.onosproject.net.topology.LinkWeight; |
34 | import org.onosproject.net.topology.Topology; | 35 | import org.onosproject.net.topology.Topology; | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import org.apache.felix.scr.annotations.Activate; | 18 | import org.apache.felix.scr.annotations.Activate; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import java.util.Arrays; | 18 | import java.util.Arrays; |
19 | import java.util.Collections; | 19 | 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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import com.google.common.collect.Lists; | 18 | import com.google.common.collect.Lists; |
19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import org.hamcrest.Matchers; | 18 | import org.hamcrest.Matchers; |
19 | import org.junit.Before; | 19 | import org.junit.Before; | ... | ... |
... | @@ -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.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import org.hamcrest.Matchers; | 18 | import org.hamcrest.Matchers; |
19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.net.intent.impl; | 16 | +package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | import org.hamcrest.Matchers; | 18 | import org.hamcrest.Matchers; |
19 | import org.junit.Test; | 19 | import org.junit.Test; |
... | @@ -32,6 +32,7 @@ import org.onosproject.net.intent.PathIntent; | ... | @@ -32,6 +32,7 @@ import org.onosproject.net.intent.PathIntent; |
32 | import org.onosproject.net.intent.PointToPointIntent; | 32 | import org.onosproject.net.intent.PointToPointIntent; |
33 | import org.onosproject.net.intent.constraint.BandwidthConstraint; | 33 | import org.onosproject.net.intent.constraint.BandwidthConstraint; |
34 | import org.onosproject.net.intent.constraint.LambdaConstraint; | 34 | import org.onosproject.net.intent.constraint.LambdaConstraint; |
35 | +import org.onosproject.net.intent.impl.PathNotFoundException; | ||
35 | import org.onosproject.net.resource.Bandwidth; | 36 | import org.onosproject.net.resource.Bandwidth; |
36 | import org.onosproject.net.resource.Lambda; | 37 | import org.onosproject.net.resource.Lambda; |
37 | import org.onosproject.net.resource.LinkResourceService; | 38 | import org.onosproject.net.resource.LinkResourceService; | ... | ... |
-
Please register or login to post a comment