commit a5bb4a1057bb43c539b5be17c35a34aedc3e684b
author Charles Chan <rascov@gmail.com> Fri Dec 09 13:50:45 2016 -0800
committer Ray Milkey <ray@onlab.us> Mon Jan 09 22:24:22 2017 +0000
tree a7b4ff2bdb9b1c1d0471de6b2c7b07de3db8a40a
parent 2c8356509c41b538230b6d730183c69615f5dacc

Change default OFDPA driver to ofdpa3

Change-Id: Iefdcbf3e4698cdc2e1da1c9008986afeeaa13ad6
(cherry picked from commit 936281713972b10c5dda56d5b093e5b17fe87a6f)

drivers/default/src/main/resources/onos-drivers.xml

diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index f22ec38..273204e 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -70,8 +70,12 @@
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
     </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"
-            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"
                    impl="org.onosproject.driver.pipeline.Ofdpa2Pipeline"/>
         <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@@ -83,8 +87,12 @@
         <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
                    impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" />
     </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"
-            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"
                    impl="org.onosproject.driver.pipeline.Ofdpa3Pipeline"/>
         <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@@ -96,6 +104,7 @@
         <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
                    impl="org.onosproject.driver.extensions.Ofdpa3ExtensionSelectorInterpreter" />
     </driver>
+
     <driver name="znyx-ofdpa" extends="default"
             manufacturer="ZNYX Networks" hwVersion=".*" swVersion=".*OF-DPA.*">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"