commit c6844f56ce43a75f29fbe6bbd06c4ef804e98abe
author Yi Tseng <yi@opennetworking.org> Tue Dec 19 11:58:25 2017 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Dec 21 08:42:52 2017 +0000
tree 3f7062b2e7de597aab2cb0fc9bb199c6e06dd424
parent cbbdb8c44120573a7aa1c5a00b3c1af3e894f9b4

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

pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java

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);