commit 7f44bc326f2ee2f2ea63f348378ac8ac79910d26
author Aneesha Pailla <apailla@calient.net> Thu Feb 11 10:23:10 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 23 03:45:09 2016 +0000
tree 8bdc8ba992ea1dd01e76bb645a65125c6f32634c
parent 59071f3a58a42c493b7b34ff002fe1f28f0cd539

Changes to be compatible with Calient Switch Software Release 6.0.4

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

Change-Id: I218620fac4413ce03cb9a70d8da8c7f9757d4f4f

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 9e29470..20aa373 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -161,7 +161,8 @@
                    impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/>
     </driver>
     <driver name="calient" extends="default"
-            manufacturer="Calient Technologies" hwVersion=".*" swVersion="Optical Circuit Switch">
+            manufacturer="calient technologies inc" hwVersion="calient hardware.*"
+            swVersion="ocs software version.*">
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.CalientFiberSwitchHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"