Add P4 info to java constant tool
Change-Id: I73a451404e8b657845bfc9b6a37abd824a10910e
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 5bb6a5d..4bb1d92 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -32,192 +32,160 @@
private FabricConstants() {
}
- public static final String DOT = ".";
- // Header IDs
- public static final String HDR = "hdr";
- public static final String STANDARD_METADATA = "standard_metadata";
- public static final String MPLS = "mpls";
- public static final String FABRIC_METADATA = "fabric_metadata";
- public static final String IPV4 = "ipv4";
- public static final String IPV6 = "ipv6";
- public static final String ETHERNET = "ethernet";
- public static final String VLAN_TAG = "vlan_tag";
- public static final String ICMP = "icmp";
-
// Header field IDs
- public static final PiMatchFieldId HF_FABRIC_METADATA_L4_SRC_PORT_ID =
- buildPiMatchField(FABRIC_METADATA, "l4_src_port", false);
- public static final PiMatchFieldId HF_IPV4_SRC_ADDR_ID =
- buildPiMatchField(IPV4, "src_addr", true);
- public static final PiMatchFieldId HF_VLAN_TAG_VLAN_ID_ID =
- buildPiMatchField(VLAN_TAG, "vlan_id", true);
- public static final PiMatchFieldId HF_MPLS_LABEL_ID =
- buildPiMatchField(MPLS, "label", true);
- public static final PiMatchFieldId HF_IPV6_DST_ADDR_ID =
- buildPiMatchField(IPV6, "dst_addr", true);
- public static final PiMatchFieldId HF_ETHERNET_SRC_ADDR_ID =
- buildPiMatchField(ETHERNET, "src_addr", true);
- public static final PiMatchFieldId HF_ICMP_ICMP_TYPE_ID =
- buildPiMatchField(ICMP, "icmp_type", true);
- public static final PiMatchFieldId HF_STANDARD_METADATA_EGRESS_PORT_ID =
- buildPiMatchField(STANDARD_METADATA, "egress_port", false);
- public static final PiMatchFieldId HF_FABRIC_METADATA_NEXT_ID_ID =
- buildPiMatchField(FABRIC_METADATA, "next_id", false);
- public static final PiMatchFieldId HF_FABRIC_METADATA_L4_DST_PORT_ID =
- buildPiMatchField(FABRIC_METADATA, "l4_dst_port", false);
- public static final PiMatchFieldId HF_STANDARD_METADATA_INGRESS_PORT_ID =
- buildPiMatchField(STANDARD_METADATA, "ingress_port", false);
- public static final PiMatchFieldId HF_FABRIC_METADATA_ORIGINAL_ETHER_TYPE_ID =
- buildPiMatchField(FABRIC_METADATA, "original_ether_type", false);
- public static final PiMatchFieldId HF_IPV4_DST_ADDR_ID =
- buildPiMatchField(IPV4, "dst_addr", true);
- public static final PiMatchFieldId HF_VLAN_TAG_IS_VALID_ID =
- buildPiMatchField(VLAN_TAG, "is_valid", true);
- public static final PiMatchFieldId HF_FABRIC_METADATA_IP_PROTO_ID =
- buildPiMatchField(FABRIC_METADATA, "ip_proto", false);
- public static final PiMatchFieldId HF_ETHERNET_DST_ADDR_ID =
- buildPiMatchField(ETHERNET, "dst_addr", true);
- public static final PiMatchFieldId HF_ICMP_ICMP_CODE_ID =
- buildPiMatchField(ICMP, "icmp_code", true);
-
- private static PiMatchFieldId buildPiMatchField(String header, String field, boolean withHdrPrefix) {
- if (withHdrPrefix) {
- return PiMatchFieldId.of(HDR + DOT + header + DOT + field);
- } else {
- return PiMatchFieldId.of(header + DOT + field);
- }
- }
-
+ public static final PiMatchFieldId FABRIC_METADATA_L4_SRC_PORT =
+ PiMatchFieldId.of("fabric_metadata.l4_src_port");
+ public static final PiMatchFieldId HDR_IPV4_SRC_ADDR =
+ PiMatchFieldId.of("hdr.ipv4.src_addr");
+ public static final PiMatchFieldId HDR_VLAN_TAG_VLAN_ID =
+ PiMatchFieldId.of("hdr.vlan_tag.vlan_id");
+ public static final PiMatchFieldId HDR_MPLS_LABEL =
+ PiMatchFieldId.of("hdr.mpls.label");
+ public static final PiMatchFieldId HDR_IPV6_DST_ADDR =
+ PiMatchFieldId.of("hdr.ipv6.dst_addr");
+ public static final PiMatchFieldId HDR_ETHERNET_SRC_ADDR =
+ PiMatchFieldId.of("hdr.ethernet.src_addr");
+ public static final PiMatchFieldId HDR_ICMP_ICMP_TYPE =
+ PiMatchFieldId.of("hdr.icmp.icmp_type");
+ public static final PiMatchFieldId STANDARD_METADATA_EGRESS_PORT =
+ PiMatchFieldId.of("standard_metadata.egress_port");
+ public static final PiMatchFieldId FABRIC_METADATA_NEXT_ID =
+ PiMatchFieldId.of("fabric_metadata.next_id");
+ public static final PiMatchFieldId FABRIC_METADATA_L4_DST_PORT =
+ PiMatchFieldId.of("fabric_metadata.l4_dst_port");
+ public static final PiMatchFieldId STANDARD_METADATA_INGRESS_PORT =
+ PiMatchFieldId.of("standard_metadata.ingress_port");
+ public static final PiMatchFieldId FABRIC_METADATA_ORIGINAL_ETHER_TYPE =
+ PiMatchFieldId.of("fabric_metadata.original_ether_type");
+ public static final PiMatchFieldId HDR_IPV4_DST_ADDR =
+ PiMatchFieldId.of("hdr.ipv4.dst_addr");
+ public static final PiMatchFieldId HDR_VLAN_TAG_IS_VALID =
+ PiMatchFieldId.of("hdr.vlan_tag.is_valid");
+ public static final PiMatchFieldId FABRIC_METADATA_IP_PROTO =
+ PiMatchFieldId.of("fabric_metadata.ip_proto");
+ public static final PiMatchFieldId HDR_ETHERNET_DST_ADDR =
+ PiMatchFieldId.of("hdr.ethernet.dst_addr");
+ public static final PiMatchFieldId HDR_ICMP_ICMP_CODE =
+ PiMatchFieldId.of("hdr.icmp.icmp_code");
// Table IDs
- public static final PiTableId TBL_ACL_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
PiTableId.of("FabricIngress.forwarding.acl");
- public static final PiTableId TBL_HASHED_ID =
+ public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
PiTableId.of("FabricIngress.next.hashed");
- public static final PiTableId TBL_EGRESS_VLAN_ID =
+ public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
PiTableId.of("FabricEgress.egress_next.egress_vlan");
- public static final PiTableId TBL_MPLS_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
PiTableId.of("FabricIngress.forwarding.mpls");
- public static final PiTableId TBL_MULTICAST_ID =
+ public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
PiTableId.of("FabricIngress.next.multicast");
- public static final PiTableId TBL_MULTICAST_V4_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V4 =
PiTableId.of("FabricIngress.forwarding.multicast_v4");
- public static final PiTableId TBL_MULTICAST_V6_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V6 =
PiTableId.of("FabricIngress.forwarding.multicast_v6");
- public static final PiTableId TBL_UNICAST_V4_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V4 =
PiTableId.of("FabricIngress.forwarding.unicast_v4");
- public static final PiTableId TBL_FWD_CLASSIFIER_ID =
+ public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
PiTableId.of("FabricIngress.filtering.fwd_classifier");
- public static final PiTableId TBL_BRIDGING_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
PiTableId.of("FabricIngress.forwarding.bridging");
- public static final PiTableId TBL_SIMPLE_ID =
+ public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
PiTableId.of("FabricIngress.next.simple");
- public static final PiTableId TBL_INGRESS_PORT_VLAN_ID =
+ public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
- public static final PiTableId TBL_UNICAST_V6_ID =
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V6 =
PiTableId.of("FabricIngress.forwarding.unicast_v6");
- public static final PiTableId TBL_VLAN_META_ID =
+ public static final PiTableId FABRIC_INGRESS_NEXT_VLAN_META =
PiTableId.of("FabricIngress.next.vlan_meta");
-
// Indirect Counter IDs
- public static final PiCounterId CNT_EGRESS_PORT_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
- public static final PiCounterId CNT_INGRESS_PORT_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_INGRESS_PORT_COUNTER =
PiCounterId.of("FabricIngress.port_counters_control.ingress_port_counter");
-
// Direct Counter IDs
- public static final PiCounterId CNT_ACL_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_ACL_COUNTER =
PiCounterId.of("FabricIngress.forwarding.acl_counter");
- public static final PiCounterId CNT_MULTICAST_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_NEXT_MULTICAST_COUNTER =
PiCounterId.of("FabricIngress.next.multicast_counter");
- public static final PiCounterId CNT_VLAN_META_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
PiCounterId.of("FabricIngress.next.vlan_meta_counter");
- public static final PiCounterId CNT_FWD_CLASSIFIER_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER_COUNTER =
PiCounterId.of("FabricIngress.filtering.fwd_classifier_counter");
- public static final PiCounterId CNT_BRIDGING_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_BRIDGING_COUNTER =
PiCounterId.of("FabricIngress.forwarding.bridging_counter");
- public static final PiCounterId CNT_MULTICAST_V6_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V6_COUNTER =
PiCounterId.of("FabricIngress.forwarding.multicast_v6_counter");
- public static final PiCounterId CNT_MULTICAST_V4_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V4_COUNTER =
PiCounterId.of("FabricIngress.forwarding.multicast_v4_counter");
- public static final PiCounterId CNT_UNICAST_V6_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V6_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v6_counter");
- public static final PiCounterId CNT_UNICAST_V4_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V4_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v4_counter");
- public static final PiCounterId CNT_SIMPLE_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
PiCounterId.of("FabricIngress.next.simple_counter");
- public static final PiCounterId CNT_INGRESS_PORT_VLAN_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
- public static final PiCounterId CNT_MPLS_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_FORWARDING_MPLS_COUNTER =
PiCounterId.of("FabricIngress.forwarding.mpls_counter");
- public static final PiCounterId CNT_HASHED_COUNTER_ID =
+ public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
PiCounterId.of("FabricIngress.next.hashed_counter");
-
// Action IDs
- public static final PiActionId ACT_FABRICINGRESS_FILTERING_DROP_ID =
+ public static final PiActionId FABRIC_INGRESS_FILTERING_DROP =
PiActionId.of("FabricIngress.filtering.drop");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_SET_VLAN_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
PiActionId.of("FabricIngress.next.set_vlan");
- public static final PiActionId ACT_FABRICINGRESS_FORWARDING_POP_MPLS_AND_NEXT_ID =
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
- public static final PiActionId ACT_FABRICEGRESS_EGRESS_NEXT_POP_VLAN_ID =
+ public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
PiActionId.of("FabricEgress.egress_next.pop_vlan");
- public static final PiActionId ACT_FABRICINGRESS_FILTERING_SET_FORWARDING_TYPE_ID =
+ public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
PiActionId.of("FabricIngress.filtering.set_forwarding_type");
- public static final PiActionId ACT_NOP_ID = PiActionId.of("nop");
- public static final PiActionId ACT_FABRICINGRESS_FILTERING_SET_VLAN_ID =
+ public static final PiActionId NOP = PiActionId.of("nop");
+ public static final PiActionId FABRIC_INGRESS_FILTERING_SET_VLAN =
PiActionId.of("FabricIngress.filtering.set_vlan");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V6_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6 =
PiActionId.of("FabricIngress.next.mpls_routing_v6");
- public static final PiActionId ACT_FABRICEGRESS_PKT_IO_EGRESS_POP_VLAN_ID =
+ public static final PiActionId FABRIC_EGRESS_PKT_IO_EGRESS_POP_VLAN =
PiActionId.of("FabricEgress.pkt_io_egress.pop_vlan");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_L3_ROUTING_VLAN_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
PiActionId.of("FabricIngress.next.l3_routing_vlan");
- public static final PiActionId ACT_NOACTION_ID = PiActionId.of("NoAction");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_SET_MCAST_GROUP_ID =
+ public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
+ public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP =
PiActionId.of("FabricIngress.next.set_mcast_group");
- public static final PiActionId ACT_FABRICINGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER_ID =
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER =
PiActionId.of("FabricIngress.forwarding.duplicate_to_controller");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_L3_ROUTING_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING =
PiActionId.of("FabricIngress.next.l3_routing");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V4_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4 =
PiActionId.of("FabricIngress.next.mpls_routing_v4");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_SET_VLAN_OUTPUT_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT =
PiActionId.of("FabricIngress.next.set_vlan_output");
- public static final PiActionId ACT_FABRICINGRESS_FORWARDING_SET_NEXT_ID_ID =
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID =
PiActionId.of("FabricIngress.forwarding.set_next_id");
- public static final PiActionId ACT_FABRICINGRESS_FILTERING_PUSH_INTERNAL_VLAN_ID =
+ public static final PiActionId FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN =
PiActionId.of("FabricIngress.filtering.push_internal_vlan");
- public static final PiActionId ACT_FABRICINGRESS_FORWARDING_DROP_ID =
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_DROP =
PiActionId.of("FabricIngress.forwarding.drop");
- public static final PiActionId ACT_FABRICINGRESS_NEXT_OUTPUT_ID =
+ public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT =
PiActionId.of("FabricIngress.next.output");
-
// Action Param IDs
- public static final PiActionParamId ACT_PRM_DMAC_ID =
- PiActionParamId.of("dmac");
- public static final PiActionParamId ACT_PRM_PORT_NUM_ID =
+ public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
+ public static final PiActionParamId PORT_NUM =
PiActionParamId.of("port_num");
- public static final PiActionParamId ACT_PRM_LABEL_ID =
- PiActionParamId.of("label");
- public static final PiActionParamId ACT_PRM_SMAC_ID =
- PiActionParamId.of("smac");
- public static final PiActionParamId ACT_PRM_GID_ID =
- PiActionParamId.of("gid");
- public static final PiActionParamId ACT_PRM_NEW_VLAN_ID_ID =
+ public static final PiActionParamId LABEL = PiActionParamId.of("label");
+ public static final PiActionParamId SMAC = PiActionParamId.of("smac");
+ public static final PiActionParamId GID = PiActionParamId.of("gid");
+ public static final PiActionParamId NEW_VLAN_ID =
PiActionParamId.of("new_vlan_id");
- public static final PiActionParamId ACT_PRM_FWD_TYPE_ID =
+ public static final PiActionParamId FWD_TYPE =
PiActionParamId.of("fwd_type");
- public static final PiActionParamId ACT_PRM_NEXT_ID_ID =
- PiActionParamId.of("next_id");
-
+ public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
// Action Profile IDs
- public static final PiActionProfileId ACT_PRF_FABRICINGRESS_NEXT_ECMP_SELECTOR_ID =
+ public static final PiActionProfileId FABRIC_INGRESS_NEXT_ECMP_SELECTOR =
PiActionProfileId.of("FabricIngress.next.ecmp_selector");
-
// Packet Metadata IDs
- public static final PiControlMetadataId CTRL_META_INGRESS_PORT_ID =
+ public static final PiControlMetadataId INGRESS_PORT =
PiControlMetadataId.of("ingress_port");
- public static final PiControlMetadataId CTRL_META_EGRESS_PORT_ID =
+ public static final PiControlMetadataId EGRESS_PORT =
PiControlMetadataId.of("egress_port");
public static final int PORT_BITWIDTH = 9;
-}
+}
\ No newline at end of file