commit 8430da12b8e5d8354069abfae7bd8a0b87625c60
author Andrea Campanella <andrea@onlab.us> Wed Mar 15 11:36:35 2017 +0100
committer Thomas Vachuska <tom@onlab.us> Wed Mar 15 19:12:29 2017 +0000
tree c9a04a0129415e32f8b831b8951f8ca6e2a568fb
parent 35c9ea8c9a3caa11d62cc889d3b38ba84f1298df

Adding reference to DefaultDriverProviderService in Corsa drivers to enforce correct ordering of driver loading at ONOS startup

Change-Id: I4c46faf5682a02c667ff81ab5edff0dd539e7d1b

drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaDriversLoader.java

diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaDriversLoader.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaDriversLoader.java
index b2ad9ee..33eb06e 100644
--- a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaDriversLoader.java
+++ b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaDriversLoader.java
@@ -17,13 +17,23 @@
 package org.onosproject.drivers.corsa;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onosproject.net.driver.AbstractDriverLoader;
+import org.onosproject.net.driver.DefaultDriverProviderService;
 
 /**
  * Loader for Corsa device drivers.
  */
 @Component(immediate = true)
 public class CorsaDriversLoader extends AbstractDriverLoader {
+
+    //This reference is needed to enforce loading of the default drivers before
+    //the corsa drivers at ONOS startup if corsa.drivers is specified
+    //in the ONOS_APPS variable.
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    private DefaultDriverProviderService defaultDriverProviderService;
+
     public CorsaDriversLoader() {
         super("/corsa-drivers.xml");
     }