commit a59f9b76c80a62109b5aeb8a51558eebaed8e9f9
author Charles Chan <rascov@gmail.com> Sun Jul 30 18:09:44 2017 -0700
committer Charles Chan <rascov@gmail.com> Thu Aug 03 11:29:40 2017 -0700
tree 78333010765c9e120d34b644e5a886f8fc4123d7
parent 5989ddf2849a2069ac1d66a63de76b9e7fcdda31

Introduce driver property to suppress meter feature

Piggybacked in this commit:
- Fix CLI output of driver properties
- Fix mfr matching pattern in onos-drivers.xml
- Add driver support for Accton OFDPA 3

Change-Id: Ia350bd52f4e88e53565ff491d68bce5e4894bbb9

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 fa32015..61602ee 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -59,7 +59,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 i12_1.7" swVersion="OF-DPA i12_1.7">
+            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.ofdpa.Ofdpa2Pipeline"/>
         <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@@ -70,13 +70,14 @@
                    impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" />
         <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
                    impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" />
+        <property name="meterCapable">false</property>
     </driver>
 
     <!--  Driver for OFDPA 3.0 EA*.
        ~  TODO: version number from switch is still 2.0. Update when 3.0 is GA.
       -->
-    <driver name="ofdpa3" extends="default"
-            manufacturer="Broadcom Corp." hwVersion="OF-DPA 2.0" swVersion="OF-DPA 2.0">
+    <driver name="ofdpa3" extends="ofdpa"
+            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.ofdpa.Ofdpa3Pipeline"/>
         <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
@@ -93,12 +94,16 @@
        ~  Note: driver needs to be configured using onos-netcfg.
       -->
     <driver name="qmx-ofdpa3" extends="ofdpa3"
-            manufacturer="Broadcom Corp." hwVersion="Qmx" swVersion="Qmx">
-            <behaviour api="org.onosproject.net.behaviour.Pipeliner"
-                   impl="org.onosproject.driver.pipeline.ofdpa.Ofdpa3QmxPipeline"/>
+            manufacturer="Broadcom Corp\." hwVersion="Qmx" swVersion="Qmx">
+        <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+               impl="org.onosproject.driver.pipeline.ofdpa.Ofdpa3QmxPipeline"/>
     </driver>
 
-    <driver name="znyx-ofdpa" extends="default"
+    <driver name="accton-ofdpa3" extends="ofdpa3"
+            manufacturer="Accton Corp\." hwVersion=".*" swVersion="ofdpa 3.*">
+    </driver>
+
+    <driver name="znyx-ofdpa" extends="ofdpa3"
             manufacturer="ZNYX Networks" hwVersion=".*" swVersion=".*OF-DPA.*">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.ofdpa.Ofdpa3Pipeline"/>