mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-25 22:31:07 +02:00
Code Issues Projects Releases Wiki Activity

Change default OFDPA driver to ofdpa3

Browse Source 
Change-Id: Iefdcbf3e4698cdc2e1da1c9008986afeeaa13ad6
(cherry picked from commit 936281713972b10c5dda56d5b093e5b17fe87a6f)
This commit is contained in:
Charles Chan 2016-12-09 13:50:45 -08:00 committed by Ray Milkey
parent 2c8356509c
commit a5bb4a1057
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaExtensionTreatmentInterpreter.java
View File

@ -33,7 +33,7 @@ import org.projectfloodlight.openflow.types.OFVlanVidMatch;
/** /**
* Interpreter for OFDPA OpenFlow treatment extensions. * Interpreter for OFDPA OpenFlow treatment extensions.
*/ */
public class OfdpaExtensionTreatmentInterpreter extends AbstractHandlerBehaviour public class OfdpaExtensionTreatmentInterpreter extends AbstractHandlerBehaviour
implements ExtensionTreatmentInterpreter, ExtensionTreatmentResolver { implements ExtensionTreatmentInterpreter, ExtensionTreatmentResolver {
@Override @Override
public boolean supported(ExtensionTreatmentType extensionTreatmentType) { public boolean supported(ExtensionTreatmentType extensionTreatmentType) {

13
drivers/default/src/main/resources/onos-drivers.xml
View File

@ -70,8 +70,12 @@
<behaviour api="org.onosproject.net.behaviour.Pipeliner" <behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/> impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
</driver> </driver>
<!-- Driver for OFDPA i12_1.7.
~ TODO: version number in i12_1.7 is 2.0. Change it back when we can distinguish 3.0.
-->
<driver name="ofdpa" extends="default" <driver name="ofdpa" extends="default"
manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*"> manufacturer="Broadcom Corp." hwVersion="OF-DPA i12_1.7" swVersion="OF-DPA i12_1.7">
<behaviour api="org.onosproject.net.behaviour.Pipeliner" <behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.driver.pipeline.Ofdpa2Pipeline"/> impl="org.onosproject.driver.pipeline.Ofdpa2Pipeline"/>
<behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter" <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@ -83,8 +87,12 @@
<behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver" <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" /> impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" />
</driver> </driver>
<!-- Driver for OFDPA 3.0 EA0.
~ TODO: version number in 3.0 EA0 is still 2.0. Update to 3.0 when OFDPA releases.
-->
<driver name="ofdpa3" extends="default" <driver name="ofdpa3" extends="default"
manufacturer="Broadcom Corp." hwVersion="OF-DPA 3.0" swVersion="OF-DPA 3.0"> manufacturer="Broadcom Corp." hwVersion="OF-DPA 2.0" swVersion="OF-DPA 2.0">
<behaviour api="org.onosproject.net.behaviour.Pipeliner" <behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.driver.pipeline.Ofdpa3Pipeline"/> impl="org.onosproject.driver.pipeline.Ofdpa3Pipeline"/>
<behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter" <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@ -96,6 +104,7 @@
<behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver" <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
impl="org.onosproject.driver.extensions.Ofdpa3ExtensionSelectorInterpreter" /> impl="org.onosproject.driver.extensions.Ofdpa3ExtensionSelectorInterpreter" />
</driver> </driver>
<driver name="znyx-ofdpa" extends="default" <driver name="znyx-ofdpa" extends="default"
manufacturer="ZNYX Networks" hwVersion=".*" swVersion=".*OF-DPA.*"> manufacturer="ZNYX Networks" hwVersion=".*" swVersion=".*OF-DPA.*">
<behaviour api="org.onosproject.net.behaviour.Pipeliner" <behaviour api="org.onosproject.net.behaviour.Pipeliner"