Make error messages more accurate when OpenFlow provider can't find a driver for a device

Change-Id: If40f2446fab215950689b6846aadc8024e8eb8e1

@@ -195,7 +195,6 @@ public class Controller {
         } catch (Exception ex) {
         } catch (Exception ex) {
             log.error("SSL init failed: {}", ex.getMessage());
             log.error("SSL init failed: {}", ex.getMessage());
         }
         }
-
     }
     }
 
 
     private void getTlsParameters() {
     private void getTlsParameters() {
@@ -227,7 +226,6 @@ public class Controller {
     }
     }
 
 
     private void initSsl() throws Exception {
     private void initSsl() throws Exception {
-
         TrustManagerFactory tmFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         TrustManagerFactory tmFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         KeyStore ts = KeyStore.getInstance("JKS");
         KeyStore ts = KeyStore.getInstance("JKS");
         ts.load(new FileInputStream(tsLocation), tsPwd);
         ts.load(new FileInputStream(tsLocation), tsPwd);
@@ -240,8 +238,6 @@ public class Controller {
 
 
         sslContext = SSLContext.getInstance("TLS");
         sslContext = SSLContext.getInstance("TLS");
         sslContext.init(kmf.getKeyManagers(), tmFactory.getTrustManagers(), null);
         sslContext.init(kmf.getKeyManagers(), tmFactory.getTrustManagers(), null);
-
-
     }
     }
 
 
     // **************
     // **************
@@ -286,22 +282,28 @@ public class Controller {
             driver = driverService.getDriver(desc.getMfrDesc(), desc.getHwDesc(), desc.getSwDesc());
             driver = driverService.getDriver(desc.getMfrDesc(), desc.getHwDesc(), desc.getSwDesc());
         }
         }
 
 
-        if (driver != null && driver.hasBehaviour(OpenFlowSwitchDriver.class)) {
-            Dpid did = new Dpid(dpid);
+        if (driver == null) {
+            log.error("No OpenFlow driver for {} : {}", dpid, desc);
+            return null;
+        }
+
+        log.info("Driver {} assigned to device {}", driver.name(), dpidObj);
+
+        if (!driver.hasBehaviour(OpenFlowSwitchDriver.class)) {
+            log.error("Driver {} does not support OpenFlowSwitchDriver behaviour", driver.name());
+            return null;
+        }
+
         DefaultDriverHandler handler =
         DefaultDriverHandler handler =
-                    new DefaultDriverHandler(new DefaultDriverData(driver, deviceId(uri(did))));
+                new DefaultDriverHandler(new DefaultDriverData(driver, deviceId(uri(dpidObj))));
         OpenFlowSwitchDriver ofSwitchDriver =
         OpenFlowSwitchDriver ofSwitchDriver =
                 driver.createBehaviour(handler, OpenFlowSwitchDriver.class);
                 driver.createBehaviour(handler, OpenFlowSwitchDriver.class);
-            ofSwitchDriver.init(did, desc, ofv);
+        ofSwitchDriver.init(dpidObj, desc, ofv);
         ofSwitchDriver.setAgent(agent);
         ofSwitchDriver.setAgent(agent);
         ofSwitchDriver.setRoleHandler(new RoleManager(ofSwitchDriver));
         ofSwitchDriver.setRoleHandler(new RoleManager(ofSwitchDriver));
         log.info("OpenFlow handshaker found for device {}: {}", dpid, ofSwitchDriver);
         log.info("OpenFlow handshaker found for device {}: {}", dpid, ofSwitchDriver);
         return ofSwitchDriver;
         return ofSwitchDriver;
     }
     }
-        log.error("No OpenFlow driver for {} : {}", dpid, desc);
-        return null;
-
-    }
 
 
     public void start(OpenFlowAgent ag, DriverService driverService) {
     public void start(OpenFlowAgent ag, DriverService driverService) {
         log.info("Starting OpenFlow IO");
         log.info("Starting OpenFlow IO");