[ONOS-7607] Update fabric.p4 bmv2 json w/ new p4c compiler
Change-Id: I0ba33a0773bd32b2108a0e7d163ad1e2c758078b
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index 00c4047..3dc2f41 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -103,9 +103,9 @@
PiActionId actionId;
if (pushVlanInst != null) {
// push_internal_vlan
- actionId = FabricConstants.ACT_FILTERING_PUSH_INTERNAL_VLAN_ID;
+ actionId = FabricConstants.ACT_FABRICINGRESS_FILTERING_PUSH_INTERNAL_VLAN_ID;
} else {
- actionId = FabricConstants.ACT_FILTERING_SET_VLAN_ID;
+ actionId = FabricConstants.ACT_FABRICINGRESS_FILTERING_SET_VLAN_ID;
}
// set_vlan
@@ -150,7 +150,7 @@
}
return PiAction.builder()
- .withId(FabricConstants.ACT_FORWARDING_DUPLICATE_TO_CONTROLLER_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER_ID)
.build();
}
@@ -225,13 +225,13 @@
ImmutableByteSequence.copyFrom(vlanId.toShort()));
// set_vlan_output
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_SET_VLAN_OUTPUT_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_SET_VLAN_OUTPUT_ID)
.withParameters(ImmutableList.of(portNumParam, vlanParam))
.build();
} else {
// output
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_OUTPUT_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_OUTPUT_ID)
.withParameter(portNumParam)
.build();
}
@@ -254,7 +254,7 @@
PiActionParam mplsParam = new PiActionParam(FabricConstants.ACT_PRM_LABEL_ID, mplsValue);
return PiAction.builder()
// FIXME: fins a way to determine v4 or v6
- .withId(FabricConstants.ACT_NEXT_MPLS_ROUTING_V4_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V4_ID)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam,
@@ -269,7 +269,7 @@
// L3 routing
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_L3_ROUTING_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_L3_ROUTING_ID)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam))