commit 4ffab0d4907cc951d47b4cb4f084470a3388b695
author Rimon Ashkenazy <rimon8963@gmail.com> Mon Nov 23 14:21:07 2015 +0200
committer Gerrit Code Review <gerrit@onlab.us> Tue Nov 24 20:08:47 2015 +0000
tree 84848daca88970aea3ad8aea1f2ec8659394f2f6
parent 0de87619411365f1ee06e14ddd32564158a1fcaa

Add support for openflow Optical OTN switch

Change-Id: Ied0a1621b64033bd0b62521c2b6bf42ba701ca53

drivers/src/main/java/org/onosproject/driver/handshaker/OFOpticalSwitch13.java

diff --git a/drivers/src/main/java/org/onosproject/driver/handshaker/OFOpticalSwitch13.java b/drivers/src/main/java/org/onosproject/driver/handshaker/OFOpticalSwitch13.java
index a62b93c..5c6ce36 100644
--- a/drivers/src/main/java/org/onosproject/driver/handshaker/OFOpticalSwitch13.java
+++ b/drivers/src/main/java/org/onosproject/driver/handshaker/OFOpticalSwitch13.java
@@ -144,7 +144,16 @@
 
     @Override
     public Device.Type deviceType() {
-        return Device.Type.ROADM;
+        String hwDesc = hardwareDescription();
+        switch (hwDesc) {
+            case "Optical-ROADM":
+                return Device.Type.ROADM;
+            case "Optical-OTN":
+                return Device.Type.OTN;
+            default:
+                log.error("Unsupported hardwareDescription {}", hwDesc);
+                return Device.Type.OTHER;
+        }
     }
 
     /*

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

diff --git a/drivers/src/main/resources/onos-drivers.xml b/drivers/src/main/resources/onos-drivers.xml
index 774f514..a172c18 100644
--- a/drivers/src/main/resources/onos-drivers.xml
+++ b/drivers/src/main/resources/onos-drivers.xml
@@ -138,7 +138,7 @@
                    impl="org.onosproject.driver.pipeline.OpenVSwitchPipeline"/>
     </driver>
     <driver name="eci" extends="default"
-            manufacturer="ECI Telecom" hwVersion="optical" swVersion="V_1_0">
+            manufacturer="ECI Telecom" hwVersion="Optical.*" swVersion="V_1_0">
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFOpticalSwitch13"/>
     </driver>