commit e5ec3fd8fa4a68ec0b398a950633e9015c90c346
author tom <tom@onlab.us> Thu Sep 04 15:18:06 2014 -0700
committer tom <tom@onlab.us> Thu Sep 04 15:18:06 2014 -0700
tree b965cde75e5bc97b77c2bb1004a446aca33a5f7f
parent ca20e0c3a2d892b8277c995a4f9a18428256c937

Adding DeviceAdminService facade and tests for SimpleDeviceManager.

net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java

diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
index fee30a5..9cfc784 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
@@ -13,6 +13,7 @@
 import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.PortNumber;
+import org.onlab.onos.net.device.DeviceAdminService;
 import org.onlab.onos.net.device.DeviceDescription;
 import org.onlab.onos.net.device.DeviceEvent;
 import org.onlab.onos.net.device.DeviceListener;
@@ -37,22 +38,23 @@
 @Service
 public class SimpleDeviceManager
         extends AbstractProviderRegistry<DeviceProvider, DeviceProviderService>
-        implements DeviceService, DeviceProviderRegistry {
+        implements DeviceService, DeviceAdminService, DeviceProviderRegistry {
 
-    public static final String DEVICE_ID_NULL = "Device ID cannot be null";
-    public static final String PORT_NUMBER_NULL = "Port number cannot be null";
-    public static final String DEVICE_DESCRIPTION_NULL = "Device description cannot be null";
-    public static final String PORT_DESCRIPTION_NULL = "Port description cannot be null";
+    private static final String DEVICE_ID_NULL = "Device ID cannot be null";
+    private static final String PORT_NUMBER_NULL = "Port number cannot be null";
+    private static final String DEVICE_DESCRIPTION_NULL = "Device description cannot be null";
+    private static final String PORT_DESCRIPTION_NULL = "Port description cannot be null";
+    private static final String ROLE_NULL = "Role cannot be null";
 
     private final Logger log = getLogger(getClass());
 
     private final AbstractListenerRegistry<DeviceEvent, DeviceListener>
             listenerRegistry = new AbstractListenerRegistry<>();
 
-    private final DeviceStore store = new DeviceStore();
+    private final SimpleDeviceStore store = new SimpleDeviceStore();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private EventDeliveryService eventDispatcher;
+    protected EventDeliveryService eventDispatcher;
 
     @Activate
     public void activate() {
@@ -69,12 +71,12 @@
     @Override
     public MastershipRole getRole(DeviceId deviceId) {
         checkNotNull(deviceId, DEVICE_ID_NULL);
-        return null;
+        return store.getRole(deviceId);
     }
 
     @Override
     public Iterable<Device> getDevices() {
-        return null;
+        return store.getDevices();
     }
 
     @Override
@@ -111,6 +113,28 @@
         return new InternalDeviceProviderService(provider);
     }
 
+    @Override
+    public void setRole(DeviceId deviceId, MastershipRole newRole) {
+        checkNotNull(deviceId, DEVICE_ID_NULL);
+        checkNotNull(newRole, ROLE_NULL);
+        DeviceEvent event = store.setRole(deviceId, newRole);
+        if (event != null) {
+            Device device = event.subject();
+            DeviceProvider provider = getProvider(device.providerId());
+            if (provider != null) {
+                provider.roleChanged(device, newRole);
+            }
+            post(event);
+        }
+    }
+
+    @Override
+    public void removeDevice(DeviceId deviceId) {
+        checkNotNull(deviceId, DEVICE_ID_NULL);
+        DeviceEvent event = store.removeDevice(deviceId);
+        post(event);
+    }
+
     // Personalized device provider service issued to the supplied provider.
     private class InternalDeviceProviderService extends AbstractProviderService<DeviceProvider>
             implements DeviceProviderService {
@@ -124,7 +148,8 @@
             checkNotNull(deviceId, DEVICE_ID_NULL);
             checkNotNull(deviceDescription, DEVICE_DESCRIPTION_NULL);
             log.info("Device {} connected: {}", deviceId, deviceDescription);
-            DeviceEvent event = store.createOrUpdateDevice(deviceId, deviceDescription);
+            DeviceEvent event = store.createOrUpdateDevice(provider().id(),
+                                                           deviceId, deviceDescription);
             post(event);
         }
 
@@ -132,7 +157,7 @@
         public void deviceDisconnected(DeviceId deviceId) {
             checkNotNull(deviceId, DEVICE_ID_NULL);
             log.info("Device {} disconnected", deviceId);
-            DeviceEvent event = store.removeDevice(deviceId);
+            DeviceEvent event = store.markOffline(deviceId);
             post(event);
         }