Detangling incubator: virtual nets, tunnels, resource labels, oh my

- virtual networking moved to /apps/virtual; with CLI & REST API
- tunnels and labels moved to /apps/tunnel; with CLI & REST API; UI disabled for now
- protobuf/models moved to /core/protobuf/models
- defunct grpc/rpc registry stuff left under /graveyard
- compile dependencies on /incubator moved to respective modules for compilation
- run-time dependencies will need to be re-tested for dependent apps

- /graveyard will be removed in not-too-distant future

Change-Id: I0a0b995c635487edcf95a352f50dd162186b0b39

apps/bgprouter/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
 ]
 

apps/castor/BUILD

@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + REST + [
     "//core/store/serializers:onos-core-serializers",
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/intentsync:onos-apps-intentsync",
 ]
@@ -12,7 +11,6 @@ BUNDLES = [
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    "//incubator/api:onos-incubator-api-tests",
     "//apps/routing-api:onos-apps-routing-api-tests",
 ]
 

apps/dpistats/BUILD

@@ -0,0 +1,13 @@
+BUNDLES = [
+    "//apps/dpistats/api:onos-apps-dpistats-api",
+    "//apps/dpistats/app:onos-apps-dpistats-app",
+]
+
+onos_app(
+    app_name = "org.onosproject.dpistats",
+    category = "Traffic Engineering",
+    description = "dpistats Network Subsystem extension",
+    included_bundles = BUNDLES,
+    title = "dpistats Network Subsystem",
+    url = "http://onosproject.org",
+)

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/DpiStatInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/DpiStatInfoCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/DpiStatistics.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/DpiStatisticsCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/DpiStatisticsManagerService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/FlowStatInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/FlowStatInfoCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/ProtocolStatInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/ProtocolStatInfoCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/TrafficStatInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/TrafficStatInfoCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/api/src/main/java/org/onosproject/incubator/net/dpi/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/dpistats/app/BUILD

@@ -0,0 +1,16 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + REST + CLI + [
+    "//apps/dpistats/api:onos-apps-dpistats-api",
+]
+
+TEST_DEPS = TEST_ADAPTERS
+
+osgi_jar_with_tests(
+    api_description = "REST API for DPI Stats",
+    api_package = "org.onosproject.incubator.net.dpi",
+    api_title = "DPI Stats",
+    api_version = "1.0",
+    karaf_command_packages = ["org.onosproject.incubator.net.dpi"],
+    test_deps = TEST_DEPS,
+    visibility = ["//visibility:public"],
+    deps = COMPILE_DEPS,
+)

apps/dpistats/app/src/main/java/org/onosproject/incubator/net/dpi/impl/DpiStatisticsManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,6 +110,12 @@ public class DpiStatisticsManager implements DpiStatisticsManagerService {
     public void activate(ComponentContext context) {
         appId = coreService.registerApplication("org.onosproject.dpi");
 
+//        registerCodec(DpiStatistics.class, new DpiStatisticsCodec());
+//        registerCodec(DpiStatInfo.class, new DpiStatInfoCodec());
+//        registerCodec(TrafficStatInfo.class, new TrafficStatInfoCodec());
+//        registerCodec(ProtocolStatInfo.class, new ProtocolStatInfoCodec());
+//        registerCodec(FlowStatInfo.class, new FlowStatInfoCodec());
+
         dpiStatisticsListener = new DpiStatisticsListener();
         dpiListenerThread.execute(dpiStatisticsListener);
 

apps/dpistats/app/src/main/java/org/onosproject/incubator/net/dpi/impl/DpisListCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cli.net;
+package org.onosproject.incubator.net.dpi.impl;
 
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;

apps/dpistats/app/src/main/java/org/onosproject/incubator/net/dpi/impl/DpisWebApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,20 @@
  * limitations under the License.
  */
 
+package org.onosproject.incubator.net.dpi.impl;
+
+import org.onlab.rest.AbstractWebApplication;
+
+import java.util.Set;
+
 /**
- * Various basic builtin network configurations.
+ * DPI Stats REST APIs web application.
  */
-package org.onosproject.incubator.net.config.basics;
+public class DpisWebApplication extends AbstractWebApplication {
+    @Override
+    public Set<Class<?>> getClasses() {
+        return getClasses(
+                DpisWebResource.class
+        );
+    }
+}

apps/dpistats/app/src/main/java/org/onosproject/incubator/net/dpi/impl/DpisWebResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.rest.resources;
+package org.onosproject.incubator.net.dpi.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.onosproject.incubator.net.dpi.DpiStatInfo;

apps/dpistats/app/src/main/java/org/onosproject/incubator/net/dpi/impl/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/evpnopenflow/BUILD

@@ -1,5 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//core/store/serializers:onos-core-serializers",
     "//apps/gluon:onos-apps-gluon",
     "//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc",
@@ -20,6 +20,7 @@ onos_app(
         "org.onosproject.route-service",
         "org.onosproject.evpn-route-service",
         "org.onosproject.gluon",
+        "org.onosproject.tunnel",
         "org.onosproject.vtn",
     ],
     title = "EVPN OpenFlow",

apps/faultmanagement/fmcli/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
 ]
 

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/CreateAlarm.java

@@ -21,9 +21,9 @@ import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.faultmanagement.api.AlarmStore;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
 

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java

@@ -24,8 +24,8 @@ import org.apache.karaf.shell.api.action.Option;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.cli.net.DeviceIdCompleter;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
 
 import java.util.Set;

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java

@@ -24,8 +24,8 @@ import org.apache.karaf.shell.api.action.Option;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.cli.net.DeviceIdCompleter;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
 
 import java.util.Map;

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/RemoveAlarm.java

@@ -20,7 +20,7 @@ import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.faultmanagement.api.AlarmStore;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
+import org.onosproject.alarm.AlarmId;
 
 /**
  * Remove an alarm from the Alarm Store.

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/UpdateAlarm.java

@@ -21,10 +21,10 @@ import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.faultmanagement.api.AlarmStore;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 
 import java.time.Instant;
 

apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/completer/AlarmSeverityCompleter.java

@@ -17,7 +17,7 @@
 package org.onosproject.faultmanagement.alarms.cli.completer;
 
 import org.onosproject.cli.AbstractChoicesCompleter;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.alarm.Alarm;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

apps/faultmanagement/fmgui/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
 ]
 

apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmMonitor.java

@@ -16,8 +16,8 @@
 
 package org.onosproject.faultmanagement.alarms.gui;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmListener;
+import org.onosproject.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmListener;
 
 /**
  * Encapsulates the behavior of monitoring when new alarms are stored.

apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmServiceUtil.java

@@ -18,9 +18,9 @@ package org.onosproject.faultmanagement.alarms.gui;
 import java.util.Map;
 import java.util.Set;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
 
 /**

apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableMessageHandler.java

@@ -18,7 +18,7 @@ package org.onosproject.faultmanagement.alarms.gui;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.alarm.Alarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.ui.RequestHandler;
 import org.onosproject.ui.UiMessageHandler;
@@ -32,7 +32,7 @@ import java.time.Instant;
 import java.util.Collection;
 import java.util.Set;
 
-import static org.onosproject.incubator.net.faultmanagement.alarm.AlarmId.alarmId;
+import static org.onosproject.alarm.AlarmId.alarmId;
 
 /**
  * Skeletal ONOS UI Table-View message handler.

apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovMessageHandler.java

@@ -18,8 +18,8 @@ package org.onosproject.faultmanagement.alarms.gui;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableSet;
 import org.onlab.osgi.ServiceDirectory;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.ui.RequestHandler;

apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java

@@ -16,7 +16,7 @@
 package org.onosproject.faultmanagement.alarms.gui;
 
 import java.util.Map;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.alarm.Alarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.ui.UiTopoOverlay;
 import org.onosproject.ui.topo.ButtonId;

apps/faultmanagement/fmmgr/BUILD

@@ -1,11 +1,9 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
-    "//incubator/api:onos-incubator-api",
     "//core/store/serializers:onos-core-serializers",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
-    "//incubator/api:onos-incubator-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/api/AlarmStore.java

@@ -16,9 +16,9 @@
 
 package org.onosproject.faultmanagement.api;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.store.Store;
 

apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/api/AlarmStoreDelegate.java

@@ -16,7 +16,7 @@
 
 package org.onosproject.faultmanagement.api;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmEvent;
 import org.onosproject.store.StoreDelegate;
 
 /**

apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/AlarmManager.java

@@ -19,16 +19,16 @@ import com.google.common.collect.ImmutableSet;
 import org.onlab.util.ItemNotFoundException;
 import org.onosproject.faultmanagement.api.AlarmStore;
 import org.onosproject.faultmanagement.api.AlarmStoreDelegate;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmListener;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.AlarmListener;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmProviderService;
+import org.onosproject.alarm.AlarmService;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;

apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/DistributedAlarmStore.java

@@ -19,11 +19,11 @@ package org.onosproject.faultmanagement.impl;
 import com.google.common.collect.ImmutableSet;
 import org.onosproject.faultmanagement.api.AlarmStore;
 import org.onosproject.faultmanagement.api.AlarmStoreDelegate;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.serializers.KryoNamespaces;

apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/PollingAlarmProvider.java

@@ -16,10 +16,10 @@
 package org.onosproject.faultmanagement.impl;
 
 import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
+import org.onosproject.alarm.AlarmConsumer;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmProviderService;
 import org.onosproject.mastership.MastershipEvent;
 import org.onosproject.mastership.MastershipListener;
 import org.onosproject.mastership.MastershipService;

apps/faultmanagement/fmmgr/src/test/java/org/onosproject/faultmanagement/impl/AlarmManagerTest.java

@@ -26,15 +26,15 @@ import org.onlab.junit.TestUtils;
 import org.onlab.util.ItemNotFoundException;
 import org.onosproject.common.event.impl.TestEventDispatcher;
 import org.onosproject.event.Event;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEvent;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmListener;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmEvent;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.AlarmListener;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmProviderService;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.mastership.MastershipServiceAdapter;
 import org.onosproject.net.DefaultAnnotations;
@@ -57,8 +57,8 @@ import java.util.Map;
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel.CLEARED;
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel.CRITICAL;
+import static org.onosproject.alarm.Alarm.SeverityLevel.CLEARED;
+import static org.onosproject.alarm.Alarm.SeverityLevel.CRITICAL;
 import static org.onosproject.net.NetTestTools.PID;
 
 /**

apps/faultmanagement/fmmgr/src/test/java/org/onosproject/faultmanagement/impl/DistributedAlarmStoreTest.java

@@ -19,9 +19,9 @@ package org.onosproject.faultmanagement.impl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.store.service.TestStorageService;
 

apps/faultmanagement/fmmgr/src/test/java/org/onosproject/faultmanagement/impl/PollingAlarmProviderTest.java

@@ -26,14 +26,14 @@ import org.onlab.packet.ChassisId;
 import org.onosproject.cfg.ComponentConfigAdapter;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cluster.NodeId;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistryAdapter;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmConsumer;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmProviderRegistryAdapter;
+import org.onosproject.alarm.AlarmProviderService;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.mastership.MastershipEvent;
 import org.onosproject.mastership.MastershipInfo;
 import org.onosproject.mastership.MastershipListener;

apps/faultmanagement/fmweb/BUILD

@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
     "//utils/rest:onlab-rest",
 ]
@@ -10,7 +9,6 @@ TEST_DEPS = TEST_ADAPTERS + [
     "@jersey_test_framework_jetty//jar",
     "//utils/osgi:onlab-osgi-tests",
     "//web/api:onos-rest-tests",
-    "//incubator/api:onos-incubator-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/faultmanagement/fmweb/src/main/java/org/onosproject/faultmanagement/web/AlarmCodec.java

@@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.onosproject.codec.CodecContext;
 import org.onosproject.codec.JsonCodec;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.slf4j.Logger;
 

apps/faultmanagement/fmweb/src/main/java/org/onosproject/faultmanagement/web/AlarmCodecRegistrator.java

@@ -21,7 +21,7 @@ import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.onosproject.codec.CodecService;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.alarm.Alarm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apps/faultmanagement/fmweb/src/main/java/org/onosproject/faultmanagement/web/AlarmsWebResource.java

@@ -25,8 +25,8 @@ import org.onosproject.rest.AbstractWebResource;
 
 import javax.ws.rs.core.Response;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -39,7 +39,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.lang.StringUtils;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
+import org.onosproject.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
 import org.slf4j.Logger;
 

apps/faultmanagement/fmweb/src/test/java/org/onosproject/faultmanagement/web/AlarmCodecTest.java

@@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Test;
 import org.onosproject.codec.JsonCodec;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 
 import java.io.IOException;

apps/faultmanagement/fmweb/src/test/java/org/onosproject/faultmanagement/web/AlarmJsonMatcher.java

@@ -18,7 +18,7 @@ package org.onosproject.faultmanagement.web;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.alarm.Alarm;
 
 /**
  * Hamcrest matcher for alarms.

apps/imr/app/BUILD

@@ -1,7 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + [
     "//core/store/dist:onos-core-dist",
     "//core/store/serializers:onos-core-serializers",
-    "//incubator/api:onos-incubator-api",
 ]
 
 osgi_jar_with_tests(

apps/kafka-integration/BUILD

@@ -1,8 +1,8 @@
 BUNDLES = [
     "@kafka_clients//jar",
     "@runtime_protobuf//jar",
-    "//incubator/protobuf/models:onos-incubator-protobuf-models",
-    "//incubator/protobuf/models/proto:onos-incubator-protobuf-models-proto",
+    "//core/protobuf/models:onos-core-protobuf-models",
+    "//core/protobuf/models/proto:onos-core-protobuf-models-proto",
     "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
 ]

apps/kafka-integration/app/BUILD

@@ -5,8 +5,8 @@ COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
     "@javax_ws_rs_api//jar",
     "//utils/rest:onlab-rest",
     "@com_google_protobuf//:protobuf_java",
-    "//incubator/protobuf/models:onos-incubator-protobuf-models",
-    "//incubator/protobuf/models/proto:onos-incubator-protobuf-models-proto",
+    "//core/protobuf/models:onos-core-protobuf-models",
+    "//core/protobuf/models/proto:onos-core-protobuf-models-proto",
 ]
 
 osgi_jar_with_tests(

apps/l3vpn/BUILD

@@ -4,7 +4,7 @@ COMPILE_DEPS = CORE_DEPS + KRYO + ONOS_YANG + [
     "//core/store/serializers:onos-core-serializers",
     "//apps/yang:onos-apps-yang",
     "//apps/pce/app:onos-apps-pce-app",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//models/common:onos-models-common",
 ]
 
@@ -18,6 +18,7 @@ APPS = [
     "org.onosproject.config",
     "org.onosproject.restconf",
     "org.onosproject.protocols.restconfserver",
+    "org.onosproject.tunnel",
     "org.onosproject.netconf",
     "org.onosproject.netconfsb",
     "org.onosproject.models.common",

apps/linkprops/BUILD

@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS + JACKSON
 
 osgi_jar_with_tests(
     deps = COMPILE_DEPS,

apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovMessageHandler.java

@@ -38,7 +38,7 @@ import org.onosproject.ui.topo.TopoJson;
 import org.onosproject.net.resource.DiscreteResourceId;
 import org.onosproject.net.resource.Resources;
 import org.onosproject.net.resource.ResourceQueryService;
-import org.onosproject.incubator.net.PortStatisticsService;
+import org.onosproject.net.statistic.PortStatisticsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apps/mappingmanagement/cli/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + REST + [
-    "//incubator/api:onos-incubator-api",
     "//apps/mappingmanagement/api:onos-apps-mappingmanagement-api",
     "//core/store/serializers:onos-core-serializers",
 ]

apps/network-troubleshoot/core/BUILD

@@ -1,11 +1,9 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
     "//apps/network-troubleshoot/api:onos-apps-network-troubleshoot-api",
 ]
 
 TEST_DEPS = TEST + [
     "//utils/osgi:onlab-osgi-tests",
-    "//incubator/api:onos-incubator-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/odtn/service/BUILD

@@ -4,7 +4,6 @@ COMPILE_DEPS = CORE_DEPS + ONOS_YANG + CLI + JACKSON + [
     "//models/tapi:onos-models-tapi",
     "//models/openconfig:onos-models-openconfig",
     "//apps/yang:onos-apps-yang",
-    "//incubator/api:onos-incubator-api",
     "//protocols/netconf/api:onos-protocols-netconf-api",
 ]
 

apps/ofagent/BUILD

@@ -5,7 +5,7 @@ COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + KRYO + CLI + REST + [
     "@openflowj//jar",
     "//core/store/serializers:onos-core-serializers",
     "//core/common:onos-core-common",
-    "//incubator/api:onos-incubator-api",
+    "//apps/virtual/api:onos-apps-virtual-api",
     "//providers/openflow/flow:onos-providers-openflow-flow",
     "//protocols/openflow/api:onos-protocols-openflow-api",
 ]
@@ -39,6 +39,9 @@ onos_app(
     category = "Traffic Engineering",
     description = "OpenFlow agent application for virtualization subsystem.",
     included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.virtual",
+    ],
     title = "OpenFlow Agent",
     url = "http://onosproject.org",
 )

apps/ofagent/src/main/java/org/onosproject/ofagent/api/OFAgent.java

@@ -16,7 +16,7 @@
 package org.onosproject.ofagent.api;
 
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 
 import java.util.Set;
 

apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentCreateCommand.java

@@ -23,7 +23,7 @@ import org.onlab.packet.IpAddress;
 import org.onlab.packet.TpPort;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.incubator.net.virtual.VirtualNetworkService;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFAgentAdminService;

apps/ofagent/src/main/java/org/onosproject/ofagent/impl/DefaultOFAgent.java

@@ -19,7 +19,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFController;
 

apps/ofagent/src/main/java/org/onosproject/ofagent/impl/DistributedOFAgentStore.java

@@ -20,7 +20,7 @@ import org.onlab.util.KryoNamespace;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFAgentEvent;
 import org.onosproject.ofagent.api.OFAgentEvent.Type;

apps/ofagent/src/main/java/org/onosproject/ofagent/rest/OFAgentCodec.java

@@ -23,7 +23,7 @@ import com.google.common.collect.Sets;
 import org.onosproject.codec.CodecContext;
 import org.onosproject.codec.JsonCodec;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFController;
 import org.onosproject.ofagent.impl.DefaultOFAgent;

apps/ofagent/src/test/java/org/onosproject/ofagent/impl/DefaultOFAgentTest.java

@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.TpPort;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFController;
 

apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java

@@ -34,7 +34,7 @@ import org.onosproject.core.CoreService;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.event.Event;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.incubator.net.virtual.VirtualNetworkService;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFAgentEvent;

apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java

@@ -28,7 +28,7 @@ import org.onlab.osgi.TestServiceDirectory;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.TpPort;
 import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.net.TenantId;
 import org.onosproject.ofagent.api.OFAgent;
 import org.onosproject.ofagent.api.OFAgentAdminService;
 import org.onosproject.ofagent.api.OFAgentService;

apps/optical-model/BUILD

@@ -1,8 +1,4 @@
-load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
-
-COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS + JACKSON + CLI
 
 osgi_jar_with_tests(
     karaf_command_packages = ["org.onosproject.net.optical.cli"],

apps/pce/app/BUILD

@@ -1,12 +1,12 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + REST + [
     "//core/store/serializers:onos-core-serializers",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/pcep-api:onos-apps-pcep-api",
     "//apps/pce/bandwidthmgmt:onos-apps-pce-bandwidthmgmt",
 ]
 
 TEST_DEPS = TEST_REST + [
-    "//incubator/api:onos-incubator-api-tests",
+    "//apps/tunnel/api:onos-apps-tunnel-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/pce/pceweb/BUILD

@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
     "//apps/pce/app:onos-apps-pce-app",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
 ]
 
 osgi_jar_with_tests(

apps/pim/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
 ]

apps/proxyarp/BUILD

@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS
 
 osgi_jar(
     deps = COMPILE_DEPS,

apps/rabbitmq/BUILD

@@ -1,7 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
     "@com_google_code_gson_gson//jar",
     "@amqp_client//jar",
-    "//incubator/api:onos-incubator-api",
 ]
 
 BUNDLES = [

apps/reactive-routing/BUILD

@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@concurrent_trees//jar",
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/intentsync:onos-apps-intentsync",
     "//apps/route-service/api:onos-apps-route-service-api",

apps/restconf/restconfmgr/BUILD

@@ -1,7 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + ONOS_YANG + JACKSON + [
     "@jersey_server//jar",
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//core/store/serializers:onos-core-serializers",
     "//apps/restconf/api:onos-apps-restconf-api",
     "//apps/restconf/utils:onos-apps-restconf-utils",

apps/routeradvertisement/BUILD

@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS + JACKSON + CLI
 
 osgi_jar_with_tests(
     karaf_command_packages = ["org.onosproject.ra.cli"],

apps/routing-api/BUILD

@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS + JACKSON
 
 osgi_jar_with_tests(
     test_deps = TEST_ADAPTERS,

apps/routing/common/BUILD

@@ -1,13 +1,11 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + CLI + [
     "@io_netty_netty//jar",
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
     "//core/common:onos-core-common",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    "//incubator/api:onos-incubator-api-tests",
     "//apps/routing-api:onos-apps-routing-api-tests",
 ]
 

apps/routing/cpr/BUILD

@@ -1,10 +1,8 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    "//incubator/api:onos-incubator-api-tests",
     "//apps/routing-api:onos-apps-routing-api-tests",
     "//utils/osgi:onlab-osgi-tests",
 ]

apps/routing/fibinstaller/BUILD

@@ -1,11 +1,9 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    "//incubator/api:onos-incubator-api-tests",
     "//apps/routing-api:onos-apps-routing-api-tests",
     "//apps/route-service/api:onos-apps-route-service-api-tests",
 ]

apps/routing/fpm/app/BUILD

@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + KRYO + CLI + [
     "@io_netty_netty//jar",
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
     "//core/store/serializers:onos-core-serializers",

apps/sdnip/BUILD

@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
     "//apps/intentsync:onos-apps-intentsync",

apps/segmentrouting/app/BUILD

@@ -1,7 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
     "//core/common:onos-core-common",
     "//core/store/serializers:onos-core-serializers",
-    "//incubator/api:onos-incubator-api",
     "//apps/route-service/api:onos-apps-route-service-api",
     "//apps/mcast/api:onos-apps-mcast-api",
     "//apps/mcast/cli:onos-apps-mcast-cli",
@@ -9,7 +8,6 @@ COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//core/net:onos-core-net",
-    "//incubator/api:onos-incubator-api-tests",
     "//apps/route-service/api:onos-apps-route-service-api-tests",
 ]
 

apps/simplefabric/app/BUILD

@@ -1,5 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + REST + [
     "//apps/simplefabric/api:onos-apps-simplefabric-api",
+    "//apps/route-service/api:onos-apps-route-service-api",
     "@concurrent_trees//jar",
 ]
 

apps/simplefabric/app/src/main/java/org/onosproject/simplefabric/impl/SimpleFabricManager.java

@@ -81,6 +81,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import static org.onosproject.routeservice.RouteTools.createBinaryString;
 import static org.onosproject.simplefabric.api.Constants.ALLOW_ETH_ADDRESS_SELECTOR;
 import static org.onosproject.simplefabric.api.Constants.ALLOW_IPV6;
 import static org.onosproject.simplefabric.api.Constants.APP_ID;
@@ -89,7 +90,6 @@ import static org.onosproject.simplefabric.api.Constants.REACTIVE_ALLOW_LINK_CP;
 import static org.onosproject.simplefabric.api.Constants.REACTIVE_HASHED_PATH_SELECTION;
 import static org.onosproject.simplefabric.api.Constants.REACTIVE_MATCH_IP_PROTO;
 import static org.onosproject.simplefabric.api.Constants.REACTIVE_SINGLE_TO_SINGLE;
-import static org.onosproject.simplefabric.util.RouteTools.createBinaryString;
 
 
 /**

apps/simplefabric/app/src/main/java/org/onosproject/simplefabric/util/RouteTools.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2018-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * local copy of onos/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteTools.java
- * to remove dependency on onos.incubator.routing services, since 2017-08-09.
- */
-
-package org.onosproject.simplefabric.util;
-
-import org.onlab.packet.IpPrefix;
-
-/**
- * Routing tools.
- */
-public final class RouteTools {
-
-    private RouteTools() {
-    }
-
-    /**
-     * Creates a binary string representation of an IP prefix.
-     *
-     * For each string, we put a extra "0" in the front. The purpose of
-     * doing this is to store the default route inside InvertedRadixTree.
-     *
-     * @param ipPrefix the IP prefix to use
-     * @return the binary string representation
-     */
-    public static String createBinaryString(IpPrefix ipPrefix) {
-        byte[] octets = ipPrefix.address().toOctets();
-        StringBuilder result = new StringBuilder(ipPrefix.prefixLength());
-        result.append("0");
-        for (int i = 0; i < ipPrefix.prefixLength(); i++) {
-            int byteOffset = i / Byte.SIZE;
-            int bitOffset = i % Byte.SIZE;
-            int mask = 1 << (Byte.SIZE - 1 - bitOffset);
-            byte value = octets[byteOffset];
-            boolean isSet = ((value & mask) != 0);
-            result.append(isSet ? "1" : "0");
-        }
-        return result.toString();
-    }
-}

apps/tetopology/app/BUILD

@@ -1,12 +1,10 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
     "//apps/tetopology/api:onos-apps-tetopology-api",
-    "//incubator/api:onos-incubator-api",
     "//core/store/serializers:onos-core-serializers",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
-    "//incubator/api:onos-incubator-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/tetunnel/BUILD

@@ -1,4 +1,5 @@
 BUNDLES = [
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/tetunnel/api:onos-apps-tetunnel-api",
     "//apps/tetunnel/app:onos-apps-tetunnel-app",
 ]

apps/tetunnel/api/BUILD

@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/tetopology/api:onos-apps-tetopology-api",
-    "//incubator/api:onos-incubator-api",
 ]
 
 osgi_jar_with_tests(

apps/tetunnel/app/BUILD

@@ -1,13 +1,13 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
     "//apps/tetopology/api:onos-apps-tetopology-api",
     "//apps/tetunnel/api:onos-apps-tetunnel-api",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//core/store/serializers:onos-core-serializers",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
-    "//incubator/api:onos-incubator-api-tests",
+    "//apps/tunnel/api:onos-apps-tunnel-api-tests",
 ]
 
 osgi_jar_with_tests(

apps/tunnel/BUILD

@@ -0,0 +1,13 @@
+BUNDLES = [
+    "//apps/tunnel/api:onos-apps-tunnel-api",
+    "//apps/tunnel/app:onos-apps-tunnel-app",
+]
+
+onos_app(
+    app_name = "org.onosproject.tunnel",
+    category = "Traffic Engineering",
+    description = "Tunnel Subsystem extension",
+    included_bundles = BUNDLES,
+    title = "Tunnel Subsystem",
+    url = "http://onosproject.org",
+)

apps/tunnel/api/BUILD

@@ -1,8 +1,9 @@
-COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS + JACKSON
+
+TEST_DEPS = TEST_ADAPTERS
 
 osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )

apps/tunnel/api/src/main/java/org/onosproject/incubator/net/domain/ExtraSubjectFactories.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.incubator.net.config.basics;
+package org.onosproject.incubator.net.domain;
 
 import com.google.common.annotations.Beta;
-import org.onosproject.incubator.net.domain.IntentDomainId;
 import org.onosproject.net.config.SubjectFactory;
 
 /**

apps/tunnel/api/src/main/java/org/onosproject/incubator/net/domain/IntentDomain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/tunnel/api/src/main/java/org/onosproject/incubator/net/domain/IntentDomainEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/tunnel/api/src/main/java/org/onosproject/incubator/net/domain/IntentDomainId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.