Refactor fabric.p4 and pipeliner
- Rename constants, some control blocks may share same action
- Remove unused match keys from ACL table
- Better style for constant file
- Ignore unsupported match from objective
Change-Id: I6472426d2a2607581c6fa7479ad40d7090a7d660
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index fdda55f..f0d27f35 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -64,7 +64,7 @@
PiActionParam param = new PiActionParam(FabricConstants.ACT_PRM_NEW_VLAN_ID_ID,
ImmutableByteSequence.copyFrom(VLAN_100.toShort()));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_PUSH_INTERNAL_VLAN_ID)
+ .withId(FabricConstants.ACT_FILTERING_PUSH_INTERNAL_VLAN_ID)
.withParameter(param)
.build();
@@ -84,7 +84,7 @@
PiActionParam param = new PiActionParam(FabricConstants.ACT_PRM_NEW_VLAN_ID_ID,
ImmutableByteSequence.copyFrom(VLAN_100.toShort()));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_SET_VLAN_ID)
+ .withId(FabricConstants.ACT_FILTERING_SET_VLAN_ID)
.withParameter(param)
.build();
@@ -119,7 +119,7 @@
PiAction mappedAction = interpreter.mapTreatment(treatment,
FabricConstants.TBL_ACL_ID);
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_DUPLICATE_TO_CONTROLLER_ID)
+ .withId(FabricConstants.ACT_FORWARDING_DUPLICATE_TO_CONTROLLER_ID)
.build();
assertEquals(expectedAction, mappedAction);
@@ -141,7 +141,7 @@
PiActionParam param = new PiActionParam(FabricConstants.ACT_PRM_PORT_NUM_ID,
ImmutableByteSequence.copyFrom(portNumVal));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_OUTPUT_ID)
+ .withId(FabricConstants.ACT_NEXT_OUTPUT_ID)
.withParameter(param)
.build();
@@ -168,7 +168,7 @@
PiActionParam portParam = new PiActionParam(FabricConstants.ACT_PRM_PORT_NUM_ID,
ImmutableByteSequence.copyFrom(portNumVal));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_L3_ROUTING_ID)
+ .withId(FabricConstants.ACT_NEXT_L3_ROUTING_ID)
.withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam))
.build();
@@ -194,7 +194,7 @@
ImmutableByteSequence.copyFrom(vlanVal));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_SET_VLAN_OUTPUT_ID)
+ .withId(FabricConstants.ACT_NEXT_SET_VLAN_OUTPUT_ID)
.withParameters(ImmutableList.of(vlanParam, portParam))
.build();
@@ -224,7 +224,7 @@
ImmutableByteSequence.fit(ImmutableByteSequence.copyFrom(MPLS_10.toInt()), 20);
PiActionParam mplsParam = new PiActionParam(FabricConstants.ACT_PRM_LABEL_ID, mplsVal);
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.ACT_MPLS_ROUTING_V4_ID)
+ .withId(FabricConstants.ACT_NEXT_MPLS_ROUTING_V4_ID)
.withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam, mplsParam))
.build();
assertEquals(expectedAction, mappedAction);
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
index f3de7b7..9ba1380 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
@@ -335,7 +335,7 @@
PiActionParam classParam = new PiActionParam(FabricConstants.ACT_PRM_FWD_TYPE_ID,
ImmutableByteSequence.copyFrom(fwdClass));
PiAction fwdClassifierAction = PiAction.builder()
- .withId(FabricConstants.ACT_SET_FORWARDING_TYPE_ID)
+ .withId(FabricConstants.ACT_FILTERING_SET_FORWARDING_TYPE_ID)
.withParameter(classParam)
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
index 1602c58..e65e30b 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
@@ -223,7 +223,7 @@
PiActionParam nextIdParam = new PiActionParam(FabricConstants.ACT_PRM_NEXT_ID_ID,
ImmutableByteSequence.copyFrom(NEXT_ID_1.byteValue()));
PiAction setNextIdAction = PiAction.builder()
- .withId(FabricConstants.ACT_POP_MPLS_AND_NEXT_ID)
+ .withId(FabricConstants.ACT_FORWARDING_POP_MPLS_AND_NEXT_ID)
.withParameter(nextIdParam)
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
@@ -237,7 +237,7 @@
PiActionParam nextIdParam = new PiActionParam(FabricConstants.ACT_PRM_NEXT_ID_ID,
ImmutableByteSequence.copyFrom(nextId.byteValue()));
PiAction setNextIdAction = PiAction.builder()
- .withId(FabricConstants.ACT_SET_NEXT_ID_ID)
+ .withId(FabricConstants.ACT_FORWARDING_SET_NEXT_ID_ID)
.withParameter(nextIdParam)
.build();
TrafficTreatment setNextIdTreatment = DefaultTrafficTreatment.builder()