Fixed MastershipManager to autostart and to have proper dependency on the ClusterService not ClusterManager.
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
index ab27dc3..8c3fd50 100644
--- a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
@@ -5,9 +5,12 @@
import java.util.Set;
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.apache.felix.scr.annotations.Service;
+import org.onlab.onos.cluster.ClusterService;
import org.onlab.onos.cluster.MastershipAdminService;
import org.onlab.onos.cluster.MastershipEvent;
import org.onlab.onos.cluster.MastershipListener;
@@ -26,6 +29,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
+@Component(immediate = true)
+@Service
public class MastershipManager
extends AbstractProviderRegistry<MastershipProvider, MastershipProviderService>
implements MastershipService, MastershipAdminService {
@@ -46,7 +51,7 @@
protected EventDeliveryService eventDispatcher;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ClusterManager clusterManager;
+ protected ClusterService clusterService;
@Activate
public void activate() {
@@ -86,7 +91,7 @@
@Override
public MastershipRole requestRoleFor(DeviceId deviceId) {
checkNotNull(deviceId, DEVICE_ID_NULL);
- NodeId id = clusterManager.getLocalNode().id();
+ NodeId id = clusterService.getLocalNode().id();
return store.getRole(id, deviceId);
}