홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
Committed by Gerrit Code Review
da4abde4 1 parent f988bf5e

fixing vlan_push in 1.0 environments, ie. it does nothing 

Change-Id: Ia29c9ef3d93d40216c90a6c7e89c7fb2125ce55b
Inline Side-by-side
Showing 1 changed file with 11 additions and 2 deletions
......@@ -135,6 +135,7 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
private List<OFAction> buildActions() {
List<OFAction> acts = new LinkedList<>();
OFAction act;
if (treatment == null) {
return acts;
}
......@@ -144,10 +145,16 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
log.warn("Saw drop action; assigning drop action");
return Collections.emptyList();
case L2MODIFICATION:
acts.add(buildL2Modification(i));
act = buildL2Modification(i);
if (act != null) {
acts.add(buildL2Modification(i));
}
break;
case L3MODIFICATION:
acts.add(buildL3Modification(i));
act = buildL3Modification(i);
if (act != null) {
acts.add(buildL3Modification(i));
}
break;
case OUTPUT:
OutputInstruction out = (OutputInstruction) i;
......@@ -209,6 +216,8 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
return factory().actions().setVlanPcp(VlanPcp.of(vlanPcp.vlanPcp()));
case VLAN_POP:
return factory().actions().stripVlan();
case VLAN_PUSH:
return null;
default:
log.warn("Unimplemented action type {}.", l2m.subtype());
break;
......