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
diff --git a/drivers/arista/BUILD b/drivers/arista/BUILD
index 720cd6e..009527b 100644
--- a/drivers/arista/BUILD
+++ b/drivers/arista/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/rest/api:onos-protocols-rest-api",
diff --git a/drivers/ciena/c5162/BUILD b/drivers/ciena/c5162/BUILD
index e949093..a5a62d3 100644
--- a/drivers/ciena/c5162/BUILD
+++ b/drivers/ciena/c5162/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//drivers/netconf:onos-drivers-netconf",
diff --git a/drivers/ciena/c5162/src/main/resources/ciena-5162-drivers.xml b/drivers/ciena/c5162/src/main/resources/ciena-5162-drivers.xml
index c0bcc4d..acddbd4 100644
--- a/drivers/ciena/c5162/src/main/resources/ciena-5162-drivers.xml
+++ b/drivers/ciena/c5162/src/main/resources/ciena-5162-drivers.xml
@@ -29,7 +29,7 @@
                    impl="org.onosproject.drivers.ciena.c5162.netconf.Ciena5162FlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.drivers.ciena.c5162.netconf.Ciena5162LambdaQuery"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.ciena.c5162.netconf.Ciena5162AlarmConsumer"/>
 -->
     </driver>
diff --git a/drivers/ciena/c5170/BUILD b/drivers/ciena/c5170/BUILD
index f539f35..447651c 100644
--- a/drivers/ciena/c5170/BUILD
+++ b/drivers/ciena/c5170/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//drivers/netconf:onos-drivers-netconf",
diff --git a/drivers/ciena/c5170/src/main/resources/ciena-5170-drivers.xml b/drivers/ciena/c5170/src/main/resources/ciena-5170-drivers.xml
index 0589873..eefe0bf 100644
--- a/drivers/ciena/c5170/src/main/resources/ciena-5170-drivers.xml
+++ b/drivers/ciena/c5170/src/main/resources/ciena-5170-drivers.xml
@@ -29,7 +29,7 @@
                    impl="org.onosproject.drivers.ciena.c5170.netconf.Ciena5170FlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.drivers.ciena.c5170.netconf.Ciena5170LambdaQuery"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.ciena.c5170.netconf.Ciena5170AlarmConsumer"/>
 -->
     </driver>
diff --git a/drivers/ciena/waveserver/BUILD b/drivers/ciena/waveserver/BUILD
index 64cd99f..7a890f2 100644
--- a/drivers/ciena/waveserver/BUILD
+++ b/drivers/ciena/waveserver/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/rest/api:onos-protocols-rest-api",
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
index ea02de3..0abffe5 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
@@ -24,10 +24,10 @@
 import org.onlab.util.Frequency;
 import org.onlab.util.Spectrum;
 import org.onosproject.driver.optical.flowrule.CrossConnectCache;
-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.ChannelSpacing;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.OchSignal;
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
index c1a6767..23a80b0 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
@@ -16,8 +16,8 @@
 
 package org.onosproject.drivers.ciena.waveserver.rest;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmConsumer;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.slf4j.Logger;
 
diff --git a/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml b/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
index 1a779b1..3e46667 100644
--- a/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
+++ b/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
@@ -27,7 +27,7 @@
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaFlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaWaveServerLambdaQuery"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaWaveServerAlarmConsumer"/>
     </driver>
 </drivers>
diff --git a/drivers/cisco/rest/BUILD b/drivers/cisco/rest/BUILD
index d5b7ac7..d5dc9d2 100644
--- a/drivers/cisco/rest/BUILD
+++ b/drivers/cisco/rest/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/rest/api:onos-protocols-rest-api",
diff --git a/drivers/fujitsu/BUILD b/drivers/fujitsu/BUILD
index 4c7b0ba..5bd918c 100644
--- a/drivers/fujitsu/BUILD
+++ b/drivers/fujitsu/BUILD
@@ -3,7 +3,6 @@
     "//protocols/netconf/api:onos-protocols-netconf-api",
     "//protocols/netconf/ctl:onos-protocols-netconf-ctl",
     "//apps/optical-model:onos-apps-optical-model",
-    "//incubator/api:onos-incubator-api",
 ]
 
 BUNDLES = [
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlarmConsumer.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlarmConsumer.java
index 21121ac..67b50c9 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlarmConsumer.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlarmConsumer.java
@@ -19,11 +19,11 @@
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.onosproject.drivers.utilities.XmlConfigParser;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
-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.AlarmConsumer;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.driver.DriverHandler;
@@ -43,7 +43,7 @@
 import java.nio.charset.StandardCharsets;
 import java.io.ByteArrayInputStream;
 
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel;
+import static org.onosproject.alarm.Alarm.SeverityLevel;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtility.*;
 import static org.slf4j.LoggerFactory.getLogger;
diff --git a/drivers/fujitsu/src/main/resources/fujitsu-drivers.xml b/drivers/fujitsu/src/main/resources/fujitsu-drivers.xml
index 62ef16d..353ac3b 100644
--- a/drivers/fujitsu/src/main/resources/fujitsu-drivers.xml
+++ b/drivers/fujitsu/src/main/resources/fujitsu-drivers.xml
@@ -42,7 +42,7 @@
                    impl="org.onosproject.drivers.fujitsu.FujitsuVoltNeConfig"/>
         <behaviour api="org.onosproject.drivers.fujitsu.behaviour.VoltNniLinkConfig"
                    impl="org.onosproject.drivers.fujitsu.FujitsuVoltNniLinkConfig"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.fujitsu.FujitsuVoltAlarmConsumer"/>
     </driver>
 </drivers>
diff --git a/drivers/lumentum/BUILD b/drivers/lumentum/BUILD
index 5ccb339..b8f8156 100644
--- a/drivers/lumentum/BUILD
+++ b/drivers/lumentum/BUILD
@@ -4,7 +4,6 @@
     "//protocols/snmp/api:onos-protocols-snmp-api",
     "//protocols/tl1/api:onos-protocols-tl1-api",
     "//protocols/netconf/api:onos-protocols-netconf-api",
-    "//incubator/api:onos-incubator-api",
     "//apps/optical-model:onos-apps-optical-model",
     "//drivers/optical:onos-drivers-optical",
 ]
diff --git a/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumAlarmConsumer.java b/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumAlarmConsumer.java
index 91289e3..a7f1e99 100644
--- a/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumAlarmConsumer.java
+++ b/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumAlarmConsumer.java
@@ -17,10 +17,10 @@
 package org.onosproject.drivers.lumentum;
 
 import com.google.common.collect.ImmutableList;
-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.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmConsumer;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.snmp.SnmpController;
@@ -35,7 +35,7 @@
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel;
+import static org.onosproject.alarm.Alarm.SeverityLevel;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
diff --git a/drivers/lumentum/src/main/resources/lumentum-drivers.xml b/drivers/lumentum/src/main/resources/lumentum-drivers.xml
index 8bf9d17..6253325 100644
--- a/drivers/lumentum/src/main/resources/lumentum-drivers.xml
+++ b/drivers/lumentum/src/main/resources/lumentum-drivers.xml
@@ -22,7 +22,7 @@
                    impl="org.onosproject.drivers.lumentum.LumentumRoadmLambdaQuery"/>
         <behaviour api="org.onosproject.net.flow.FlowRuleProgrammable"
                    impl="org.onosproject.drivers.lumentum.LumentumSdnRoadmFlowRuleProgrammable"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.lumentum.LumentumAlarmConsumer"/>
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
diff --git a/drivers/polatis/netconf/BUILD b/drivers/polatis/netconf/BUILD
index ec548fe..faf52dc 100644
--- a/drivers/polatis/netconf/BUILD
+++ b/drivers/polatis/netconf/BUILD
@@ -3,7 +3,6 @@
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/netconf/api:onos-protocols-netconf-api",
     "//apps/optical-model:onos-apps-optical-model",
-    "//incubator/api:onos-incubator-api",
 ]
 
 APPS = [
diff --git a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConfig.java b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConfig.java
index c449cab..f881045 100644
--- a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConfig.java
+++ b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConfig.java
@@ -18,11 +18,11 @@
 
 import org.onlab.packet.IpAddress;
 
-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.incubator.net.faultmanagement.alarm.DeviceAlarmConfig;
-import org.onosproject.incubator.net.faultmanagement.alarm.XmlEventParser;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
+import org.onosproject.alarm.DeviceAlarmConfig;
+import org.onosproject.alarm.XmlEventParser;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.netconf.NetconfDeviceOutputEvent;
diff --git a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConsumer.java b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConsumer.java
index ea31538..8a7049c 100644
--- a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConsumer.java
+++ b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisAlarmConsumer.java
@@ -18,11 +18,11 @@
 
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.configuration.HierarchicalConfiguration;
-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.DefaultAlarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.XmlEventParser;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmConsumer;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
+import org.onosproject.alarm.XmlEventParser;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.driver.DriverHandler;
@@ -35,7 +35,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel;
+import static org.onosproject.alarm.Alarm.SeverityLevel;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.drivers.polatis.netconf.PolatisNetconfUtility.configsAt;
 import static org.onosproject.drivers.polatis.netconf.PolatisNetconfUtility.xmlEmpty;
diff --git a/drivers/polatis/netconf/src/main/resources/polatis-drivers.xml b/drivers/polatis/netconf/src/main/resources/polatis-drivers.xml
index f95cbe2..b1a8d45 100644
--- a/drivers/polatis/netconf/src/main/resources/polatis-drivers.xml
+++ b/drivers/polatis/netconf/src/main/resources/polatis-drivers.xml
@@ -25,9 +25,9 @@
                    impl="org.onosproject.drivers.polatis.netconf.PolatisPowerConfig"/>
         <behaviour api="org.onosproject.net.flow.FlowRuleProgrammable"
                    impl="org.onosproject.drivers.polatis.netconf.PolatisFlowRuleProgrammable"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.polatis.netconf.PolatisAlarmConsumer"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.DeviceAlarmConfig"
+        <behaviour api="org.onosproject.alarm.DeviceAlarmConfig"
                    impl="org.onosproject.drivers.polatis.netconf.PolatisAlarmConfig"/>
         <property name="uiType">policon</property>
         <property name="notificationStream">Polatis</property>
diff --git a/drivers/polatis/snmp/BUILD b/drivers/polatis/snmp/BUILD
index fc12811..4e4944a 100644
--- a/drivers/polatis/snmp/BUILD
+++ b/drivers/polatis/snmp/BUILD
@@ -3,7 +3,6 @@
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/snmp/api:onos-protocols-snmp-api",
     "//apps/optical-model:onos-apps-optical-model",
-    "//incubator/api:onos-incubator-api",
 ]
 
 APPS = [
diff --git a/drivers/polatis/snmp/src/main/java/org/onosproject/drivers/polatis/snmp/PolatisAlarmConfig.java b/drivers/polatis/snmp/src/main/java/org/onosproject/drivers/polatis/snmp/PolatisAlarmConfig.java
index 9ccbf1d..a2e961a 100644
--- a/drivers/polatis/snmp/src/main/java/org/onosproject/drivers/polatis/snmp/PolatisAlarmConfig.java
+++ b/drivers/polatis/snmp/src/main/java/org/onosproject/drivers/polatis/snmp/PolatisAlarmConfig.java
@@ -18,10 +18,10 @@
 
 import org.onlab.packet.IpAddress;
 
-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.incubator.net.faultmanagement.alarm.DeviceAlarmConfig;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
+import org.onosproject.alarm.DeviceAlarmConfig;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 
@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.onosproject.incubator.net.faultmanagement.alarm.Alarm.SeverityLevel;
+import static org.onosproject.alarm.Alarm.SeverityLevel;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
diff --git a/drivers/polatis/snmp/src/main/resources/polatis-snmp-drivers.xml b/drivers/polatis/snmp/src/main/resources/polatis-snmp-drivers.xml
index 251d535..a2f6fa8 100644
--- a/drivers/polatis/snmp/src/main/resources/polatis-snmp-drivers.xml
+++ b/drivers/polatis/snmp/src/main/resources/polatis-snmp-drivers.xml
@@ -25,7 +25,7 @@
                    impl="org.onosproject.drivers.polatis.snmp.PolatisFlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.PowerConfig"
                    impl="org.onosproject.drivers.polatis.snmp.PolatisPowerConfig"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.DeviceAlarmConfig"
+        <behaviour api="org.onosproject.alarm.DeviceAlarmConfig"
                    impl="org.onosproject.drivers.polatis.snmp.PolatisAlarmConfig"/>
         <property name="uiType">policon</property>
     </driver>
diff --git a/drivers/server/BUILD b/drivers/server/BUILD
index 1dd2700..87e0e4d 100644
--- a/drivers/server/BUILD
+++ b/drivers/server/BUILD
@@ -1,7 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
     "@joda_time//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//protocols/rest/api:onos-protocols-rest-api",
 ]