[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeDriversLoader.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeDriversLoader.java
index c8717ac..2600c6c 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeDriversLoader.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeDriversLoader.java
@@ -16,7 +16,7 @@
package org.onosproject.drivers.p4runtime;
-import org.apache.felix.scr.annotations.Component;
+import org.osgi.service.component.annotations.Component;
import org.onosproject.net.driver.AbstractDriverLoader;
/**
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/AbstractDistributedP4RuntimeMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/AbstractDistributedP4RuntimeMirror.java
index dd3ea16..079ab62f4 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/AbstractDistributedP4RuntimeMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/AbstractDistributedP4RuntimeMirror.java
@@ -17,11 +17,11 @@
package org.onosproject.drivers.p4runtime.mirror;
import com.google.common.annotations.Beta;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.util.KryoNamespace;
import org.onosproject.net.DeviceId;
import org.onosproject.net.pi.runtime.PiEntity;
@@ -53,7 +53,7 @@
private final Logger log = getLogger(getClass());
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
private StorageService storageService;
private EventuallyConsistentMap<H, TimedEntry<E>> mirrorMap;
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeGroupMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeGroupMirror.java
index 4c963a6..e07f417 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeGroupMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeGroupMirror.java
@@ -16,18 +16,16 @@
package org.onosproject.drivers.p4runtime.mirror;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
import org.onosproject.net.pi.runtime.PiActionGroup;
import org.onosproject.net.pi.runtime.PiActionGroupHandle;
import org.onosproject.store.serializers.KryoNamespaces;
+import org.osgi.service.component.annotations.Component;
/**
* Distributed implementation of a P4Runtime group mirror.
*/
-@Component(immediate = true)
-@Service
+@Component(immediate = true, service = P4RuntimeGroupMirror.class)
public final class DistributedP4RuntimeGroupMirror
extends AbstractDistributedP4RuntimeMirror
<PiActionGroupHandle, PiActionGroup>
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMeterMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMeterMirror.java
index f5c1778..bf36274 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMeterMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMeterMirror.java
@@ -16,18 +16,16 @@
package org.onosproject.drivers.p4runtime.mirror;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
-import org.onosproject.net.pi.runtime.PiMeterHandle;
import org.onosproject.net.pi.runtime.PiMeterCellConfig;
+import org.onosproject.net.pi.runtime.PiMeterHandle;
import org.onosproject.store.serializers.KryoNamespaces;
+import org.osgi.service.component.annotations.Component;
/**
* Distributed implementation of a P4Runtime meter mirror.
*/
-@Component(immediate = true)
-@Service
+@Component(immediate = true, service = P4RuntimeMeterMirror.class)
public final class DistributedP4RuntimeMeterMirror
extends AbstractDistributedP4RuntimeMirror
<PiMeterHandle, PiMeterCellConfig>
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMulticastGroupMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMulticastGroupMirror.java
index 4cfe0c5..83c23d8 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMulticastGroupMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeMulticastGroupMirror.java
@@ -16,18 +16,16 @@
package org.onosproject.drivers.p4runtime.mirror;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
import org.onosproject.net.pi.runtime.PiMulticastGroupEntry;
import org.onosproject.net.pi.runtime.PiMulticastGroupEntryHandle;
import org.onosproject.store.serializers.KryoNamespaces;
+import org.osgi.service.component.annotations.Component;
/**
* Distributed implementation of a P4Runtime multicast group mirror.
*/
-@Component(immediate = true)
-@Service
+@Component(immediate = true, service = P4RuntimeMulticastGroupMirror.class)
public final class DistributedP4RuntimeMulticastGroupMirror
extends AbstractDistributedP4RuntimeMirror
<PiMulticastGroupEntryHandle, PiMulticastGroupEntry>
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeTableMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeTableMirror.java
index f37cf44..320b3da 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeTableMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeTableMirror.java
@@ -16,18 +16,16 @@
package org.onosproject.drivers.p4runtime.mirror;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
import org.onosproject.net.pi.runtime.PiTableEntry;
import org.onosproject.net.pi.runtime.PiTableEntryHandle;
import org.onosproject.store.serializers.KryoNamespaces;
+import org.osgi.service.component.annotations.Component;
/**
* Distributed implementation of a P4Runtime table mirror.
*/
-@Component(immediate = true)
-@Service
+@Component(immediate = true, service = P4RuntimeTableMirror.class)
public final class DistributedP4RuntimeTableMirror
extends AbstractDistributedP4RuntimeMirror
<PiTableEntryHandle, PiTableEntry>