[SDFAB-102] Backport changes required for policies to fabric.p4
Change-Id: I1c9a66c548b5d5e1d3a92ff29208263fb6844c0c
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 3c76283..f2edc55 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -14,6 +14,11 @@
["tmp_7", 64, false],
["tmp_8", 32, false],
["tmp_9", 32, false],
+ ["acl_ipv4_src", 32, false],
+ ["acl_ipv4_dst", 32, false],
+ ["acl_ip_proto", 8, false],
+ ["acl_l4_sport", 16, false],
+ ["acl_l4_dport", 16, false],
["userMetadata.ip_eth_type", 16, false],
["userMetadata.vlan_id", 12, false],
["userMetadata.vlan_pri", 3, false],
@@ -136,11 +141,21 @@
]
},
{
- "name" : "tcp_t",
+ "name" : "udp_t",
"id" : 9,
"fields" : [
["sport", 16, false],
["dport", 16, false],
+ ["len", 16, false],
+ ["checksum", 16, false]
+ ]
+ },
+ {
+ "name" : "tcp_t",
+ "id" : 10,
+ "fields" : [
+ ["sport", 16, false],
+ ["dport", 16, false],
["seq_no", 32, false],
["ack_no", 32, false],
["data_offset", 4, false],
@@ -153,16 +168,6 @@
]
},
{
- "name" : "udp_t",
- "id" : 10,
- "fields" : [
- ["sport", 16, false],
- ["dport", 16, false],
- ["len", 16, false],
- ["checksum", 16, false]
- ]
- },
- {
"name" : "icmp_t",
"id" : 11,
"fields" : [
@@ -248,43 +253,78 @@
"pi_omit" : true
},
{
- "name" : "ipv4",
+ "name" : "gtpu",
"id" : 9,
+ "header_type" : "gtpu_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "inner_ipv4",
+ "id" : 10,
"header_type" : "ipv4_t",
"metadata" : false,
"pi_omit" : true
},
{
- "name" : "tcp",
- "id" : 10,
- "header_type" : "tcp_t",
- "metadata" : false,
- "pi_omit" : true
- },
- {
- "name" : "udp",
+ "name" : "inner_udp",
"id" : 11,
"header_type" : "udp_t",
"metadata" : false,
"pi_omit" : true
},
{
- "name" : "icmp",
+ "name" : "inner_tcp",
"id" : 12,
+ "header_type" : "tcp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "inner_icmp",
+ "id" : 13,
+ "header_type" : "icmp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "ipv4",
+ "id" : 14,
+ "header_type" : "ipv4_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "tcp",
+ "id" : 15,
+ "header_type" : "tcp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "udp",
+ "id" : 16,
+ "header_type" : "udp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "icmp",
+ "id" : 17,
"header_type" : "icmp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_out",
- "id" : 13,
+ "id" : 18,
"header_type" : "packet_out_header_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_in",
- "id" : 14,
+ "id" : 19,
"header_type" : "packet_in_header_t",
"metadata" : false,
"pi_omit" : true
@@ -300,7 +340,7 @@
"name" : "fl",
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 46,
+ "line" : 52,
"column" : 40,
"source_fragment" : "{standard_metadata.ingress_port}"
},
@@ -1582,6 +1622,12 @@
],
"transitions" : [
{
+ "type" : "hexstr",
+ "value" : "0x086801ff",
+ "mask" : null,
+ "next_state" : "parse_gtpu"
+ },
+ {
"type" : "default",
"value" : null,
"mask" : null,
@@ -1626,6 +1672,86 @@
}
],
"transition_key" : []
+ },
+ {
+ "name" : "parse_gtpu",
+ "id" : 13,
+ "parser_ops" : [
+ {
+ "parameters" : [
+ {
+ "type" : "regular",
+ "value" : "gtpu"
+ }
+ ],
+ "op" : "extract"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "regular",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "op" : "extract"
+ }
+ ],
+ "transitions" : [
+ {
+ "type" : "hexstr",
+ "value" : "0x06",
+ "mask" : null,
+ "next_state" : "parse_tcp"
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x11",
+ "mask" : null,
+ "next_state" : "parse_inner_udp"
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01",
+ "mask" : null,
+ "next_state" : "parse_icmp"
+ },
+ {
+ "type" : "default",
+ "value" : null,
+ "mask" : null,
+ "next_state" : null
+ }
+ ],
+ "transition_key" : [
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ]
+ },
+ {
+ "name" : "parse_inner_udp",
+ "id" : 14,
+ "parser_ops" : [
+ {
+ "parameters" : [
+ {
+ "type" : "regular",
+ "value" : "inner_udp"
+ }
+ ],
+ "op" : "extract"
+ }
+ ],
+ "transitions" : [
+ {
+ "type" : "default",
+ "value" : null,
+ "mask" : null,
+ "next_state" : null
+ }
+ ],
+ "transition_key" : []
}
]
}
@@ -1641,7 +1767,7 @@
"column" : 8,
"source_fragment" : "FabricDeparser"
},
- "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp"],
+ "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp"],
"primitives" : []
}
],
@@ -1702,7 +1828,7 @@
"binding" : "FabricIngress.acl.acl",
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 30,
+ "line" : 36,
"column" : 50,
"source_fragment" : "acl_counter"
}
@@ -2236,7 +2362,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 33,
+ "line" : 39,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -2262,7 +2388,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 39,
+ "line" : 45,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = 255"
}
@@ -2291,7 +2417,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 40,
+ "line" : 46,
"column" : 8,
"source_fragment" : "fabric_metadata.skip_next = true"
}
@@ -2322,7 +2448,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 46,
+ "line" : 52,
"column" : 8,
"source_fragment" : "clone3(CloneType.I2E, clone_id, {standard_metadata.ingress_port})"
}
@@ -2344,7 +2470,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 51,
+ "line" : 57,
"column" : 8,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -2373,7 +2499,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 52,
+ "line" : 58,
"column" : 8,
"source_fragment" : "fabric_metadata.skip_next = true"
}
@@ -2918,7 +3044,7 @@
]
},
{
- "name" : "port_counter31",
+ "name" : "acl101",
"id" : 30,
"runtime_data" : [],
"primitives" : [
@@ -2927,6 +3053,416 @@
"parameters" : [
{
"type" : "field",
+ "value" : ["scalars", "acl_l4_sport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_tcp", "sport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 101,
+ "column" : 16,
+ "source_fragment" : "l4_sport = hdr.inner_tcp.sport"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_dport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_tcp", "dport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 102,
+ "column" : 16,
+ "source_fragment" : "l4_dport = hdr.inner_tcp.dport"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl104",
+ "id" : 31,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_sport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_udp", "sport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 104,
+ "column" : 16,
+ "source_fragment" : "l4_sport = hdr.inner_udp.sport"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_dport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_udp", "dport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 105,
+ "column" : 16,
+ "source_fragment" : "l4_dport = hdr.inner_udp.dport"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl97",
+ "id" : 32,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_src"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 97,
+ "column" : 12,
+ "source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_dst"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 98,
+ "column" : 12,
+ "source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ip_proto"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 99,
+ "column" : 12,
+ "source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl112",
+ "id" : 33,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_sport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["tcp", "sport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 112,
+ "column" : 16,
+ "source_fragment" : "l4_sport = hdr.tcp.sport"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_dport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["tcp", "dport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 113,
+ "column" : 16,
+ "source_fragment" : "l4_dport = hdr.tcp.dport"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl115",
+ "id" : 34,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_sport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["udp", "sport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 115,
+ "column" : 16,
+ "source_fragment" : "l4_sport = hdr.udp.sport"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_dport"]
+ },
+ {
+ "type" : "field",
+ "value" : ["udp", "dport"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 116,
+ "column" : 16,
+ "source_fragment" : "l4_dport = hdr.udp.dport"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl108",
+ "id" : 35,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_src"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 108,
+ "column" : 12,
+ "source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_dst"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 109,
+ "column" : 12,
+ "source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ip_proto"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 110,
+ "column" : 12,
+ "source_fragment" : "ip_proto = hdr.ipv4.protocol"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "acl27",
+ "id" : 36,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_src"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00000000"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 27,
+ "column" : 4,
+ "source_fragment" : "ipv4_addr_t ipv4_src = 0;"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ipv4_dst"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00000000"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 28,
+ "column" : 4,
+ "source_fragment" : "ipv4_addr_t ipv4_dst = 0;"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_ip_proto"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 29,
+ "column" : 4,
+ "source_fragment" : "bit<8> ip_proto = 0;"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_sport"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0000"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 30,
+ "column" : 4,
+ "source_fragment" : "l4_port_t l4_sport = 0;"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "acl_l4_dport"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0000"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 31,
+ "column" : 4,
+ "source_fragment" : "l4_port_t l4_dport = 0;"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "port_counter31",
+ "id" : 37,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "tmp_8"]
},
{
@@ -2977,7 +3513,7 @@
},
{
"name" : "port_counter34",
- "id" : 31,
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -3035,7 +3571,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 32,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -3076,7 +3612,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 33,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -3193,7 +3729,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 34,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -3291,7 +3827,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 35,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -3313,7 +3849,7 @@
},
{
"name" : "FabricEgress.egress_next.drop",
- "id" : 36,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -3335,7 +3871,7 @@
},
{
"name" : "packetio41",
- "id" : 37,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3352,7 +3888,7 @@
},
{
"name" : "packetio44",
- "id" : 38,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3403,7 +3939,7 @@
},
{
"name" : "next349",
- "id" : 39,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -3425,7 +3961,7 @@
},
{
"name" : "next376",
- "id" : 40,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -3447,7 +3983,7 @@
},
{
"name" : "next375",
- "id" : 41,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -3496,7 +4032,7 @@
},
{
"name" : "next380",
- "id" : 42,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3518,7 +4054,7 @@
},
{
"name" : "next379",
- "id" : 43,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -3800,10 +4336,10 @@
"direct_meters" : null,
"action_ids" : [11, 0],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
- "base_default_next" : "FabricIngress.acl.acl",
+ "base_default_next" : "tbl_acl27",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
- "nop" : "FabricIngress.acl.acl"
+ "FabricIngress.forwarding.set_next_id_bridging" : "tbl_acl27",
+ "nop" : "tbl_acl27"
},
"default_entry" : {
"action_id" : 0,
@@ -3837,10 +4373,10 @@
"direct_meters" : null,
"action_ids" : [12, 1],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
- "base_default_next" : "FabricIngress.acl.acl",
+ "base_default_next" : "tbl_acl27",
"next_tables" : {
- "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
- "nop" : "FabricIngress.acl.acl"
+ "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_acl27",
+ "nop" : "tbl_acl27"
},
"default_entry" : {
"action_id" : 1,
@@ -3874,11 +4410,11 @@
"direct_meters" : null,
"action_ids" : [13, 14, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
- "base_default_next" : "FabricIngress.acl.acl",
+ "base_default_next" : "tbl_acl27",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
- "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
- "nop" : "FabricIngress.acl.acl"
+ "FabricIngress.forwarding.set_next_id_routing_v4" : "tbl_acl27",
+ "FabricIngress.forwarding.nop_routing_v4" : "tbl_acl27",
+ "nop" : "tbl_acl27"
},
"default_entry" : {
"action_id" : 2,
@@ -3888,11 +4424,214 @@
}
},
{
- "name" : "FabricIngress.acl.acl",
+ "name" : "tbl_acl27",
"id" : 8,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 60,
+ "line" : 27,
+ "column" : 4,
+ "source_fragment" : "ipv4_addr_t ipv4_src = 0; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [36],
+ "actions" : ["acl27"],
+ "base_default_next" : "node_18",
+ "next_tables" : {
+ "acl27" : "node_18"
+ },
+ "default_entry" : {
+ "action_id" : 36,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl97",
+ "id" : 9,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 97,
+ "column" : 21,
+ "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [32],
+ "actions" : ["acl97"],
+ "base_default_next" : "node_20",
+ "next_tables" : {
+ "acl97" : "node_20"
+ },
+ "default_entry" : {
+ "action_id" : 32,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl101",
+ "id" : 10,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 101,
+ "column" : 25,
+ "source_fragment" : "= hdr.inner_tcp.sport; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [30],
+ "actions" : ["acl101"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl101" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 30,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl104",
+ "id" : 11,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 104,
+ "column" : 25,
+ "source_fragment" : "= hdr.inner_udp.sport; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [31],
+ "actions" : ["acl104"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl104" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 31,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl108",
+ "id" : 12,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 108,
+ "column" : 21,
+ "source_fragment" : "= hdr.ipv4.src_addr; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [35],
+ "actions" : ["acl108"],
+ "base_default_next" : "node_26",
+ "next_tables" : {
+ "acl108" : "node_26"
+ },
+ "default_entry" : {
+ "action_id" : 35,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl112",
+ "id" : 13,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 112,
+ "column" : 25,
+ "source_fragment" : "= hdr.tcp.sport; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [33],
+ "actions" : ["acl112"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl112" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 33,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl115",
+ "id" : 14,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 115,
+ "column" : 25,
+ "source_fragment" : "= hdr.udp.sport; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [34],
+ "actions" : ["acl115"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl115" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 34,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.acl.acl",
+ "id" : 15,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 66,
"column" : 10,
"source_fragment" : "acl"
},
@@ -3905,24 +4644,6 @@
},
{
"match_type" : "ternary",
- "name" : "ip_proto",
- "target" : ["scalars", "userMetadata.ip_proto"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
- "name" : "l4_sport",
- "target" : ["scalars", "userMetadata.l4_sport"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
- "name" : "l4_dport",
- "target" : ["scalars", "userMetadata.l4_dport"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
"name" : "eth_dst",
"target" : ["ethernet", "dst_addr"],
"mask" : null
@@ -3948,13 +4669,19 @@
{
"match_type" : "ternary",
"name" : "ipv4_src",
- "target" : ["ipv4", "src_addr"],
+ "target" : ["scalars", "acl_ipv4_src"],
"mask" : null
},
{
"match_type" : "ternary",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "acl_ipv4_dst"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ip_proto",
+ "target" : ["scalars", "acl_ip_proto"],
"mask" : null
},
{
@@ -3968,6 +4695,18 @@
"name" : "icmp_code",
"target" : ["icmp", "icmp_code"],
"mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_sport",
+ "target" : ["scalars", "acl_l4_sport"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_dport",
+ "target" : ["scalars", "acl_l4_dport"],
+ "mask" : null
}
],
"match_type" : "ternary",
@@ -3978,13 +4717,13 @@
"direct_meters" : null,
"action_ids" : [15, 16, 17, 18, 19],
"actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
- "base_default_next" : "node_18",
+ "base_default_next" : "node_31",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_18",
- "FabricIngress.acl.punt_to_cpu" : "node_18",
- "FabricIngress.acl.set_clone_session_id" : "node_18",
- "FabricIngress.acl.drop" : "node_18",
- "FabricIngress.acl.nop_acl" : "node_18"
+ "FabricIngress.acl.set_next_id_acl" : "node_31",
+ "FabricIngress.acl.punt_to_cpu" : "node_31",
+ "FabricIngress.acl.set_clone_session_id" : "node_31",
+ "FabricIngress.acl.drop" : "node_31",
+ "FabricIngress.acl.nop_acl" : "node_31"
},
"default_entry" : {
"action_id" : 19,
@@ -3995,7 +4734,7 @@
},
{
"name" : "FabricIngress.next.xconnect",
- "id" : 9,
+ "id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 119,
@@ -4039,7 +4778,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 10,
+ "id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 202,
@@ -4073,7 +4812,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 11,
+ "id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 236,
@@ -4110,7 +4849,7 @@
},
{
"name" : "FabricIngress.next.next_vlan",
- "id" : 12,
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 86,
@@ -4133,10 +4872,10 @@
"direct_meters" : null,
"action_ids" : [20, 3],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
- "base_default_next" : "node_23",
+ "base_default_next" : "node_36",
"next_tables" : {
- "FabricIngress.next.set_vlan" : "node_23",
- "nop" : "node_23"
+ "FabricIngress.next.set_vlan" : "node_36",
+ "nop" : "node_36"
},
"default_entry" : {
"action_id" : 3,
@@ -4147,7 +4886,7 @@
},
{
"name" : "tbl_port_counter31",
- "id" : 13,
+ "id" : 20,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -4161,14 +4900,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30],
+ "action_ids" : [37],
"actions" : ["port_counter31"],
- "base_default_next" : "node_25",
+ "base_default_next" : "node_38",
"next_tables" : {
- "port_counter31" : "node_25"
+ "port_counter31" : "node_38"
},
"default_entry" : {
- "action_id" : 30,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4176,7 +4915,7 @@
},
{
"name" : "tbl_port_counter34",
- "id" : 14,
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -4190,14 +4929,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31],
+ "action_ids" : [38],
"actions" : ["port_counter34"],
"base_default_next" : null,
"next_tables" : {
"port_counter34" : null
},
"default_entry" : {
- "action_id" : 31,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4347,7 +5086,7 @@
}
},
"true_next" : "node_11",
- "false_next" : "FabricIngress.acl.acl"
+ "false_next" : "tbl_acl27"
},
{
"name" : "node_11",
@@ -4425,12 +5164,167 @@
}
},
"true_next" : "FabricIngress.forwarding.routing_v4",
- "false_next" : "FabricIngress.acl.acl"
+ "false_next" : "tbl_acl27"
},
{
"name" : "node_18",
"id" : 7,
"source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 96,
+ "column" : 12,
+ "source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "and",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["gtpu", "$valid$"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["inner_ipv4", "$valid$"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "tbl_acl97",
+ "false_next" : "node_24"
+ },
+ {
+ "name" : "node_20",
+ "id" : 8,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 100,
+ "column" : 16,
+ "source_fragment" : "hdr.inner_tcp.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["inner_tcp", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_acl101",
+ "false_next" : "node_22"
+ },
+ {
+ "name" : "node_22",
+ "id" : 9,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 103,
+ "column" : 23,
+ "source_fragment" : "hdr.inner_udp.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["inner_udp", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_acl104",
+ "false_next" : "FabricIngress.acl.acl"
+ },
+ {
+ "name" : "node_24",
+ "id" : 10,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 107,
+ "column" : 19,
+ "source_fragment" : "hdr.ipv4.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["ipv4", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_acl108",
+ "false_next" : "FabricIngress.acl.acl"
+ },
+ {
+ "name" : "node_26",
+ "id" : 11,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 111,
+ "column" : 16,
+ "source_fragment" : "hdr.tcp.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["tcp", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_acl112",
+ "false_next" : "node_28"
+ },
+ {
+ "name" : "node_28",
+ "id" : 12,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 114,
+ "column" : 23,
+ "source_fragment" : "hdr.udp.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["udp", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_acl115",
+ "false_next" : "FabricIngress.acl.acl"
+ },
+ {
+ "name" : "node_31",
+ "id" : 13,
+ "source_info" : {
"filename" : "fabric.p4",
"line" : 73,
"column" : 12,
@@ -4458,8 +5352,8 @@
"true_next" : "FabricIngress.next.xconnect"
},
{
- "name" : "node_23",
- "id" : 8,
+ "name" : "node_36",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -4481,11 +5375,11 @@
}
},
"true_next" : "tbl_port_counter31",
- "false_next" : "node_25"
+ "false_next" : "node_38"
},
{
- "name" : "node_25",
- "id" : 9,
+ "name" : "node_38",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -4520,11 +5414,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_29",
+ "init_table" : "node_42",
"tables" : [
{
"name" : "tbl_packetio41",
- "id" : 15,
+ "id" : 22,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -4538,14 +5432,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [44],
"actions" : ["packetio41"],
- "base_default_next" : "node_31",
+ "base_default_next" : "node_44",
"next_tables" : {
- "packetio41" : "node_31"
+ "packetio41" : "node_44"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4553,7 +5447,7 @@
},
{
"name" : "tbl_packetio44",
- "id" : 16,
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -4567,14 +5461,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
+ "action_ids" : [45],
"actions" : ["packetio44"],
- "base_default_next" : "node_33",
+ "base_default_next" : "node_46",
"next_tables" : {
- "packetio44" : "node_33"
+ "packetio44" : "node_46"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4582,7 +5476,7 @@
},
{
"name" : "tbl_next349",
- "id" : 17,
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 349,
@@ -4596,14 +5490,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [46],
"actions" : ["next349"],
- "base_default_next" : "node_35",
+ "base_default_next" : "node_48",
"next_tables" : {
- "next349" : "node_35"
+ "next349" : "node_48"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4611,7 +5505,7 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 18,
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 353,
@@ -4625,14 +5519,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32],
+ "action_ids" : [39],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 32,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4640,7 +5534,7 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 19,
+ "id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 355,
@@ -4654,14 +5548,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
+ "action_ids" : [40],
"actions" : ["FabricEgress.egress_next.set_mpls"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 33,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4669,7 +5563,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 20,
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 331,
@@ -4696,16 +5590,16 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34, 35, 36],
+ "action_ids" : [41, 42, 43],
"actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
- "base_default_next" : "node_40",
+ "base_default_next" : "node_53",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_40",
- "FabricEgress.egress_next.pop_vlan" : "node_40",
- "FabricEgress.egress_next.drop" : "node_40"
+ "FabricEgress.egress_next.push_vlan" : "node_53",
+ "FabricEgress.egress_next.pop_vlan" : "node_53",
+ "FabricEgress.egress_next.drop" : "node_53"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4713,7 +5607,7 @@
},
{
"name" : "tbl_next375",
- "id" : 21,
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 375,
@@ -4727,14 +5621,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [48],
"actions" : ["next375"],
- "base_default_next" : "node_42",
+ "base_default_next" : "node_55",
"next_tables" : {
- "next375" : "node_42"
+ "next375" : "node_55"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4742,7 +5636,7 @@
},
{
"name" : "tbl_next376",
- "id" : 22,
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 376,
@@ -4756,14 +5650,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [47],
"actions" : ["next376"],
"base_default_next" : null,
"next_tables" : {
"next376" : null
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4771,7 +5665,7 @@
},
{
"name" : "tbl_next379",
- "id" : 23,
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 379,
@@ -4785,14 +5679,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [50],
"actions" : ["next379"],
- "base_default_next" : "node_46",
+ "base_default_next" : "node_59",
"next_tables" : {
- "next379" : "node_46"
+ "next379" : "node_59"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4800,7 +5694,7 @@
},
{
"name" : "tbl_next380",
- "id" : 24,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 380,
@@ -4814,14 +5708,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [49],
"actions" : ["next380"],
"base_default_next" : null,
"next_tables" : {
"next380" : null
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4831,8 +5725,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_29",
- "id" : 10,
+ "name" : "node_42",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 39,
@@ -4851,11 +5745,11 @@
}
},
"true_next" : "tbl_packetio41",
- "false_next" : "node_31"
+ "false_next" : "node_44"
},
{
- "name" : "node_31",
- "id" : 11,
+ "name" : "node_44",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -4877,11 +5771,11 @@
}
},
"true_next" : "tbl_packetio44",
- "false_next" : "node_33"
+ "false_next" : "node_46"
},
{
- "name" : "node_33",
- "id" : 12,
+ "name" : "node_46",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 347,
@@ -4920,11 +5814,11 @@
}
},
"true_next" : "tbl_next349",
- "false_next" : "node_35"
+ "false_next" : "node_48"
},
{
- "name" : "node_35",
- "id" : 13,
+ "name" : "node_48",
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 352,
@@ -4945,12 +5839,12 @@
}
}
},
- "true_next" : "node_36",
+ "true_next" : "node_49",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_36",
- "id" : 14,
+ "name" : "node_49",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 353,
@@ -4972,8 +5866,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_40",
- "id" : 15,
+ "name" : "node_53",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -4992,11 +5886,11 @@
}
},
"true_next" : "tbl_next375",
- "false_next" : "node_44"
+ "false_next" : "node_57"
},
{
- "name" : "node_42",
- "id" : 16,
+ "name" : "node_55",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 376,
@@ -5021,8 +5915,8 @@
"true_next" : "tbl_next376"
},
{
- "name" : "node_44",
- "id" : 17,
+ "name" : "node_57",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 378,
@@ -5064,8 +5958,8 @@
"true_next" : "tbl_next379"
},
{
- "name" : "node_46",
- "id" : 18,
+ "name" : "node_59",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 380,
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 8bf7d01..dd1645b 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -168,70 +168,70 @@
}
match_fields {
id: 2
- name: "ip_proto"
- bitwidth: 8
- match_type: TERNARY
- }
- match_fields {
- id: 3
- name: "l4_sport"
- bitwidth: 16
- match_type: TERNARY
- }
- match_fields {
- id: 4
- name: "l4_dport"
- bitwidth: 16
- match_type: TERNARY
- }
- match_fields {
- id: 5
name: "eth_dst"
bitwidth: 48
match_type: TERNARY
}
match_fields {
- id: 6
+ id: 3
name: "eth_src"
bitwidth: 48
match_type: TERNARY
}
match_fields {
- id: 7
+ id: 4
name: "vlan_id"
bitwidth: 12
match_type: TERNARY
}
match_fields {
- id: 8
+ id: 5
name: "eth_type"
bitwidth: 16
match_type: TERNARY
}
match_fields {
- id: 9
+ id: 6
name: "ipv4_src"
bitwidth: 32
match_type: TERNARY
}
match_fields {
- id: 10
+ id: 7
name: "ipv4_dst"
bitwidth: 32
match_type: TERNARY
}
match_fields {
- id: 11
+ id: 8
+ name: "ip_proto"
+ bitwidth: 8
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 9
name: "icmp_type"
bitwidth: 8
match_type: TERNARY
}
match_fields {
- id: 12
+ id: 10
name: "icmp_code"
bitwidth: 8
match_type: TERNARY
}
+ match_fields {
+ id: 11
+ name: "l4_sport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 12
+ name: "l4_dport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
action_refs {
id: 23623126
}