commit ad2d2096a74f05434cbcc04a1d798a0349fd96a6
author tom <tom@onlab.us> Sat Sep 06 23:24:20 2014 -0700
committer tom <tom@onlab.us> Sat Sep 06 23:24:20 2014 -0700
tree 8dc81eb2df9f546e0759634e6218559ad6d77bda
parent 24c55cd224f04def3386e9a5366dc33947137486

Added getDeviceCount and tests.

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 9986b0d..b8f5788 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
@@ -69,9 +69,8 @@
     }
 
     @Override
-    public MastershipRole getRole(DeviceId deviceId) {
-        checkNotNull(deviceId, DEVICE_ID_NULL);
-        return store.getRole(deviceId);
+    public int getDeviceCount() {
+        return store.getDeviceCount();
     }
 
     @Override
@@ -86,6 +85,12 @@
     }
 
     @Override
+    public MastershipRole getRole(DeviceId deviceId) {
+        checkNotNull(deviceId, DEVICE_ID_NULL);
+        return store.getRole(deviceId);
+    }
+
+    @Override
     public List<Port> getPorts(DeviceId deviceId) {
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getPorts(deviceId);

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

diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
index a49384b..dd63469 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
@@ -28,7 +28,8 @@
 import static org.onlab.onos.net.device.DeviceEvent.Type.*;
 
 /**
- * Manages inventory of infrastructure devices.
+ * Manages inventory of infrastructure devices using trivial in-memory
+ * implementation.
  */
 class SimpleDeviceStore {
 
@@ -40,6 +41,15 @@
     private final Map<DeviceId, Map<PortNumber, Port>> devicePorts = new HashMap<>();
 
     /**
+     * Returns the number of devices known to the system.
+     *
+     * @return number of devices
+     */
+    public int getDeviceCount() {
+        return devices.size();
+    }
+
+    /**
      * Returns an iterable collection of all devices known to the system.
      *
      * @return device collection
@@ -301,5 +311,4 @@
                     new DeviceEvent(DEVICE_REMOVED, device, null);
         }
     }
-
 }