홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yafit Hadar
Committed by Gerrit Code Review
4cc65f75 1 parent 8bf77b78

LINC-OE - Flows are stay in PENDING ADD STATE[bug 3823] 

Change-Id: Ia821ce1259a36ac4afdfa1b1cd34e8f07c81790e
Inline Side-by-side
Showing 1 changed file with 6 additions and 3 deletions
...@@ -77,7 +77,7 @@ import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMet ...@@ -77,7 +77,7 @@ import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMet
77 import org.projectfloodlight.openflow.protocol.match.Match; 77 import org.projectfloodlight.openflow.protocol.match.Match;
78 import org.projectfloodlight.openflow.protocol.match.MatchField; 78 import org.projectfloodlight.openflow.protocol.match.MatchField;
79 import org.projectfloodlight.openflow.protocol.oxm.OFOxm; 79 import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
80 -import org.projectfloodlight.openflow.protocol.oxm.OFOxmOchSigidBasic; 80 +import org.projectfloodlight.openflow.protocol.oxm.OFOxmOchSigid;
81 import org.projectfloodlight.openflow.protocol.ver13.OFFactoryVer13; 81 import org.projectfloodlight.openflow.protocol.ver13.OFFactoryVer13;
82 import org.projectfloodlight.openflow.types.CircuitSignalID; 82 import org.projectfloodlight.openflow.types.CircuitSignalID;
83 import org.projectfloodlight.openflow.types.IPv4Address; 83 import org.projectfloodlight.openflow.types.IPv4Address;
...@@ -339,8 +339,11 @@ public class FlowEntryBuilder { ...@@ -339,8 +339,11 @@ public class FlowEntryBuilder {
339 if (exp.getExperimenter() == 0x80005A06 || 339 if (exp.getExperimenter() == 0x80005A06 ||
340 exp.getExperimenter() == 0x748771) { 340 exp.getExperimenter() == 0x748771) {
341 OFActionCircuit ct = (OFActionCircuit) exp; 341 OFActionCircuit ct = (OFActionCircuit) exp;
342 - short lambda = ((OFOxmOchSigidBasic) ct.getField()).getValue().getChannelNumber(); 342 + CircuitSignalID circuitSignalID = ((OFOxmOchSigid) ct.getField()).getValue();
343 - builder.add(Instructions.modL0Lambda(Lambda.indexedLambda(lambda))); 343 + builder.add(Instructions.modL0Lambda(Lambda.ochSignal(
344 + lookupGridType(circuitSignalID.getGridType()),
345 + lookupChannelSpacing(circuitSignalID.getChannelSpacing()),
346 + circuitSignalID.getChannelNumber(), circuitSignalID.getSpectralWidth())));
344 } else if (exp.getExperimenter() == 0x2320) { 347 } else if (exp.getExperimenter() == 0x2320) {
345 if (treatmentInterpreter != null) { 348 if (treatmentInterpreter != null) {
346 builder.extension(treatmentInterpreter.mapAction(exp), 349 builder.extension(treatmentInterpreter.mapAction(exp),
......