Changes to be compatible with Calient Switch Software Release 6.0.4
Conflicts:
drivers/default/src/main/resources/onos-drivers.xml
Change-Id: I218620fac4413ce03cb9a70d8da8c7f9757d4f4f
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"