| commit | fbe25c5f7235cd13570e0da1fe3ed92e8cf93f67 | [log] [tgz] |
|---|---|---|
| author | Saurav Das <saurav.das@opennetworking.org> | Wed Mar 04 11:12:00 2015 -0800 |
| committer | Saurav Das <saurav.das@opennetworking.org> | Wed Mar 04 11:12:00 2015 -0800 |
| tree | ba7baa53c6abed5f39596cfb11b50ad4e59c07f4 | |
| parent | a88efa496c11d550262a2be0e41dd63cda0aabae [diff] |
Getting router interface config into the corsa dataplane pipeline Change-Id: I67d5bf7a20190b07a7bf55c7b60f771877ca8dbb
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java index f0e4f84..16960a4 100644 --- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java +++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
@@ -265,10 +265,12 @@ OFActionGroup group = (OFActionGroup) act; builder.group(new DefaultGroupId(group.getGroup().getGroupNumber())); break; + case POP_VLAN: + builder.popVlan(); + break; case SET_TP_DST: case SET_TP_SRC: case POP_PBB: - case POP_VLAN: case PUSH_PBB: case PUSH_VLAN: case SET_MPLS_LABEL:
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java index 4c2dc93..1a423a9 100644 --- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java +++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -327,6 +327,8 @@ break; case DEC_MPLS_TTL: return factory().actions().decMplsTtl(); + case VLAN_POP: + return factory().actions().popVlan(); default: log.warn("Unimplemented action type {}.", l2m.subtype()); break;