ONOS-3650 Device driver multiple inheritance
Change-Id: Ib7b72d44533d4e63c4122662b50485243562aa21
diff --git a/drivers/src/main/resources/onos-drivers.xml b/drivers/src/main/resources/onos-drivers.xml
index d3d1f98..b64fe34 100644
--- a/drivers/src/main/resources/onos-drivers.xml
+++ b/drivers/src/main/resources/onos-drivers.xml
@@ -46,7 +46,7 @@
impl="org.onosproject.driver.query.FullMplsAvailable" />
</driver>
<!--This driver is for simulated NETCONF devices through of-config tool on top og OVSDB-->
- <driver name="ovs-netconf" extends="default"
+ <driver name="ovs-netconf" extends="default,ovs"
manufacturer="" hwVersion="" swVersion="">
<behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
impl="org.onosproject.driver.handshaker.NiciraSwitchHandshaker"/>
diff --git a/drivers/src/test/java/org/onosproject/driver/ovsdb/OvsdbControllerConfigTest.java b/drivers/src/test/java/org/onosproject/driver/ovsdb/OvsdbControllerConfigTest.java
index 4a91efc..74aae4c 100644
--- a/drivers/src/test/java/org/onosproject/driver/ovsdb/OvsdbControllerConfigTest.java
+++ b/drivers/src/test/java/org/onosproject/driver/ovsdb/OvsdbControllerConfigTest.java
@@ -28,6 +28,8 @@
import org.onosproject.ovsdb.controller.driver.OvsdbClientServiceAdapter;
import org.onosproject.ovsdb.controller.driver.OvsdbControllerAdapter;
+import java.util.ArrayList;
+
/**
* Created by Andrea on 10/7/15.
*/
@@ -51,7 +53,7 @@
public void setUp() {
controllerConfig = new OvsdbControllerConfig();
- ddc = new DefaultDriver("foo.bar", null, "Circus", "lux", "1.2a",
+ ddc = new DefaultDriver("foo.bar", new ArrayList<>(), "Circus", "lux", "1.2a",
ImmutableMap.of(ControllerConfig.class,
OvsdbControllerConfig.class),
ImmutableMap.of("foo", "bar"));