Added providerService for mastership

Change-Id: I1572161f70c696961a663cba17f197e23f96967e

 package org.onlab.onos.cluster;
 package org.onlab.onos.cluster;
 
 
+import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.provider.Provider;
 import org.onlab.onos.net.provider.Provider;
 
 
+/**
+ * Abstraction of a mastership information provider.
+ */
 public interface MastershipProvider extends Provider {
 public interface MastershipProvider extends Provider {
-
+    // do we get role info from the local OFcontroller impl?
+    // needs to also read from distributed store and emit events?
+    // roleChanged(DeviceId deviceId, MastershipRole newRole);
 }
 }

@@ -13,6 +13,6 @@ public interface MastershipProviderService extends
      * @param deviceId the device ID
      * @param deviceId the device ID
      * @param role the new mastership role of this controller instance
      * @param role the new mastership role of this controller instance
      */
      */
-    void roleChanged(DeviceId deviceId, MastershipRole role);
+    void roleChanged(NodeId nodeId, DeviceId deviceId, MastershipRole role);
 
 
 }
 }

@@ -20,13 +20,15 @@ import org.onlab.onos.event.AbstractListenerRegistry;
 import org.onlab.onos.event.EventDeliveryService;
 import org.onlab.onos.event.EventDeliveryService;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.MastershipRole;
+import org.onlab.onos.net.provider.AbstractProviderRegistry;
 import org.onlab.onos.net.provider.AbstractProviderService;
 import org.onlab.onos.net.provider.AbstractProviderService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 
-public class MastershipManager implements MastershipService,
-        MastershipAdminService {
+public class MastershipManager
+        extends AbstractProviderRegistry<MastershipProvider, MastershipProviderService>
+        implements MastershipService, MastershipAdminService {
 
 
     private static final String NODE_ID_NULL = "Node ID cannot be null";
     private static final String NODE_ID_NULL = "Node ID cannot be null";
     private static final String DEVICE_ID_NULL = "Device ID cannot be null";
     private static final String DEVICE_ID_NULL = "Device ID cannot be null";
@@ -58,7 +60,6 @@ public class MastershipManager implements MastershipService,
         log.info("Stopped");
         log.info("Stopped");
     }
     }
 
 
-
     @Override
     @Override
     public void setRole(NodeId nodeId, DeviceId deviceId, MastershipRole role) {
     public void setRole(NodeId nodeId, DeviceId deviceId, MastershipRole role) {
         checkNotNull(nodeId, NODE_ID_NULL);
         checkNotNull(nodeId, NODE_ID_NULL);
@@ -98,6 +99,12 @@ public class MastershipManager implements MastershipService,
         listenerRegistry.removeListener(listener);
         listenerRegistry.removeListener(listener);
     }
     }
 
 
+    @Override
+    protected MastershipProviderService createProviderService(
+            MastershipProvider provider) {
+        return new InternalMastershipProviderService(provider);
+    }
+
     private class InternalMastershipProviderService
     private class InternalMastershipProviderService
             extends AbstractProviderService<MastershipProvider>
             extends AbstractProviderService<MastershipProvider>
             implements MastershipProviderService {
             implements MastershipProviderService {
@@ -107,9 +114,11 @@ public class MastershipManager implements MastershipService,
         }
         }
 
 
         @Override
         @Override
-        public void roleChanged(DeviceId deviceId, MastershipRole role) {
+        public void roleChanged(NodeId nodeId, DeviceId deviceId, MastershipRole role) {
             // TODO Auto-generated method stub
             // TODO Auto-generated method stub
-
+            MastershipEvent event =
+                    store.addOrUpdateDevice(nodeId, deviceId, role);
+            post(event);
         }
         }
     }
     }
 
 
@@ -119,4 +128,5 @@ public class MastershipManager implements MastershipService,
             eventDispatcher.post(event);
             eventDispatcher.post(event);
         }
         }
     }
     }
+
 }
 }