홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Rimon Ashkenazy
Committed by Gerrit Code Review
4ffab0d4 1 parent 0de87619

Add support for openflow Optical OTN switch 

Change-Id: Ied0a1621b64033bd0b62521c2b6bf42ba701ca53
Inline Side-by-side
Showing 2 changed files with 11 additions and 2 deletions
...@@ -144,7 +144,16 @@ public class OFOpticalSwitch13 extends AbstractOpenFlowSwitch implements OpenFlo ...@@ -144,7 +144,16 @@ public class OFOpticalSwitch13 extends AbstractOpenFlowSwitch implements OpenFlo
144 144
145 @Override 145 @Override
146 public Device.Type deviceType() { 146 public Device.Type deviceType() {
147 - return Device.Type.ROADM; 147 + String hwDesc = hardwareDescription();
148 + switch (hwDesc) {
149 + case "Optical-ROADM":
150 + return Device.Type.ROADM;
151 + case "Optical-OTN":
152 + return Device.Type.OTN;
153 + default:
154 + log.error("Unsupported hardwareDescription {}", hwDesc);
155 + return Device.Type.OTHER;
156 + }
148 } 157 }
149 158
150 /* 159 /*
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 impl="org.onosproject.driver.pipeline.OpenVSwitchPipeline"/> 138 impl="org.onosproject.driver.pipeline.OpenVSwitchPipeline"/>
139 </driver> 139 </driver>
140 <driver name="eci" extends="default" 140 <driver name="eci" extends="default"
141 - manufacturer="ECI Telecom" hwVersion="optical" swVersion="V_1_0"> 141 + manufacturer="ECI Telecom" hwVersion="Optical.*" swVersion="V_1_0">
142 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 142 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
143 impl="org.onosproject.driver.handshaker.OFOpticalSwitch13"/> 143 impl="org.onosproject.driver.handshaker.OFOpticalSwitch13"/>
144 </driver> 144 </driver>
......