mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 10:51:04 +02:00
Code Issues Projects Releases Wiki Activity

Fixed MastershipManager to autostart and to have proper dependency on the ClusterService not ClusterManager.

Browse Source
This commit is contained in:
tom 2014-09-23 17:49:39 -07:00
parent db383e405c
commit 4a5d1713e8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
View File

@ -5,9 +5,12 @@ import static org.slf4j.LoggerFactory.getLogger;
import java.util.Set; import java.util.Set;
import org.apache.felix.scr.annotations.Activate; 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.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; 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.MastershipAdminService;
import org.onlab.onos.cluster.MastershipEvent; import org.onlab.onos.cluster.MastershipEvent;
import org.onlab.onos.cluster.MastershipListener; import org.onlab.onos.cluster.MastershipListener;
@ -26,6 +29,8 @@ import org.slf4j.Logger;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@Component(immediate = true)
@Service
public class MastershipManager public class MastershipManager
extends AbstractProviderRegistry<MastershipProvider, MastershipProviderService> extends AbstractProviderRegistry<MastershipProvider, MastershipProviderService>
implements MastershipService, MastershipAdminService { implements MastershipService, MastershipAdminService {
@ -46,7 +51,7 @@ public class MastershipManager
protected EventDeliveryService eventDispatcher; protected EventDeliveryService eventDispatcher;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ClusterManager clusterManager; protected ClusterService clusterService;
@Activate @Activate
public void activate() { public void activate() {
@ -86,7 +91,7 @@ public class MastershipManager
@Override @Override
public MastershipRole requestRoleFor(DeviceId deviceId) { public MastershipRole requestRoleFor(DeviceId deviceId) {
checkNotNull(deviceId, DEVICE_ID_NULL); checkNotNull(deviceId, DEVICE_ID_NULL);
NodeId id = clusterManager.getLocalNode().id(); NodeId id = clusterService.getLocalNode().id();
return store.getRole(id, deviceId); return store.getRole(id, deviceId);
} }