Aneesha Pailla
Committed by Gerrit Code Review

Changes to be compatible with Calient Switch Software Release 6.0.4

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

Change-Id: I218620fac4413ce03cb9a70d8da8c7f9757d4f4f
...@@ -161,7 +161,8 @@ ...@@ -161,7 +161,8 @@
161 impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/> 161 impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/>
162 </driver> 162 </driver>
163 <driver name="calient" extends="default" 163 <driver name="calient" extends="default"
164 - manufacturer="Calient Technologies" hwVersion=".*" swVersion="Optical Circuit Switch"> 164 + manufacturer="calient technologies inc" hwVersion="calient hardware.*"
165 + swVersion="ocs software version.*">
165 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 166 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
166 impl="org.onosproject.driver.handshaker.CalientFiberSwitchHandshaker"/> 167 impl="org.onosproject.driver.handshaker.CalientFiberSwitchHandshaker"/>
167 <behaviour api="org.onosproject.net.behaviour.LambdaQuery" 168 <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
......