홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
a4122367 1 parent eadfc8e3

ONOS-2190 - Move org.onosproject.net.config.* out of the incubator 

Change-Id: I57cac27ae370ce1155b4f637646d6c25732844e9
Inline Side-by-side
Showing 49 changed files with 110 additions and 93 deletions
...@@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command; ...@@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command;
20 import org.onosproject.cli.AbstractShellCommand; 20 import org.onosproject.cli.AbstractShellCommand;
21 import org.onosproject.core.ApplicationId; 21 import org.onosproject.core.ApplicationId;
22 import org.onosproject.core.CoreService; 22 import org.onosproject.core.CoreService;
23 -import org.onosproject.incubator.net.config.NetworkConfigService; 23 +import org.onosproject.net.config.NetworkConfigService;
24 import org.onosproject.routing.RoutingService; 24 import org.onosproject.routing.RoutingService;
25 import org.onosproject.routing.config.impl.BgpConfig; 25 import org.onosproject.routing.config.impl.BgpConfig;
26 26
......
...@@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command; ...@@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command;
20 import org.onosproject.cli.AbstractShellCommand; 20 import org.onosproject.cli.AbstractShellCommand;
21 import org.onosproject.core.ApplicationId; 21 import org.onosproject.core.ApplicationId;
22 import org.onosproject.core.CoreService; 22 import org.onosproject.core.CoreService;
23 -import org.onosproject.incubator.net.config.NetworkConfigService; 23 +import org.onosproject.net.config.NetworkConfigService;
24 import org.onosproject.routing.RoutingService; 24 import org.onosproject.routing.RoutingService;
25 import org.onosproject.routing.config.impl.BgpConfig; 25 import org.onosproject.routing.config.impl.BgpConfig;
26 26
......
...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; ...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
20 import com.google.common.collect.Sets; 20 import com.google.common.collect.Sets;
21 import org.onlab.packet.IpAddress; 21 import org.onlab.packet.IpAddress;
22 import org.onosproject.core.ApplicationId; 22 import org.onosproject.core.ApplicationId;
23 -import org.onosproject.incubator.net.config.Config; 23 +import org.onosproject.net.config.Config;
24 import org.onosproject.net.ConnectPoint; 24 import org.onosproject.net.ConnectPoint;
25 25
26 import java.util.Set; 26 import java.util.Set;
......
...@@ -30,8 +30,8 @@ import org.onlab.packet.Ip6Address; ...@@ -30,8 +30,8 @@ import org.onlab.packet.Ip6Address;
30 import org.onlab.packet.IpAddress; 30 import org.onlab.packet.IpAddress;
31 import org.onlab.packet.IpPrefix; 31 import org.onlab.packet.IpPrefix;
32 import org.onlab.packet.MacAddress; 32 import org.onlab.packet.MacAddress;
33 -import org.onosproject.incubator.net.config.ConfigFactory; 33 +import org.onosproject.net.config.ConfigFactory;
34 -import org.onosproject.incubator.net.config.NetworkConfigRegistry; 34 +import org.onosproject.net.config.NetworkConfigRegistry;
35 import org.onosproject.incubator.net.config.basics.SubjectFactories; 35 import org.onosproject.incubator.net.config.basics.SubjectFactories;
36 import org.onosproject.net.ConnectPoint; 36 import org.onosproject.net.ConnectPoint;
37 import org.onosproject.net.host.HostService; 37 import org.onosproject.net.host.HostService;
......
...@@ -20,9 +20,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; ...@@ -20,9 +20,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
20 import org.apache.karaf.shell.commands.Argument; 20 import org.apache.karaf.shell.commands.Argument;
21 import org.apache.karaf.shell.commands.Command; 21 import org.apache.karaf.shell.commands.Command;
22 import org.onosproject.cli.AbstractShellCommand; 22 import org.onosproject.cli.AbstractShellCommand;
23 -import org.onosproject.incubator.net.config.Config; 23 +import org.onosproject.net.config.Config;
24 -import org.onosproject.incubator.net.config.NetworkConfigService; 24 +import org.onosproject.net.config.NetworkConfigService;
25 -import org.onosproject.incubator.net.config.SubjectFactory; 25 +import org.onosproject.net.config.SubjectFactory;
26 26
27 import static com.google.common.base.Strings.isNullOrEmpty; 27 import static com.google.common.base.Strings.isNullOrEmpty;
28 28
......
...@@ -18,8 +18,8 @@ package org.onosproject.cli.cfg; ...@@ -18,8 +18,8 @@ package org.onosproject.cli.cfg;
18 import org.apache.karaf.shell.commands.Command; 18 import org.apache.karaf.shell.commands.Command;
19 import org.apache.karaf.shell.commands.Option; 19 import org.apache.karaf.shell.commands.Option;
20 import org.onosproject.cli.AbstractShellCommand; 20 import org.onosproject.cli.AbstractShellCommand;
21 -import org.onosproject.incubator.net.config.ConfigFactory; 21 +import org.onosproject.net.config.ConfigFactory;
22 -import org.onosproject.incubator.net.config.NetworkConfigRegistry; 22 +import org.onosproject.net.config.NetworkConfigRegistry;
23 23
24 /** 24 /**
25 * Displays network configuration registry contents. 25 * Displays network configuration registry contents.
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import com.fasterxml.jackson.databind.ObjectMapper; 18 import com.fasterxml.jackson.databind.ObjectMapper;
19 import com.fasterxml.jackson.databind.node.ArrayNode; 19 import com.fasterxml.jackson.databind.node.ArrayNode;
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 19
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 /** 18 /**
19 * An interface signifying a class that implements network configuration 19 * An interface signifying a class that implements network configuration
...@@ -28,4 +28,4 @@ package org.onosproject.incubator.net.config; ...@@ -28,4 +28,4 @@ package org.onosproject.incubator.net.config;
28 * entity will be used over that from the Description. 28 * entity will be used over that from the Description.
29 */ 29 */
30 public interface ConfigOperator { 30 public interface ConfigOperator {
31 -}
...\ No newline at end of file ...\ No newline at end of file
31 +}
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import org.onosproject.event.AbstractEvent; 18 import org.onosproject.event.AbstractEvent;
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.incubator.net.config; 16 +package org.onosproject.net.config;
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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 19
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import com.fasterxml.jackson.databind.node.ObjectNode; 18 import com.fasterxml.jackson.databind.node.ObjectNode;
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import com.fasterxml.jackson.databind.node.ObjectNode; 18 import com.fasterxml.jackson.databind.node.ObjectNode;
19 import org.onosproject.store.Store; 19 import org.onosproject.store.Store;
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Subsystem for tracking network environment configuration. 18 * Subsystem for tracking network environment configuration.
19 */ 19 */
20 -package org.onosproject.incubator.net.config;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.net.config;
......
...@@ -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.incubator.net.config; 16 +package org.onosproject.net.config;
17 17
18 import java.util.Set; 18 import java.util.Set;
19 19
......
1 -package org.onosproject.incubator.net.config; 1 +
2 +/*
3 + * Copyright 2015 Open Networking Laboratory
4 + *
5 + * Licensed under the Apache License, Version 2.0 (the "License");
6 + * you may not use this file except in compliance with the License.
7 + * You may obtain a copy of the License at
8 + *
9 + * http://www.apache.org/licenses/LICENSE-2.0
10 + *
11 + * Unless required by applicable law or agreed to in writing, software
12 + * distributed under the License is distributed on an "AS IS" BASIS,
13 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + * See the License for the specific language governing permissions and
15 + * limitations under the License.
16 + */
17 +
18 +package org.onosproject.net.config;
2 19
3 import com.fasterxml.jackson.databind.node.ObjectNode; 20 import com.fasterxml.jackson.databind.node.ObjectNode;
4 21
......
...@@ -17,7 +17,7 @@ package org.onosproject.net.device.impl; ...@@ -17,7 +17,7 @@ package org.onosproject.net.device.impl;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
20 -import org.onosproject.incubator.net.config.ConfigOperator; 20 +import org.onosproject.net.config.ConfigOperator;
21 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig; 21 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
22 import org.onosproject.net.AnnotationKeys; 22 import org.onosproject.net.AnnotationKeys;
23 import org.onosproject.net.DefaultAnnotations; 23 import org.onosproject.net.DefaultAnnotations;
......
...@@ -28,9 +28,9 @@ import org.onosproject.cluster.ClusterService; ...@@ -28,9 +28,9 @@ import org.onosproject.cluster.ClusterService;
28 import org.onosproject.cluster.NodeId; 28 import org.onosproject.cluster.NodeId;
29 import org.onosproject.net.provider.AbstractListenerProviderRegistry; 29 import org.onosproject.net.provider.AbstractListenerProviderRegistry;
30 import org.onosproject.core.Permission; 30 import org.onosproject.core.Permission;
31 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 31 +import org.onosproject.net.config.NetworkConfigEvent;
32 -import org.onosproject.incubator.net.config.NetworkConfigListener; 32 +import org.onosproject.net.config.NetworkConfigListener;
33 -import org.onosproject.incubator.net.config.NetworkConfigService; 33 +import org.onosproject.net.config.NetworkConfigService;
34 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig; 34 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
35 import org.onosproject.mastership.MastershipEvent; 35 import org.onosproject.mastership.MastershipEvent;
36 import org.onosproject.mastership.MastershipListener; 36 import org.onosproject.mastership.MastershipListener;
......
...@@ -17,7 +17,7 @@ package org.onosproject.net.device.impl; ...@@ -17,7 +17,7 @@ package org.onosproject.net.device.impl;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
20 -import org.onosproject.incubator.net.config.ConfigOperator; 20 +import org.onosproject.net.config.ConfigOperator;
21 import org.onosproject.incubator.net.config.basics.OpticalPortConfig; 21 import org.onosproject.incubator.net.config.basics.OpticalPortConfig;
22 import org.onosproject.net.AnnotationKeys; 22 import org.onosproject.net.AnnotationKeys;
23 import org.onosproject.net.DefaultAnnotations; 23 import org.onosproject.net.DefaultAnnotations;
......
...@@ -18,7 +18,7 @@ package org.onosproject.net.host.impl; ...@@ -18,7 +18,7 @@ package org.onosproject.net.host.impl;
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
20 import org.slf4j.Logger; 20 import org.slf4j.Logger;
21 -import org.onosproject.incubator.net.config.ConfigOperator; 21 +import org.onosproject.net.config.ConfigOperator;
22 import org.onosproject.incubator.net.config.basics.BasicHostConfig; 22 import org.onosproject.incubator.net.config.basics.BasicHostConfig;
23 import org.onosproject.net.AnnotationKeys; 23 import org.onosproject.net.AnnotationKeys;
24 import org.onosproject.net.DefaultAnnotations; 24 import org.onosproject.net.DefaultAnnotations;
......
...@@ -26,9 +26,9 @@ import org.onlab.packet.MacAddress; ...@@ -26,9 +26,9 @@ import org.onlab.packet.MacAddress;
26 import org.onlab.packet.VlanId; 26 import org.onlab.packet.VlanId;
27 import org.onosproject.net.provider.AbstractListenerProviderRegistry; 27 import org.onosproject.net.provider.AbstractListenerProviderRegistry;
28 import org.onosproject.core.Permission; 28 import org.onosproject.core.Permission;
29 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 29 +import org.onosproject.net.config.NetworkConfigEvent;
30 -import org.onosproject.incubator.net.config.NetworkConfigListener; 30 +import org.onosproject.net.config.NetworkConfigListener;
31 -import org.onosproject.incubator.net.config.NetworkConfigService; 31 +import org.onosproject.net.config.NetworkConfigService;
32 import org.onosproject.incubator.net.config.basics.BasicHostConfig; 32 import org.onosproject.incubator.net.config.basics.BasicHostConfig;
33 import org.onosproject.net.ConnectPoint; 33 import org.onosproject.net.ConnectPoint;
34 import org.onosproject.net.DeviceId; 34 import org.onosproject.net.DeviceId;
......
...@@ -20,7 +20,7 @@ import static org.slf4j.LoggerFactory.getLogger; ...@@ -20,7 +20,7 @@ import static org.slf4j.LoggerFactory.getLogger;
20 import java.time.Duration; 20 import java.time.Duration;
21 21
22 import org.onosproject.net.AnnotationKeys; 22 import org.onosproject.net.AnnotationKeys;
23 -import org.onosproject.incubator.net.config.ConfigOperator; 23 +import org.onosproject.net.config.ConfigOperator;
24 import org.onosproject.incubator.net.config.basics.BasicLinkConfig; 24 import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
25 import org.onosproject.net.DefaultAnnotations; 25 import org.onosproject.net.DefaultAnnotations;
26 import org.onosproject.net.Link; 26 import org.onosproject.net.Link;
......
...@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
26 import org.apache.felix.scr.annotations.Service; 26 import org.apache.felix.scr.annotations.Service;
27 import org.onosproject.net.provider.AbstractListenerProviderRegistry; 27 import org.onosproject.net.provider.AbstractListenerProviderRegistry;
28 import org.onosproject.core.Permission; 28 import org.onosproject.core.Permission;
29 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 29 +import org.onosproject.net.config.NetworkConfigEvent;
30 -import org.onosproject.incubator.net.config.NetworkConfigListener; 30 +import org.onosproject.net.config.NetworkConfigListener;
31 -import org.onosproject.incubator.net.config.NetworkConfigService; 31 +import org.onosproject.net.config.NetworkConfigService;
32 import org.onosproject.incubator.net.config.basics.BasicLinkConfig; 32 import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
33 import org.onosproject.net.ConnectPoint; 33 import org.onosproject.net.ConnectPoint;
34 import org.onosproject.net.DeviceId; 34 import org.onosproject.net.DeviceId;
......
...@@ -24,8 +24,8 @@ import java.net.URI; ...@@ -24,8 +24,8 @@ import java.net.URI;
24 import org.junit.Before; 24 import org.junit.Before;
25 import org.junit.Test; 25 import org.junit.Test;
26 import org.onlab.packet.ChassisId; 26 import org.onlab.packet.ChassisId;
27 -import org.onosproject.incubator.net.config.Config; 27 +import org.onosproject.net.config.Config;
28 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 28 +import org.onosproject.net.config.ConfigApplyDelegate;
29 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig; 29 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
30 import org.onosproject.net.AnnotationKeys; 30 import org.onosproject.net.AnnotationKeys;
31 import org.onosproject.net.DefaultAnnotations; 31 import org.onosproject.net.DefaultAnnotations;
......
...@@ -27,7 +27,7 @@ import org.onosproject.cluster.DefaultControllerNode; ...@@ -27,7 +27,7 @@ import org.onosproject.cluster.DefaultControllerNode;
27 import org.onosproject.cluster.NodeId; 27 import org.onosproject.cluster.NodeId;
28 import org.onosproject.common.event.impl.TestEventDispatcher; 28 import org.onosproject.common.event.impl.TestEventDispatcher;
29 import org.onosproject.event.Event; 29 import org.onosproject.event.Event;
30 -import org.onosproject.incubator.net.config.NetworkConfigServiceAdapter; 30 +import org.onosproject.net.config.NetworkConfigServiceAdapter;
31 import org.onosproject.mastership.MastershipServiceAdapter; 31 import org.onosproject.mastership.MastershipServiceAdapter;
32 import org.onosproject.mastership.MastershipTerm; 32 import org.onosproject.mastership.MastershipTerm;
33 import org.onosproject.mastership.MastershipTermService; 33 import org.onosproject.mastership.MastershipTermService;
......
...@@ -2,8 +2,8 @@ package org.onosproject.net.device.impl; ...@@ -2,8 +2,8 @@ package org.onosproject.net.device.impl;
2 2
3 import org.junit.Before; 3 import org.junit.Before;
4 import org.junit.Test; 4 import org.junit.Test;
5 -import org.onosproject.incubator.net.config.Config; 5 +import org.onosproject.net.config.Config;
6 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 6 +import org.onosproject.net.config.ConfigApplyDelegate;
7 import org.onosproject.incubator.net.config.basics.OpticalPortConfig; 7 import org.onosproject.incubator.net.config.basics.OpticalPortConfig;
8 import org.onosproject.net.AnnotationKeys; 8 import org.onosproject.net.AnnotationKeys;
9 import org.onosproject.net.ConnectPoint; 9 import org.onosproject.net.ConnectPoint;
......
...@@ -22,8 +22,8 @@ import org.junit.Test; ...@@ -22,8 +22,8 @@ import org.junit.Test;
22 import org.onlab.packet.IpAddress; 22 import org.onlab.packet.IpAddress;
23 import org.onlab.packet.MacAddress; 23 import org.onlab.packet.MacAddress;
24 import org.onlab.packet.VlanId; 24 import org.onlab.packet.VlanId;
25 -import org.onosproject.incubator.net.config.Config; 25 +import org.onosproject.net.config.Config;
26 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 26 +import org.onosproject.net.config.ConfigApplyDelegate;
27 import org.onosproject.incubator.net.config.basics.BasicHostConfig; 27 import org.onosproject.incubator.net.config.basics.BasicHostConfig;
28 import org.onosproject.net.AnnotationKeys; 28 import org.onosproject.net.AnnotationKeys;
29 import org.onosproject.net.DeviceId; 29 import org.onosproject.net.DeviceId;
......
...@@ -38,7 +38,7 @@ import org.onlab.packet.MacAddress; ...@@ -38,7 +38,7 @@ import org.onlab.packet.MacAddress;
38 import org.onlab.packet.VlanId; 38 import org.onlab.packet.VlanId;
39 import org.onosproject.event.Event; 39 import org.onosproject.event.Event;
40 import org.onosproject.common.event.impl.TestEventDispatcher; 40 import org.onosproject.common.event.impl.TestEventDispatcher;
41 -import org.onosproject.incubator.net.config.NetworkConfigServiceAdapter; 41 +import org.onosproject.net.config.NetworkConfigServiceAdapter;
42 import org.onosproject.net.ConnectPoint; 42 import org.onosproject.net.ConnectPoint;
43 import org.onosproject.net.DeviceId; 43 import org.onosproject.net.DeviceId;
44 import org.onosproject.net.Host; 44 import org.onosproject.net.Host;
......
...@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; ...@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
22 import java.time.Duration; 22 import java.time.Duration;
23 import org.junit.Before; 23 import org.junit.Before;
24 import org.junit.Test; 24 import org.junit.Test;
25 -import org.onosproject.incubator.net.config.Config; 25 +import org.onosproject.net.config.Config;
26 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 26 +import org.onosproject.net.config.ConfigApplyDelegate;
27 import org.onosproject.incubator.net.config.basics.BasicLinkConfig; 27 import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
28 import org.onosproject.net.AnnotationKeys; 28 import org.onosproject.net.AnnotationKeys;
29 import org.onosproject.net.ConnectPoint; 29 import org.onosproject.net.ConnectPoint;
......
...@@ -20,7 +20,7 @@ import org.junit.After; ...@@ -20,7 +20,7 @@ import org.junit.After;
20 import org.junit.Before; 20 import org.junit.Before;
21 import org.junit.Test; 21 import org.junit.Test;
22 import org.onosproject.event.Event; 22 import org.onosproject.event.Event;
23 -import org.onosproject.incubator.net.config.NetworkConfigServiceAdapter; 23 +import org.onosproject.net.config.NetworkConfigServiceAdapter;
24 import org.onosproject.net.ConnectPoint; 24 import org.onosproject.net.ConnectPoint;
25 import org.onosproject.net.DefaultDevice; 25 import org.onosproject.net.DefaultDevice;
26 import org.onosproject.net.Device; 26 import org.onosproject.net.Device;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 */ 15 */
16 package org.onosproject.incubator.net.config.basics; 16 package org.onosproject.incubator.net.config.basics;
17 17
18 -import org.onosproject.incubator.net.config.Config; 18 +import org.onosproject.net.config.Config;
19 19
20 /** 20 /**
21 * Base abstraction for network entities for which admission into control 21 * Base abstraction for network entities for which admission into control
......
...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; ...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
20 import com.google.common.collect.Sets; 20 import com.google.common.collect.Sets;
21 import org.onlab.packet.MacAddress; 21 import org.onlab.packet.MacAddress;
22 import org.onlab.packet.VlanId; 22 import org.onlab.packet.VlanId;
23 -import org.onosproject.incubator.net.config.Config; 23 +import org.onosproject.net.config.Config;
24 import org.onosproject.incubator.net.intf.Interface; 24 import org.onosproject.incubator.net.intf.Interface;
25 import org.onosproject.net.ConnectPoint; 25 import org.onosproject.net.ConnectPoint;
26 import org.onosproject.net.host.InterfaceIpAddress; 26 import org.onosproject.net.host.InterfaceIpAddress;
......
...@@ -2,7 +2,7 @@ package org.onosproject.incubator.net.config.basics; ...@@ -2,7 +2,7 @@ package org.onosproject.incubator.net.config.basics;
2 2
3 import java.util.Optional; 3 import java.util.Optional;
4 4
5 -import org.onosproject.incubator.net.config.Config; 5 +import org.onosproject.net.config.Config;
6 import org.onosproject.net.ConnectPoint; 6 import org.onosproject.net.ConnectPoint;
7 import org.onosproject.net.Port; 7 import org.onosproject.net.Port;
8 8
......
...@@ -17,7 +17,7 @@ package org.onosproject.incubator.net.config.basics; ...@@ -17,7 +17,7 @@ package org.onosproject.incubator.net.config.basics;
17 17
18 import org.onosproject.core.ApplicationId; 18 import org.onosproject.core.ApplicationId;
19 import org.onosproject.core.CoreService; 19 import org.onosproject.core.CoreService;
20 -import org.onosproject.incubator.net.config.SubjectFactory; 20 +import org.onosproject.net.config.SubjectFactory;
21 import org.onosproject.incubator.net.domain.IntentDomainId; 21 import org.onosproject.incubator.net.domain.IntentDomainId;
22 import org.onosproject.net.ConnectPoint; 22 import org.onosproject.net.ConnectPoint;
23 import org.onosproject.net.DeviceId; 23 import org.onosproject.net.DeviceId;
......
...@@ -17,7 +17,7 @@ package org.onosproject.incubator.net.domain; ...@@ -17,7 +17,7 @@ package org.onosproject.incubator.net.domain;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 import com.google.common.collect.ImmutableSet; 19 import com.google.common.collect.ImmutableSet;
20 -import org.onosproject.incubator.net.config.Config; 20 +import org.onosproject.net.config.Config;
21 import org.onosproject.net.ConnectPoint; 21 import org.onosproject.net.ConnectPoint;
22 import org.onosproject.net.DeviceId; 22 import org.onosproject.net.DeviceId;
23 23
......
...@@ -14,8 +14,8 @@ import java.util.List; ...@@ -14,8 +14,8 @@ import java.util.List;
14 14
15 import org.junit.Before; 15 import org.junit.Before;
16 import org.junit.Test; 16 import org.junit.Test;
17 -import org.onosproject.incubator.net.config.Config; 17 +import org.onosproject.net.config.Config;
18 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 18 +import org.onosproject.net.config.ConfigApplyDelegate;
19 import org.onosproject.net.ConnectPoint; 19 import org.onosproject.net.ConnectPoint;
20 import org.onosproject.net.DeviceId; 20 import org.onosproject.net.DeviceId;
21 import org.onosproject.net.Port; 21 import org.onosproject.net.Port;
......
...@@ -23,8 +23,8 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -23,8 +23,8 @@ import org.apache.felix.scr.annotations.Deactivate;
23 import org.apache.felix.scr.annotations.Reference; 23 import org.apache.felix.scr.annotations.Reference;
24 import org.apache.felix.scr.annotations.ReferenceCardinality; 24 import org.apache.felix.scr.annotations.ReferenceCardinality;
25 import org.onosproject.core.CoreService; 25 import org.onosproject.core.CoreService;
26 -import org.onosproject.incubator.net.config.ConfigFactory; 26 +import org.onosproject.net.config.ConfigFactory;
27 -import org.onosproject.incubator.net.config.NetworkConfigRegistry; 27 +import org.onosproject.net.config.NetworkConfigRegistry;
28 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig; 28 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
29 import org.onosproject.incubator.net.config.basics.BasicHostConfig; 29 import org.onosproject.incubator.net.config.basics.BasicHostConfig;
30 import org.onosproject.incubator.net.config.basics.BasicLinkConfig; 30 import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
......
...@@ -23,9 +23,9 @@ import org.apache.felix.scr.annotations.Component; ...@@ -23,9 +23,9 @@ import org.apache.felix.scr.annotations.Component;
23 import org.apache.felix.scr.annotations.Deactivate; 23 import org.apache.felix.scr.annotations.Deactivate;
24 import org.apache.felix.scr.annotations.Reference; 24 import org.apache.felix.scr.annotations.Reference;
25 import org.apache.felix.scr.annotations.ReferenceCardinality; 25 import org.apache.felix.scr.annotations.ReferenceCardinality;
26 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 26 +import org.onosproject.net.config.NetworkConfigEvent;
27 -import org.onosproject.incubator.net.config.NetworkConfigListener; 27 +import org.onosproject.net.config.NetworkConfigListener;
28 -import org.onosproject.incubator.net.config.NetworkConfigService; 28 +import org.onosproject.net.config.NetworkConfigService;
29 import org.slf4j.Logger; 29 import org.slf4j.Logger;
30 import org.slf4j.LoggerFactory; 30 import org.slf4j.LoggerFactory;
31 31
......
...@@ -25,15 +25,15 @@ import org.apache.felix.scr.annotations.Reference; ...@@ -25,15 +25,15 @@ import org.apache.felix.scr.annotations.Reference;
25 import org.apache.felix.scr.annotations.ReferenceCardinality; 25 import org.apache.felix.scr.annotations.ReferenceCardinality;
26 import org.apache.felix.scr.annotations.Service; 26 import org.apache.felix.scr.annotations.Service;
27 import org.onosproject.event.AbstractListenerManager; 27 import org.onosproject.event.AbstractListenerManager;
28 -import org.onosproject.incubator.net.config.Config; 28 +import org.onosproject.net.config.Config;
29 -import org.onosproject.incubator.net.config.ConfigFactory; 29 +import org.onosproject.net.config.ConfigFactory;
30 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 30 +import org.onosproject.net.config.NetworkConfigEvent;
31 -import org.onosproject.incubator.net.config.NetworkConfigListener; 31 +import org.onosproject.net.config.NetworkConfigListener;
32 -import org.onosproject.incubator.net.config.NetworkConfigRegistry; 32 +import org.onosproject.net.config.NetworkConfigRegistry;
33 -import org.onosproject.incubator.net.config.NetworkConfigService; 33 +import org.onosproject.net.config.NetworkConfigService;
34 -import org.onosproject.incubator.net.config.NetworkConfigStore; 34 +import org.onosproject.net.config.NetworkConfigStore;
35 -import org.onosproject.incubator.net.config.NetworkConfigStoreDelegate; 35 +import org.onosproject.net.config.NetworkConfigStoreDelegate;
36 -import org.onosproject.incubator.net.config.SubjectFactory; 36 +import org.onosproject.net.config.SubjectFactory;
37 import org.slf4j.Logger; 37 import org.slf4j.Logger;
38 import org.slf4j.LoggerFactory; 38 import org.slf4j.LoggerFactory;
39 39
......
...@@ -31,9 +31,9 @@ import org.onlab.graph.AdjacencyListsGraph; ...@@ -31,9 +31,9 @@ import org.onlab.graph.AdjacencyListsGraph;
31 import org.onlab.graph.Graph; 31 import org.onlab.graph.Graph;
32 import org.onosproject.core.ApplicationId; 32 import org.onosproject.core.ApplicationId;
33 import org.onosproject.core.CoreService; 33 import org.onosproject.core.CoreService;
34 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 34 +import org.onosproject.net.config.NetworkConfigEvent;
35 -import org.onosproject.incubator.net.config.NetworkConfigListener; 35 +import org.onosproject.net.config.NetworkConfigListener;
36 -import org.onosproject.incubator.net.config.NetworkConfigService; 36 +import org.onosproject.net.config.NetworkConfigService;
37 import org.onosproject.incubator.net.domain.DomainEdge; 37 import org.onosproject.incubator.net.domain.DomainEdge;
38 import org.onosproject.incubator.net.domain.DomainVertex; 38 import org.onosproject.incubator.net.domain.DomainVertex;
39 import org.onosproject.incubator.net.domain.IntentDomain; 39 import org.onosproject.incubator.net.domain.IntentDomain;
......
...@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
26 import org.apache.felix.scr.annotations.Service; 26 import org.apache.felix.scr.annotations.Service;
27 import org.onlab.packet.IpAddress; 27 import org.onlab.packet.IpAddress;
28 import org.onlab.packet.VlanId; 28 import org.onlab.packet.VlanId;
29 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 29 +import org.onosproject.net.config.NetworkConfigEvent;
30 -import org.onosproject.incubator.net.config.NetworkConfigListener; 30 +import org.onosproject.net.config.NetworkConfigListener;
31 -import org.onosproject.incubator.net.config.NetworkConfigService; 31 +import org.onosproject.net.config.NetworkConfigService;
32 import org.onosproject.incubator.net.config.basics.InterfaceConfig; 32 import org.onosproject.incubator.net.config.basics.InterfaceConfig;
33 import org.onosproject.incubator.net.intf.Interface; 33 import org.onosproject.incubator.net.intf.Interface;
34 import org.onosproject.incubator.net.intf.InterfaceService; 34 import org.onosproject.incubator.net.intf.InterfaceService;
......
...@@ -22,11 +22,11 @@ import org.junit.Before; ...@@ -22,11 +22,11 @@ import org.junit.Before;
22 import org.junit.Test; 22 import org.junit.Test;
23 import org.onlab.junit.TestUtils; 23 import org.onlab.junit.TestUtils;
24 import org.onosproject.event.EventDeliveryServiceAdapter; 24 import org.onosproject.event.EventDeliveryServiceAdapter;
25 -import org.onosproject.incubator.net.config.Config; 25 +import org.onosproject.net.config.Config;
26 -import org.onosproject.incubator.net.config.ConfigFactory; 26 +import org.onosproject.net.config.ConfigFactory;
27 -import org.onosproject.incubator.net.config.NetworkConfigRegistry; 27 +import org.onosproject.net.config.NetworkConfigRegistry;
28 -import org.onosproject.incubator.net.config.NetworkConfigService; 28 +import org.onosproject.net.config.NetworkConfigService;
29 -import org.onosproject.incubator.net.config.SubjectFactory; 29 +import org.onosproject.net.config.SubjectFactory;
30 import org.onosproject.incubator.store.config.impl.DistributedNetworkConfigStore; 30 import org.onosproject.incubator.store.config.impl.DistributedNetworkConfigStore;
31 import org.onosproject.net.NetTestTools; 31 import org.onosproject.net.NetTestTools;
32 import org.onosproject.store.service.TestStorageService; 32 import org.onosproject.store.service.TestStorageService;
......
...@@ -35,12 +35,12 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -35,12 +35,12 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
35 import org.apache.felix.scr.annotations.Service; 35 import org.apache.felix.scr.annotations.Service;
36 import org.onlab.util.KryoNamespace; 36 import org.onlab.util.KryoNamespace;
37 import org.onlab.util.Tools; 37 import org.onlab.util.Tools;
38 -import org.onosproject.incubator.net.config.Config; 38 +import org.onosproject.net.config.Config;
39 -import org.onosproject.incubator.net.config.ConfigApplyDelegate; 39 +import org.onosproject.net.config.ConfigApplyDelegate;
40 -import org.onosproject.incubator.net.config.ConfigFactory; 40 +import org.onosproject.net.config.ConfigFactory;
41 -import org.onosproject.incubator.net.config.NetworkConfigEvent; 41 +import org.onosproject.net.config.NetworkConfigEvent;
42 -import org.onosproject.incubator.net.config.NetworkConfigStore; 42 +import org.onosproject.net.config.NetworkConfigStore;
43 -import org.onosproject.incubator.net.config.NetworkConfigStoreDelegate; 43 +import org.onosproject.net.config.NetworkConfigStoreDelegate;
44 import org.onosproject.store.AbstractStore; 44 import org.onosproject.store.AbstractStore;
45 import org.onosproject.store.serializers.KryoNamespaces; 45 import org.onosproject.store.serializers.KryoNamespaces;
46 import org.onosproject.store.service.ConsistentMap; 46 import org.onosproject.store.service.ConsistentMap;
...@@ -58,7 +58,7 @@ import java.util.Map; ...@@ -58,7 +58,7 @@ import java.util.Map;
58 import java.util.Objects; 58 import java.util.Objects;
59 import java.util.Set; 59 import java.util.Set;
60 60
61 -import static org.onosproject.incubator.net.config.NetworkConfigEvent.Type.*; 61 +import static org.onosproject.net.config.NetworkConfigEvent.Type.*;
62 62
63 /** 63 /**
64 * Implementation of a distributed network configuration store. 64 * Implementation of a distributed network configuration store.
......
...@@ -18,9 +18,9 @@ package org.onosproject.incubator.store.config.impl; ...@@ -18,9 +18,9 @@ package org.onosproject.incubator.store.config.impl;
18 import org.junit.After; 18 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.incubator.net.config.Config; 21 +import org.onosproject.net.config.Config;
22 -import org.onosproject.incubator.net.config.ConfigFactory; 22 +import org.onosproject.net.config.ConfigFactory;
23 -import org.onosproject.incubator.net.config.SubjectFactory; 23 +import org.onosproject.net.config.SubjectFactory;
24 import org.onosproject.store.service.TestStorageService; 24 import org.onosproject.store.service.TestStorageService;
25 25
26 import com.fasterxml.jackson.databind.ObjectMapper; 26 import com.fasterxml.jackson.databind.ObjectMapper;
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
16 package org.onosproject.rest.resources; 16 package org.onosproject.rest.resources;
17 17
18 import com.fasterxml.jackson.databind.node.ObjectNode; 18 import com.fasterxml.jackson.databind.node.ObjectNode;
19 -import org.onosproject.incubator.net.config.NetworkConfigService; 19 +import org.onosproject.net.config.NetworkConfigService;
20 -import org.onosproject.incubator.net.config.SubjectFactory; 20 +import org.onosproject.net.config.SubjectFactory;
21 import org.onosproject.rest.AbstractWebResource; 21 import org.onosproject.rest.AbstractWebResource;
22 22
23 import javax.ws.rs.Consumes; 23 import javax.ws.rs.Consumes;
......