Converted onos-drivers.xml to use inheritance.

Change-Id: Idb4a14d1e414bad3c629e79ed3d01a123b98d10c

Converted onos-drivers.xml to use inheritance.
Change-Id: Idb4a14d1e414bad3c629e79ed3d01a123b98d10c
Thomas Vachuska · Gerrit Code Review
Commit ecc614d9fd6d81a6c454bb9187616ddf0363bdbc ecc614d9 1 parent 01cb1a90
Showing 1 changed file with 8 additions and 13 deletions
drivers/src/main/resources/onos-drivers.xml
--- a/drivers/src/main/resources/onos-drivers.xml
View file @ecc614d
+++ b/drivers/src/main/resources/onos-drivers.xml
View file @ecc614d
@@ -27,17 +27,15 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFOVSSwitchCorsaTTP"/>
     </driver>
-     <driver name="spring-open-cpqd" manufacturer="Stanford University, Ericsson Research and CPqD Research" hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
+     <driver name="spring-open-cpqd" extends="default"
+             manufacturer="Stanford University, Ericsson Research and CPqD Research" hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.SpringOpenTTP"/>
-         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                    impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
     </driver>
-     <driver name="spring-open" manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0" swVersion="OpenFlow switch SW ver. 1.0 and 1.3">
+     <driver name="spring-open" extends="default"
+             manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0" swVersion="OpenFlow switch SW ver. 1.0 and 1.3">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
-         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                    impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
     </driver>
     <driver name="cpqd" manufacturer="Stanford University, Ericsson Research and CPqD Research"
             hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
@@ -46,10 +44,8 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFSwitchImplSpringOpenTTP"/>
     </driver>
-     <driver name="linc-oe" manufacturer="FlowForwarding.org" hwVersion="Unknown"
-             swVersion="LINC-OE OpenFlow Software Switch 1.1">
-         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
-                    impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/>
+     <driver name="linc-oe" extends="default"
+             manufacturer="FlowForwarding.org" hwVersion="Unknown" swVersion="LINC-OE OpenFlow Software Switch 1.1">
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/>
     </driver>
@@ -59,11 +55,10 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFCorsaSwitchDriver"/>
     </driver>
-     <driver name="ofdpa" manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">
+     <driver name="ofdpa" extends="default"
+             manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.OFDPA1Pipeline"/>
-         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                    impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
     </driver>
 </drivers>