홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
eda3387e 1 parent 8ab196c4

Use setInstructions to add apply-actions. 

We can't use both setInstructions and setActions, because the actions get
overwritten by the call to setInstructions.

Fixes ONOS-1113.

Change-Id: Id8bb1afd3da91966ce1345c6a1927f8fde5de3f4
Inline Side-by-side
Showing 1 changed file with 8 additions and 6 deletions
......@@ -102,8 +102,10 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
// write-actions. I would prefer to change this back in the future
// because apply-actions is an optional instruction in OF 1.3.
//OFInstruction writeActions =
//factory().instructions().writeActions(actions);
OFInstruction applyActions =
factory().instructions().applyActions(actions);
instructions.add(applyActions);
long cookie = flowRule().id().value();
......@@ -112,7 +114,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
.setXid(xid)
.setCookie(U64.of(cookie))
.setBufferId(OFBufferId.NO_BUFFER)
.setActions(actions)
.setInstructions(instructions)
.setMatch(match)
.setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
......@@ -127,8 +128,10 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
Match match = buildMatch();
List<OFAction> actions = buildActions();
List<OFInstruction> instructions = buildInstructions();
//OFInstruction writeActions =
//factory().instructions().writeActions(actions);
OFInstruction applyActions =
factory().instructions().applyActions(actions);
instructions.add(applyActions);
long cookie = flowRule().id().value();
......@@ -137,7 +140,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
.setXid(xid)
.setCookie(U64.of(cookie))
.setBufferId(OFBufferId.NO_BUFFER)
.setActions(actions)
.setInstructions(instructions)
.setMatch(match)
.setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
......