Fix runtime of P4-related stuff with new karaf
Change-Id: I139575d5b038224ca8ccce4ec71ec8a84b35dfeb
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 b98e7ec..f45a4e5 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
@@ -18,12 +18,6 @@
import com.google.common.annotations.Beta;
import com.google.common.collect.Maps;
-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.onlab.util.SharedExecutors;
import org.onosproject.net.Annotations;
@@ -36,6 +30,10 @@
import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger;
import java.util.Collection;
@@ -56,7 +54,6 @@
* @param <E> entry class
*/
@Beta
-@Component(immediate = true)
public abstract class AbstractDistributedP4RuntimeMirror
<H extends PiHandle, E extends PiEntity>
implements P4RuntimeMirror<H, E> {
@@ -64,10 +61,10 @@
private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY)
- private StorageService storageService;
+ protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
- private PiPipeconfWatchdogService pipeconfWatchdogService;
+ protected PiPipeconfWatchdogService pipeconfWatchdogService;
private EventuallyConsistentMap<H, TimedEntry<E>> mirrorMap;
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeActionProfileMemberMirror.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeActionProfileMemberMirror.java
index 1ca29c1..5974ae2 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeActionProfileMemberMirror.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/mirror/DistributedP4RuntimeActionProfileMemberMirror.java
@@ -25,7 +25,7 @@
/**
* Distributed implementation of a P4Runtime action profile member mirror.
*/
-@Component(immediate = true, service = AbstractDistributedP4RuntimeMirror.class)
+@Component(immediate = true, service = P4RuntimeActionProfileMemberMirror.class)
public class DistributedP4RuntimeActionProfileMemberMirror
extends AbstractDistributedP4RuntimeMirror
<PiActionGroupMemberHandle, PiActionGroupMember>