홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
ecc614d9 1 parent 01cb1a90

Converted onos-drivers.xml to use inheritance. 

Change-Id: Idb4a14d1e414bad3c629e79ed3d01a123b98d10c
Inline Side-by-side
Showing 1 changed file with 8 additions and 13 deletions
...@@ -27,17 +27,15 @@ ...@@ -27,17 +27,15 @@
27 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 27 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
28 impl="org.onosproject.driver.handshaker.OFOVSSwitchCorsaTTP"/> 28 impl="org.onosproject.driver.handshaker.OFOVSSwitchCorsaTTP"/>
29 </driver> 29 </driver>
30 - <driver name="spring-open-cpqd" manufacturer="Stanford University, Ericsson Research and CPqD Research" hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*"> 30 + <driver name="spring-open-cpqd" extends="default"
31 + manufacturer="Stanford University, Ericsson Research and CPqD Research" hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
31 <behaviour api="org.onosproject.net.behaviour.Pipeliner" 32 <behaviour api="org.onosproject.net.behaviour.Pipeliner"
32 impl="org.onosproject.driver.pipeline.SpringOpenTTP"/> 33 impl="org.onosproject.driver.pipeline.SpringOpenTTP"/>
33 - <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
34 - impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
35 </driver> 34 </driver>
36 - <driver name="spring-open" manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0" swVersion="OpenFlow switch SW ver. 1.0 and 1.3"> 35 + <driver name="spring-open" extends="default"
36 + manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0" swVersion="OpenFlow switch SW ver. 1.0 and 1.3">
37 <behaviour api="org.onosproject.net.behaviour.Pipeliner" 37 <behaviour api="org.onosproject.net.behaviour.Pipeliner"
38 impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/> 38 impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
39 - <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
40 - impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
41 </driver> 39 </driver>
42 <driver name="cpqd" manufacturer="Stanford University, Ericsson Research and CPqD Research" 40 <driver name="cpqd" manufacturer="Stanford University, Ericsson Research and CPqD Research"
43 hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*"> 41 hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
...@@ -46,10 +44,8 @@ ...@@ -46,10 +44,8 @@
46 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 44 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
47 impl="org.onosproject.driver.handshaker.OFSwitchImplSpringOpenTTP"/> 45 impl="org.onosproject.driver.handshaker.OFSwitchImplSpringOpenTTP"/>
48 </driver> 46 </driver>
49 - <driver name="linc-oe" manufacturer="FlowForwarding.org" hwVersion="Unknown" 47 + <driver name="linc-oe" extends="default"
50 - swVersion="LINC-OE OpenFlow Software Switch 1.1"> 48 + manufacturer="FlowForwarding.org" hwVersion="Unknown" swVersion="LINC-OE OpenFlow Software Switch 1.1">
51 - <behaviour api="org.onosproject.net.behaviour.Pipeliner"
52 - impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/>
53 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 49 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
54 impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/> 50 impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/>
55 </driver> 51 </driver>
...@@ -59,11 +55,10 @@ ...@@ -59,11 +55,10 @@
59 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 55 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
60 impl="org.onosproject.driver.handshaker.OFCorsaSwitchDriver"/> 56 impl="org.onosproject.driver.handshaker.OFCorsaSwitchDriver"/>
61 </driver> 57 </driver>
62 - <driver name="ofdpa" manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0"> 58 + <driver name="ofdpa" extends="default"
59 + manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">
63 <behaviour api="org.onosproject.net.behaviour.Pipeliner" 60 <behaviour api="org.onosproject.net.behaviour.Pipeliner"
64 impl="org.onosproject.driver.pipeline.OFDPA1Pipeline"/> 61 impl="org.onosproject.driver.pipeline.OFDPA1Pipeline"/>
65 - <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
66 - impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
67 </driver> 62 </driver>
68 </drivers> 63 </drivers>
69 64
......