commit 1e24910516c195927caa4a988e5e40ea88ab8223
author Seyeon Jeong <seyeon@opennetworking.org> Tue Mar 10 17:41:14 2020 -0700
committer Charles Chan <charles@opennetworking.org> Wed Mar 25 02:12:52 2020 +0000
tree 5efc184a644d2f60b664e9241d7acb12b36cfcbe
parent 745873c692cf61a0cb4ec9b5800ee2272fcf26ce

Provide a map between all devices and their driver names

- Introduce a new Java API in DriverService
- Implement a new CLI command device-drivers that dumps all devices and their driver names or a driver name of a device
- Include this CLI command as part of onos-diags

Change-Id: I978690e6af6c00dbfc09259b50449779b1167754
(cherry picked from commit dfaf4622e00256a8063ec4f12765381f7290a476)

core/api/src/main/java/org/onosproject/net/driver/DriverService.java

diff --git a/core/api/src/main/java/org/onosproject/net/driver/DriverService.java b/core/api/src/main/java/org/onosproject/net/driver/DriverService.java
index e4432d1..2b7930b 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/DriverService.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/DriverService.java
@@ -17,6 +17,7 @@
 
 import org.onosproject.net.DeviceId;
 
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -57,6 +58,13 @@
     Driver getDriver(DeviceId deviceId);
 
     /**
+     * Returns a map between all devices and their driver names.
+     *
+     * @return map of (device id, driver name)
+     */
+    Map<DeviceId, String> getDeviceDrivers();
+
+    /**
      * Creates a new driver handler for interacting with the specified device.
      * The driver is looked-up using the same semantics as
      * {@link #getDriver(DeviceId)} method.

core/api/src/test/java/org/onosproject/net/driver/DriverServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/net/driver/DriverServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/driver/DriverServiceAdapter.java
index b2644db..776648d 100644
--- a/core/api/src/test/java/org/onosproject/net/driver/DriverServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/driver/DriverServiceAdapter.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.driver;
 
+import java.util.Map;
 import java.util.Set;
 
 import org.onosproject.net.DeviceId;
@@ -55,6 +56,11 @@
     }
 
     @Override
+    public Map<DeviceId, String> getDeviceDrivers() {
+        return null;
+    }
+
+    @Override
     public void addListener(DriverListener listener) {
     }
 

core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
index 31032b3..1814722 100644
--- a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
+++ b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
@@ -40,6 +40,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -150,6 +152,15 @@
                               NO_DRIVER);
     }
 
+    @Override
+    public Map<DeviceId, String> getDeviceDrivers() {
+        Map<DeviceId, String> deviceDriverNameMap = new HashMap<>();
+        deviceService.getDevices().forEach(device -> {
+            deviceDriverNameMap.put(device.id(), getDriver(device.id()).name());
+        });
+        return deviceDriverNameMap;
+    }
+
     private Driver getPipeconfMergedDriver(DeviceId deviceId) {
         PiPipeconfId pipeconfId = pipeconfService.ofDevice(deviceId).orElse(null);
         if (pipeconfId == null) {