ONOS-6031 Fixing class loading problem when adding FullMeatersAvailable to corsa-v39 driver
Change-Id: I7c89f8bb85942f4a6e04034be010416752e2924e
diff --git a/drivers/corsa/src/main/resources/corsa-drivers.xml b/drivers/corsa/src/main/resources/corsa-drivers.xml
index 93f4858..377a30e 100644
--- a/drivers/corsa/src/main/resources/corsa-drivers.xml
+++ b/drivers/corsa/src/main/resources/corsa-drivers.xml
@@ -41,7 +41,7 @@
<behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
impl="org.onosproject.drivers.corsa.CorsaSwitchHandshaker"/>
</driver>
- <driver name="corsa-v39"
+ <driver name="corsa-v39" extends="abstract"
manufacturer="Corsa" hwVersion="CDP6420-A00" swVersion="corsa-ovs-datapath 1.4.97">
<behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.drivers.corsa.CorsaPipelineV39"/>
diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index c9411b9..c1842db 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -230,5 +230,17 @@
<behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.driver.pipeline.HpPipeline"/>
</driver>
+ <!-- The abstract driver is meant as a base driver containing classes that are
+ ~ present in the default drivers module. These classes are needed by other
+ ~ drivers but not loaded by any of the base ones.
+ ~ The abstract driver is NOT meant to be used by itself with any device.
+ ~ Policies will be put in place in the DriverManager so that this driver
+ ~ is not assigned to any device from the southbound or the net-cfg.
+ -->
+ <driver name="abstract"
+ manufacturer="abstract" hwVersion="abstract" swVersion="abstract">
+ <behaviour api="org.onosproject.net.behaviour.MeterQuery"
+ impl="org.onosproject.driver.query.FullMetersAvailable"/>
+ </driver>
</drivers>