홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
f60e45f1 1 parent cc752fa7

Remove L0SubType.LAMBDA which now gets unnecessary 

It's because IndexedLambda the type heavily depends on is removed

Change-Id: Ie549255353a2d605f528decfefd0c11f9728d7d8
Inline Side-by-side
Showing 5 changed files with 0 additions and 36 deletions
...@@ -28,10 +28,6 @@ public abstract class L0ModificationInstruction implements Instruction { ...@@ -28,10 +28,6 @@ public abstract class L0ModificationInstruction implements Instruction {
28 */ 28 */
29 public enum L0SubType { 29 public enum L0SubType {
30 /** 30 /**
31 - * Lambda modification.
32 - */
33 - LAMBDA,
34 - /**
35 * OCh (Optical Channel) modification. 31 * OCh (Optical Channel) modification.
36 */ 32 */
37 OCH, 33 OCH,
......
...@@ -60,12 +60,6 @@ public final class EncodeInstructionCodecHelper { ...@@ -60,12 +60,6 @@ public final class EncodeInstructionCodecHelper {
60 result.put(InstructionCodec.SUBTYPE, l0Instruction.subtype().name()); 60 result.put(InstructionCodec.SUBTYPE, l0Instruction.subtype().name());
61 61
62 switch (l0Instruction.subtype()) { 62 switch (l0Instruction.subtype()) {
63 - case LAMBDA:
64 - final L0ModificationInstruction.ModLambdaInstruction modLambdaInstruction =
65 - (L0ModificationInstruction.ModLambdaInstruction) l0Instruction;
66 - result.put(InstructionCodec.LAMBDA, modLambdaInstruction.lambda());
67 - break;
68 -
69 case OCH: 63 case OCH:
70 L0ModificationInstruction.ModOchSignalInstruction ochSignalInstruction = 64 L0ModificationInstruction.ModOchSignalInstruction ochSignalInstruction =
71 (L0ModificationInstruction.ModOchSignalInstruction) l0Instruction; 65 (L0ModificationInstruction.ModOchSignalInstruction) l0Instruction;
......
...@@ -21,7 +21,6 @@ import org.onosproject.net.flow.DefaultTrafficTreatment; ...@@ -21,7 +21,6 @@ import org.onosproject.net.flow.DefaultTrafficTreatment;
21 import org.onosproject.net.flow.TrafficSelector; 21 import org.onosproject.net.flow.TrafficSelector;
22 import org.onosproject.net.flow.TrafficTreatment; 22 import org.onosproject.net.flow.TrafficTreatment;
23 import org.onosproject.net.flow.criteria.Criterion; 23 import org.onosproject.net.flow.criteria.Criterion;
24 -import org.onosproject.net.flow.criteria.LambdaCriterion;
25 import org.onosproject.net.flow.criteria.OchSignalCriterion; 24 import org.onosproject.net.flow.criteria.OchSignalCriterion;
26 import org.onosproject.net.flow.criteria.EthCriterion; 25 import org.onosproject.net.flow.criteria.EthCriterion;
27 import org.onosproject.net.flow.criteria.VlanIdCriterion; 26 import org.onosproject.net.flow.criteria.VlanIdCriterion;
...@@ -177,17 +176,6 @@ public final class FlowObjectiveCompositionUtil { ...@@ -177,17 +176,6 @@ public final class FlowObjectiveCompositionUtil {
177 case L0MODIFICATION: { 176 case L0MODIFICATION: {
178 L0ModificationInstruction l0 = (L0ModificationInstruction) instruction; 177 L0ModificationInstruction l0 = (L0ModificationInstruction) instruction;
179 switch (l0.subtype()) { 178 switch (l0.subtype()) {
180 - case LAMBDA:
181 - if (criterionMap.containsKey(Criterion.Type.OCH_SIGID)) {
182 - if (((LambdaCriterion) criterionMap.get((Criterion.Type.OCH_SIGID))).lambda()
183 - == ((L0ModificationInstruction.ModLambdaInstruction) l0).lambda()) {
184 - criterionMap.remove(Criterion.Type.OCH_SIGID);
185 - } else {
186 - return null;
187 - }
188 - } else {
189 - break;
190 - }
191 case OCH: 179 case OCH:
192 if (criterionMap.containsKey(Criterion.Type.OCH_SIGID)) { 180 if (criterionMap.containsKey(Criterion.Type.OCH_SIGID)) {
193 if (((OchSignalCriterion) criterionMap.get((Criterion.Type.OCH_SIGID))).lambda() 181 if (((OchSignalCriterion) criterionMap.get((Criterion.Type.OCH_SIGID))).lambda()
......
...@@ -34,7 +34,6 @@ import org.onosproject.net.flow.instructions.Instructions.GroupInstruction; ...@@ -34,7 +34,6 @@ import org.onosproject.net.flow.instructions.Instructions.GroupInstruction;
34 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction; 34 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
35 import org.onosproject.net.flow.instructions.Instructions.SetQueueInstruction; 35 import org.onosproject.net.flow.instructions.Instructions.SetQueueInstruction;
36 import org.onosproject.net.flow.instructions.L0ModificationInstruction; 36 import org.onosproject.net.flow.instructions.L0ModificationInstruction;
37 -import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
38 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModOchSignalInstruction; 37 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModOchSignalInstruction;
39 import org.onosproject.net.flow.instructions.L1ModificationInstruction; 38 import org.onosproject.net.flow.instructions.L1ModificationInstruction;
40 import org.onosproject.net.flow.instructions.L1ModificationInstruction.ModOduSignalIdInstruction; 39 import org.onosproject.net.flow.instructions.L1ModificationInstruction.ModOduSignalIdInstruction;
...@@ -311,8 +310,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder { ...@@ -311,8 +310,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
311 L0ModificationInstruction l0m = (L0ModificationInstruction) i; 310 L0ModificationInstruction l0m = (L0ModificationInstruction) i;
312 OFOxm<?> oxm = null; 311 OFOxm<?> oxm = null;
313 switch (l0m.subtype()) { 312 switch (l0m.subtype()) {
314 - case LAMBDA:
315 - return buildModLambdaInstruction((ModLambdaInstruction) i);
316 case OCH: 313 case OCH:
317 try { 314 try {
318 ModOchSignalInstruction modOchSignalInstruction = (ModOchSignalInstruction) l0m; 315 ModOchSignalInstruction modOchSignalInstruction = (ModOchSignalInstruction) l0m;
...@@ -337,11 +334,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder { ...@@ -337,11 +334,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
337 return null; 334 return null;
338 } 335 }
339 336
340 - private OFAction buildModLambdaInstruction(ModLambdaInstruction instruction) {
341 - return factory().actions().circuit(factory().oxms().expOchSigId(
342 - new CircuitSignalID((byte) 1, (byte) 2, instruction.lambda(), (short) 1)));
343 - }
344 -
345 private OFAction buildModOchSignalInstruction(ModOchSignalInstruction instruction) { 337 private OFAction buildModOchSignalInstruction(ModOchSignalInstruction instruction) {
346 OchSignal signal = instruction.lambda(); 338 OchSignal signal = instruction.lambda();
347 byte gridType = OpenFlowValueMapper.lookupGridType(signal.gridType()); 339 byte gridType = OpenFlowValueMapper.lookupGridType(signal.gridType());
......
...@@ -53,7 +53,6 @@ import org.projectfloodlight.openflow.protocol.action.OFAction; ...@@ -53,7 +53,6 @@ import org.projectfloodlight.openflow.protocol.action.OFAction;
53 import org.projectfloodlight.openflow.protocol.action.OFActionGroup; 53 import org.projectfloodlight.openflow.protocol.action.OFActionGroup;
54 import org.projectfloodlight.openflow.protocol.action.OFActionOutput; 54 import org.projectfloodlight.openflow.protocol.action.OFActionOutput;
55 import org.projectfloodlight.openflow.protocol.oxm.OFOxm; 55 import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
56 -import org.projectfloodlight.openflow.types.CircuitSignalID;
57 import org.projectfloodlight.openflow.types.EthType; 56 import org.projectfloodlight.openflow.types.EthType;
58 import org.projectfloodlight.openflow.types.IPv4Address; 57 import org.projectfloodlight.openflow.types.IPv4Address;
59 import org.projectfloodlight.openflow.types.IPv6Address; 58 import org.projectfloodlight.openflow.types.IPv6Address;
...@@ -278,11 +277,6 @@ public final class GroupModBuilder { ...@@ -278,11 +277,6 @@ public final class GroupModBuilder {
278 private OFAction buildL0Modification(Instruction i) { 277 private OFAction buildL0Modification(Instruction i) {
279 L0ModificationInstruction l0m = (L0ModificationInstruction) i; 278 L0ModificationInstruction l0m = (L0ModificationInstruction) i;
280 switch (l0m.subtype()) { 279 switch (l0m.subtype()) {
281 - case LAMBDA:
282 - L0ModificationInstruction.ModLambdaInstruction ml =
283 - (L0ModificationInstruction.ModLambdaInstruction) i;
284 - return factory.actions().circuit(factory.oxms().ochSigidBasic(
285 - new CircuitSignalID((byte) 1, (byte) 2, ml.lambda(), (short) 1)));
286 default: 280 default:
287 log.warn("Unimplemented action type {}.", l0m.subtype()); 281 log.warn("Unimplemented action type {}.", l0m.subtype());
288 break; 282 break;
......