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/main/resources/p4c-out/bmv2/fabric.p4info b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
index d3d1dbf..20c0dad 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
+++ b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
@@ -243,23 +243,23 @@
}
match_fields {
id: 5
+ name: "fabric_metadata.original_ether_type"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 6
name: "hdr.ethernet.dst_addr"
bitwidth: 48
match_type: TERNARY
}
match_fields {
- id: 6
+ id: 7
name: "hdr.ethernet.src_addr"
bitwidth: 48
match_type: TERNARY
}
match_fields {
- id: 7
- name: "fabric_metadata.original_ether_type"
- bitwidth: 16
- match_type: TERNARY
- }
- match_fields {
id: 8
name: "hdr.vlan_tag.vlan_id"
bitwidth: 12
@@ -267,48 +267,24 @@
}
match_fields {
id: 9
- name: "hdr.mpls.bos"
- bitwidth: 1
- match_type: TERNARY
- }
- match_fields {
- id: 10
- name: "hdr.mpls.label"
- bitwidth: 20
- match_type: TERNARY
- }
- match_fields {
- id: 11
name: "hdr.ipv4.src_addr"
bitwidth: 32
match_type: TERNARY
}
match_fields {
- id: 12
+ id: 10
name: "hdr.ipv4.dst_addr"
bitwidth: 32
match_type: TERNARY
}
match_fields {
- id: 13
- name: "hdr.ipv6.src_addr"
- bitwidth: 128
- match_type: TERNARY
- }
- match_fields {
- id: 14
- name: "hdr.ipv6.dst_addr"
- bitwidth: 128
- match_type: TERNARY
- }
- match_fields {
- id: 15
+ id: 11
name: "hdr.icmp.icmp_type"
bitwidth: 8
match_type: TERNARY
}
match_fields {
- id: 16
+ id: 12
name: "hdr.icmp.icmp_code"
bitwidth: 8
match_type: TERNARY