[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-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 7e5f3f2..7ca7062 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/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],
["bng_ingress_upstream_hasReturned", 1, false],
["userMetadata._ip_eth_type0", 16, false],
["userMetadata._vlan_id1", 12, false],
@@ -159,11 +164,21 @@
]
},
{
- "name" : "tcp_t",
+ "name" : "udp_t",
"id" : 10,
"fields" : [
["sport", 16, false],
["dport", 16, false],
+ ["len", 16, false],
+ ["checksum", 16, false]
+ ]
+ },
+ {
+ "name" : "tcp_t",
+ "id" : 11,
+ "fields" : [
+ ["sport", 16, false],
+ ["dport", 16, false],
["seq_no", 32, false],
["ack_no", 32, false],
["data_offset", 4, false],
@@ -176,16 +191,6 @@
]
},
{
- "name" : "udp_t",
- "id" : 11,
- "fields" : [
- ["sport", 16, false],
- ["dport", 16, false],
- ["len", 16, false],
- ["checksum", 16, false]
- ]
- },
- {
"name" : "icmp_t",
"id" : 12,
"fields" : [
@@ -278,43 +283,78 @@
"pi_omit" : true
},
{
- "name" : "ipv4",
+ "name" : "gtpu",
"id" : 10,
+ "header_type" : "gtpu_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "inner_ipv4",
+ "id" : 11,
"header_type" : "ipv4_t",
"metadata" : false,
"pi_omit" : true
},
{
- "name" : "tcp",
- "id" : 11,
- "header_type" : "tcp_t",
- "metadata" : false,
- "pi_omit" : true
- },
- {
- "name" : "udp",
+ "name" : "inner_udp",
"id" : 12,
"header_type" : "udp_t",
"metadata" : false,
"pi_omit" : true
},
{
- "name" : "icmp",
+ "name" : "inner_tcp",
"id" : 13,
+ "header_type" : "tcp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "inner_icmp",
+ "id" : 14,
+ "header_type" : "icmp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "ipv4",
+ "id" : 15,
+ "header_type" : "ipv4_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "tcp",
+ "id" : 16,
+ "header_type" : "tcp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "udp",
+ "id" : 17,
+ "header_type" : "udp_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "icmp",
+ "id" : 18,
"header_type" : "icmp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_out",
- "id" : 14,
+ "id" : 19,
"header_type" : "packet_out_header_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_in",
- "id" : 15,
+ "id" : 20,
"header_type" : "packet_in_header_t",
"metadata" : false,
"pi_omit" : true
@@ -330,7 +370,7 @@
"name" : "fl",
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 46,
+ "line" : 52,
"column" : 40,
"source_fragment" : "{standard_metadata.ingress_port}"
},
@@ -1691,6 +1731,12 @@
],
"transitions" : [
{
+ "type" : "hexstr",
+ "value" : "0x086801ff",
+ "mask" : null,
+ "next_state" : "parse_gtpu"
+ },
+ {
"type" : "default",
"value" : null,
"mask" : null,
@@ -1735,6 +1781,86 @@
}
],
"transition_key" : []
+ },
+ {
+ "name" : "parse_gtpu",
+ "id" : 14,
+ "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" : 15,
+ "parser_ops" : [
+ {
+ "parameters" : [
+ {
+ "type" : "regular",
+ "value" : "inner_udp"
+ }
+ ],
+ "op" : "extract"
+ }
+ ],
+ "transitions" : [
+ {
+ "type" : "default",
+ "value" : null,
+ "mask" : null,
+ "next_state" : null
+ }
+ ],
+ "transition_key" : []
}
]
}
@@ -1750,7 +1876,7 @@
"column" : 8,
"source_fragment" : "FabricDeparser"
},
- "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "ipv4", "tcp", "udp", "icmp"],
+ "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp"],
"primitives" : []
}
],
@@ -1888,7 +2014,7 @@
"binding" : "FabricIngress.acl.acl",
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 30,
+ "line" : 36,
"column" : 50,
"source_fragment" : "acl_counter"
}
@@ -2765,7 +2891,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 33,
+ "line" : 39,
"column" : 32,
"source_fragment" : "= next_id; ..."
}
@@ -2791,7 +2917,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 39,
+ "line" : 45,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = 255"
}
@@ -2820,7 +2946,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 40,
+ "line" : 46,
"column" : 34,
"source_fragment" : "= true; ..."
}
@@ -2851,7 +2977,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})"
}
@@ -2873,7 +2999,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 51,
+ "line" : 57,
"column" : 8,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -2902,7 +3028,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 52,
+ "line" : 58,
"column" : 34,
"source_fragment" : "= true; ..."
}
@@ -3570,7 +3696,7 @@
]
},
{
- "name" : "port_counter31",
+ "name" : "acl101",
"id" : 39,
"runtime_data" : [],
"primitives" : [
@@ -3579,6 +3705,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" : 40,
+ "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" : 41,
+ "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" : 42,
+ "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" : 43,
+ "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" : 44,
+ "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" : 45,
+ "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" : 46,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "tmp_8"]
},
{
@@ -3629,7 +4165,7 @@
},
{
"name" : "port_counter34",
- "id" : 40,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -3687,7 +4223,7 @@
},
{
"name" : "bng126",
- "id" : 41,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -3723,7 +4259,7 @@
},
{
"name" : "bng342",
- "id" : 42,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3772,7 +4308,7 @@
},
{
"name" : "bng131",
- "id" : 43,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -3798,7 +4334,7 @@
},
{
"name" : "bng238",
- "id" : 44,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -3828,7 +4364,7 @@
},
{
"name" : "bng241",
- "id" : 45,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -3858,7 +4394,7 @@
},
{
"name" : "FabricEgress.bng_egress.downstream.encap_v4",
- "id" : 46,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -4055,7 +4591,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 47,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -4096,7 +4632,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 48,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -4213,7 +4749,7 @@
},
{
"name" : "FabricEgress.egress_next.push_outer_vlan",
- "id" : 49,
+ "id" : 56,
"runtime_data" : [],
"primitives" : [
{
@@ -4311,7 +4847,7 @@
},
{
"name" : "FabricEgress.egress_next.push_inner_vlan",
- "id" : 50,
+ "id" : 57,
"runtime_data" : [],
"primitives" : [
{
@@ -4428,7 +4964,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 51,
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -4526,7 +5062,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 52,
+ "id" : 59,
"runtime_data" : [],
"primitives" : [
{
@@ -4548,7 +5084,7 @@
},
{
"name" : "FabricEgress.egress_next.drop",
- "id" : 53,
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -4570,7 +5106,7 @@
},
{
"name" : "packetio41",
- "id" : 54,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -4587,7 +5123,7 @@
},
{
"name" : "packetio44",
- "id" : 55,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -4638,7 +5174,7 @@
},
{
"name" : "next349",
- "id" : 56,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -4660,7 +5196,7 @@
},
{
"name" : "next365",
- "id" : 57,
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -4682,7 +5218,7 @@
},
{
"name" : "next376",
- "id" : 58,
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -4704,7 +5240,7 @@
},
{
"name" : "next375",
- "id" : 59,
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -4753,7 +5289,7 @@
},
{
"name" : "next380",
- "id" : 60,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -4775,7 +5311,7 @@
},
{
"name" : "next379",
- "id" : 61,
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -5092,10 +5628,10 @@
"direct_meters" : null,
"action_ids" : [20, 2],
"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" : 2,
@@ -5129,10 +5665,10 @@
"direct_meters" : null,
"action_ids" : [21, 3],
"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" : 3,
@@ -5166,11 +5702,11 @@
"direct_meters" : null,
"action_ids" : [22, 23, 4],
"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" : 4,
@@ -5180,11 +5716,214 @@
}
},
{
- "name" : "FabricIngress.acl.acl",
+ "name" : "tbl_acl27",
"id" : 9,
"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" : [45],
+ "actions" : ["acl27"],
+ "base_default_next" : "node_20",
+ "next_tables" : {
+ "acl27" : "node_20"
+ },
+ "default_entry" : {
+ "action_id" : 45,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl97",
+ "id" : 10,
+ "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" : [41],
+ "actions" : ["acl97"],
+ "base_default_next" : "node_22",
+ "next_tables" : {
+ "acl97" : "node_22"
+ },
+ "default_entry" : {
+ "action_id" : 41,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl101",
+ "id" : 11,
+ "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" : [39],
+ "actions" : ["acl101"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl101" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 39,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl104",
+ "id" : 12,
+ "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" : [40],
+ "actions" : ["acl104"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl104" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 40,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl108",
+ "id" : 13,
+ "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" : [44],
+ "actions" : ["acl108"],
+ "base_default_next" : "node_28",
+ "next_tables" : {
+ "acl108" : "node_28"
+ },
+ "default_entry" : {
+ "action_id" : 44,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl112",
+ "id" : 14,
+ "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" : [42],
+ "actions" : ["acl112"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl112" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 42,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl115",
+ "id" : 15,
+ "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" : [43],
+ "actions" : ["acl115"],
+ "base_default_next" : "FabricIngress.acl.acl",
+ "next_tables" : {
+ "acl115" : "FabricIngress.acl.acl"
+ },
+ "default_entry" : {
+ "action_id" : 43,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.acl.acl",
+ "id" : 16,
+ "source_info" : {
+ "filename" : "include/control/acl.p4",
+ "line" : 66,
"column" : 10,
"source_fragment" : "acl"
},
@@ -5197,24 +5936,6 @@
},
{
"match_type" : "ternary",
- "name" : "ip_proto",
- "target" : ["scalars", "userMetadata._ip_proto16"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
- "name" : "l4_sport",
- "target" : ["scalars", "userMetadata._l4_sport17"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
- "name" : "l4_dport",
- "target" : ["scalars", "userMetadata._l4_dport18"],
- "mask" : null
- },
- {
- "match_type" : "ternary",
"name" : "eth_dst",
"target" : ["ethernet", "dst_addr"],
"mask" : null
@@ -5240,13 +5961,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
},
{
@@ -5260,6 +5987,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",
@@ -5270,13 +6009,13 @@
"direct_meters" : null,
"action_ids" : [24, 25, 26, 27, 28],
"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_20",
+ "base_default_next" : "node_33",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_20",
- "FabricIngress.acl.punt_to_cpu" : "node_20",
- "FabricIngress.acl.set_clone_session_id" : "node_20",
- "FabricIngress.acl.drop" : "node_20",
- "FabricIngress.acl.nop_acl" : "node_20"
+ "FabricIngress.acl.set_next_id_acl" : "node_33",
+ "FabricIngress.acl.punt_to_cpu" : "node_33",
+ "FabricIngress.acl.set_clone_session_id" : "node_33",
+ "FabricIngress.acl.drop" : "node_33",
+ "FabricIngress.acl.nop_acl" : "node_33"
},
"default_entry" : {
"action_id" : 28,
@@ -5287,7 +6026,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 10,
+ "id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 202,
@@ -5321,7 +6060,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 11,
+ "id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 236,
@@ -5358,7 +6097,7 @@
},
{
"name" : "FabricIngress.next.next_vlan",
- "id" : 12,
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 86,
@@ -5381,11 +6120,11 @@
"direct_meters" : null,
"action_ids" : [29, 30, 5],
"actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
- "base_default_next" : "node_24",
+ "base_default_next" : "node_37",
"next_tables" : {
- "FabricIngress.next.set_vlan" : "node_24",
- "FabricIngress.next.set_double_vlan" : "node_24",
- "nop" : "node_24"
+ "FabricIngress.next.set_vlan" : "node_37",
+ "FabricIngress.next.set_double_vlan" : "node_37",
+ "nop" : "node_37"
},
"default_entry" : {
"action_id" : 5,
@@ -5396,7 +6135,7 @@
},
{
"name" : "tbl_port_counter31",
- "id" : 13,
+ "id" : 20,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -5410,14 +6149,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [46],
"actions" : ["port_counter31"],
- "base_default_next" : "node_26",
+ "base_default_next" : "node_39",
"next_tables" : {
- "port_counter31" : "node_26"
+ "port_counter31" : "node_39"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5425,7 +6164,7 @@
},
{
"name" : "tbl_port_counter34",
- "id" : 14,
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -5439,14 +6178,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [47],
"actions" : ["port_counter34"],
"base_default_next" : "FabricIngress.bng_ingress.t_line_map",
"next_tables" : {
"port_counter34" : "FabricIngress.bng_ingress.t_line_map"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5454,7 +6193,7 @@
},
{
"name" : "FabricIngress.bng_ingress.t_line_map",
- "id" : 15,
+ "id" : 22,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 323,
@@ -5483,9 +6222,9 @@
"direct_meters" : null,
"action_ids" : [15],
"actions" : ["FabricIngress.bng_ingress.set_line"],
- "base_default_next" : "node_29",
+ "base_default_next" : "node_42",
"next_tables" : {
- "FabricIngress.bng_ingress.set_line" : "node_29"
+ "FabricIngress.bng_ingress.set_line" : "node_42"
},
"default_entry" : {
"action_id" : 15,
@@ -5496,7 +6235,7 @@
},
{
"name" : "tbl_bng342",
- "id" : 16,
+ "id" : 23,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 342,
@@ -5510,14 +6249,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [49],
"actions" : ["bng342"],
"base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
"next_tables" : {
"bng342" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5525,7 +6264,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
- "id" : 17,
+ "id" : 24,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 51,
@@ -5557,7 +6296,7 @@
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_bng126",
- "__MISS__" : "node_33"
+ "__MISS__" : "node_46"
},
"default_entry" : {
"action_id" : 0,
@@ -5568,7 +6307,7 @@
},
{
"name" : "tbl_bng126",
- "id" : 18,
+ "id" : 25,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 126,
@@ -5582,14 +6321,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [48],
"actions" : ["bng126"],
- "base_default_next" : "node_33",
+ "base_default_next" : "node_46",
"next_tables" : {
- "bng126" : "node_33"
+ "bng126" : "node_46"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5597,7 +6336,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
- "id" : 19,
+ "id" : 26,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 87,
@@ -5646,7 +6385,7 @@
},
{
"name" : "tbl_bng131",
- "id" : 20,
+ "id" : 27,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 131,
@@ -5660,14 +6399,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [50],
"actions" : ["bng131"],
"base_default_next" : null,
"next_tables" : {
"bng131" : null
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5675,7 +6414,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
- "id" : 21,
+ "id" : 28,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 169,
@@ -5701,7 +6440,7 @@
"base_default_next" : null,
"next_tables" : {
"__MISS__" : null,
- "__HIT__" : "node_38"
+ "__HIT__" : "node_51"
},
"default_entry" : {
"action_id" : 1,
@@ -5712,7 +6451,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
- "id" : 22,
+ "id" : 29,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 194,
@@ -5767,7 +6506,7 @@
},
{
"name" : "tbl_bng238",
- "id" : 23,
+ "id" : 30,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 238,
@@ -5781,14 +6520,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [51],
"actions" : ["bng238"],
"base_default_next" : null,
"next_tables" : {
"bng238" : null
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5796,7 +6535,7 @@
},
{
"name" : "tbl_bng241",
- "id" : 24,
+ "id" : 31,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 241,
@@ -5810,14 +6549,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [52],
"actions" : ["bng241"],
"base_default_next" : null,
"next_tables" : {
"bng241" : null
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5990,7 +6729,7 @@
}
},
"true_next" : "node_13",
- "false_next" : "FabricIngress.acl.acl"
+ "false_next" : "tbl_acl27"
},
{
"name" : "node_13",
@@ -6068,12 +6807,167 @@
}
},
"true_next" : "FabricIngress.forwarding.routing_v4",
- "false_next" : "FabricIngress.acl.acl"
+ "false_next" : "tbl_acl27"
},
{
"name" : "node_20",
"id" : 8,
"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_26"
+ },
+ {
+ "name" : "node_22",
+ "id" : 9,
+ "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_24"
+ },
+ {
+ "name" : "node_24",
+ "id" : 10,
+ "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_26",
+ "id" : 11,
+ "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_28",
+ "id" : 12,
+ "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_30"
+ },
+ {
+ "name" : "node_30",
+ "id" : 13,
+ "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_33",
+ "id" : 14,
+ "source_info" : {
"filename" : "fabric.p4",
"line" : 73,
"column" : 12,
@@ -6101,8 +6995,8 @@
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_24",
- "id" : 9,
+ "name" : "node_37",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -6124,11 +7018,11 @@
}
},
"true_next" : "tbl_port_counter31",
- "false_next" : "node_26"
+ "false_next" : "node_39"
},
{
- "name" : "node_26",
- "id" : 10,
+ "name" : "node_39",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -6153,8 +7047,8 @@
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_29",
- "id" : 11,
+ "name" : "node_42",
+ "id" : 17,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 341,
@@ -6176,8 +7070,8 @@
"false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
},
{
- "name" : "node_33",
- "id" : 12,
+ "name" : "node_46",
+ "id" : 18,
"expression" : {
"type" : "expression",
"value" : {
@@ -6197,11 +7091,11 @@
}
},
"false_next" : null,
- "true_next" : "node_34"
+ "true_next" : "node_47"
},
{
- "name" : "node_34",
- "id" : 13,
+ "name" : "node_47",
+ "id" : 19,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 128,
@@ -6223,8 +7117,8 @@
"true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
},
{
- "name" : "node_38",
- "id" : 14,
+ "name" : "node_51",
+ "id" : 20,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 235,
@@ -6256,11 +7150,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_44",
+ "init_table" : "node_57",
"tables" : [
{
"name" : "tbl_packetio41",
- "id" : 25,
+ "id" : 32,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -6274,14 +7168,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54],
+ "action_ids" : [61],
"actions" : ["packetio41"],
- "base_default_next" : "node_46",
+ "base_default_next" : "node_59",
"next_tables" : {
- "packetio41" : "node_46"
+ "packetio41" : "node_59"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6289,7 +7183,7 @@
},
{
"name" : "tbl_packetio44",
- "id" : 26,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -6303,14 +7197,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
+ "action_ids" : [62],
"actions" : ["packetio44"],
- "base_default_next" : "node_48",
+ "base_default_next" : "node_61",
"next_tables" : {
- "packetio44" : "node_48"
+ "packetio44" : "node_61"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6318,7 +7212,7 @@
},
{
"name" : "tbl_next349",
- "id" : 27,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 349,
@@ -6332,14 +7226,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56],
+ "action_ids" : [63],
"actions" : ["next349"],
- "base_default_next" : "node_50",
+ "base_default_next" : "node_63",
"next_tables" : {
- "next349" : "node_50"
+ "next349" : "node_63"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6347,7 +7241,7 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 28,
+ "id" : 35,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 353,
@@ -6361,14 +7255,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [54],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
- "base_default_next" : "node_54",
+ "base_default_next" : "node_67",
"next_tables" : {
- "FabricEgress.egress_next.pop_mpls_if_present" : "node_54"
+ "FabricEgress.egress_next.pop_mpls_if_present" : "node_67"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6376,7 +7270,7 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 29,
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 355,
@@ -6390,14 +7284,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
+ "action_ids" : [55],
"actions" : ["FabricEgress.egress_next.set_mpls"],
- "base_default_next" : "node_54",
+ "base_default_next" : "node_67",
"next_tables" : {
- "FabricEgress.egress_next.set_mpls" : "node_54"
+ "FabricEgress.egress_next.set_mpls" : "node_67"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6405,7 +7299,7 @@
},
{
"name" : "tbl_egress_next_push_outer_vlan",
- "id" : 30,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 361,
@@ -6419,14 +7313,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
+ "action_ids" : [56],
"actions" : ["FabricEgress.egress_next.push_outer_vlan"],
"base_default_next" : "tbl_egress_next_push_inner_vlan",
"next_tables" : {
"FabricEgress.egress_next.push_outer_vlan" : "tbl_egress_next_push_inner_vlan"
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 56,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6434,7 +7328,7 @@
},
{
"name" : "tbl_egress_next_push_inner_vlan",
- "id" : 31,
+ "id" : 38,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 362,
@@ -6448,14 +7342,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
+ "action_ids" : [57],
"actions" : ["FabricEgress.egress_next.push_inner_vlan"],
- "base_default_next" : "node_59",
+ "base_default_next" : "node_72",
"next_tables" : {
- "FabricEgress.egress_next.push_inner_vlan" : "node_59"
+ "FabricEgress.egress_next.push_inner_vlan" : "node_72"
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 57,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6463,7 +7357,7 @@
},
{
"name" : "tbl_next365",
- "id" : 32,
+ "id" : 39,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 365,
@@ -6477,14 +7371,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
+ "action_ids" : [64],
"actions" : ["next365"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"next365" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6492,7 +7386,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 33,
+ "id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 331,
@@ -6519,16 +7413,16 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51, 52, 53],
+ "action_ids" : [58, 59, 60],
"actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
- "base_default_next" : "node_59",
+ "base_default_next" : "node_72",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_59",
- "FabricEgress.egress_next.pop_vlan" : "node_59",
- "FabricEgress.egress_next.drop" : "node_59"
+ "FabricEgress.egress_next.push_vlan" : "node_72",
+ "FabricEgress.egress_next.pop_vlan" : "node_72",
+ "FabricEgress.egress_next.drop" : "node_72"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 60,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6536,7 +7430,7 @@
},
{
"name" : "tbl_next375",
- "id" : 34,
+ "id" : 41,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 375,
@@ -6550,14 +7444,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59],
+ "action_ids" : [66],
"actions" : ["next375"],
- "base_default_next" : "node_61",
+ "base_default_next" : "node_74",
"next_tables" : {
- "next375" : "node_61"
+ "next375" : "node_74"
},
"default_entry" : {
- "action_id" : 59,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6565,7 +7459,7 @@
},
{
"name" : "tbl_next376",
- "id" : 35,
+ "id" : 42,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 376,
@@ -6579,14 +7473,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
+ "action_ids" : [65],
"actions" : ["next376"],
- "base_default_next" : "node_67",
+ "base_default_next" : "node_80",
"next_tables" : {
- "next376" : "node_67"
+ "next376" : "node_80"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 65,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6594,7 +7488,7 @@
},
{
"name" : "tbl_next379",
- "id" : 36,
+ "id" : 43,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 379,
@@ -6608,14 +7502,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
+ "action_ids" : [68],
"actions" : ["next379"],
- "base_default_next" : "node_65",
+ "base_default_next" : "node_78",
"next_tables" : {
- "next379" : "node_65"
+ "next379" : "node_78"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6623,7 +7517,7 @@
},
{
"name" : "tbl_next380",
- "id" : 37,
+ "id" : 44,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 380,
@@ -6637,14 +7531,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [60],
+ "action_ids" : [67],
"actions" : ["next380"],
- "base_default_next" : "node_67",
+ "base_default_next" : "node_80",
"next_tables" : {
- "next380" : "node_67"
+ "next380" : "node_80"
},
"default_entry" : {
- "action_id" : 60,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6652,7 +7546,7 @@
},
{
"name" : "tbl_bng_egress_downstream_encap_v4",
- "id" : 38,
+ "id" : 45,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 297,
@@ -6666,14 +7560,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [53],
"actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.bng_egress.downstream.encap_v4" : null
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6683,8 +7577,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_44",
- "id" : 15,
+ "name" : "node_57",
+ "id" : 21,
"source_info" : {
"filename" : "fabric.p4",
"line" : 103,
@@ -6703,11 +7597,11 @@
}
},
"true_next" : "tbl_packetio41",
- "false_next" : "node_46"
+ "false_next" : "node_59"
},
{
- "name" : "node_46",
- "id" : 16,
+ "name" : "node_59",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -6729,11 +7623,11 @@
}
},
"true_next" : "tbl_packetio44",
- "false_next" : "node_48"
+ "false_next" : "node_61"
},
{
- "name" : "node_48",
- "id" : 17,
+ "name" : "node_61",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 347,
@@ -6772,11 +7666,11 @@
}
},
"true_next" : "tbl_next349",
- "false_next" : "node_50"
+ "false_next" : "node_63"
},
{
- "name" : "node_50",
- "id" : 18,
+ "name" : "node_63",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 352,
@@ -6797,12 +7691,12 @@
}
}
},
- "true_next" : "node_51",
+ "true_next" : "node_64",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_51",
- "id" : 19,
+ "name" : "node_64",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 353,
@@ -6821,11 +7715,11 @@
}
},
"true_next" : "tbl_egress_next_pop_mpls_if_present",
- "false_next" : "node_54"
+ "false_next" : "node_67"
},
{
- "name" : "node_54",
- "id" : 20,
+ "name" : "node_67",
+ "id" : 26,
"source_info" : {
"filename" : "fabric.p4",
"line" : 104,
@@ -6847,8 +7741,8 @@
"false_next" : "tbl_next365"
},
{
- "name" : "node_59",
- "id" : 21,
+ "name" : "node_72",
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -6867,11 +7761,11 @@
}
},
"true_next" : "tbl_next375",
- "false_next" : "node_63"
+ "false_next" : "node_76"
},
{
- "name" : "node_61",
- "id" : 22,
+ "name" : "node_74",
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 376,
@@ -6893,11 +7787,11 @@
}
},
"true_next" : "tbl_next376",
- "false_next" : "node_67"
+ "false_next" : "node_80"
},
{
- "name" : "node_63",
- "id" : 23,
+ "name" : "node_76",
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 378,
@@ -6936,11 +7830,11 @@
}
},
"true_next" : "tbl_next379",
- "false_next" : "node_67"
+ "false_next" : "node_80"
},
{
- "name" : "node_65",
- "id" : 24,
+ "name" : "node_78",
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 380,
@@ -6962,11 +7856,11 @@
}
},
"true_next" : "tbl_next380",
- "false_next" : "node_67"
+ "false_next" : "node_80"
},
{
- "name" : "node_67",
- "id" : 25,
+ "name" : "node_80",
+ "id" : 31,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 358,
@@ -6988,11 +7882,11 @@
}
},
"false_next" : null,
- "true_next" : "node_68"
+ "true_next" : "node_81"
},
{
- "name" : "node_68",
- "id" : 26,
+ "name" : "node_81",
+ "id" : 32,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 296,
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
index aea728f..6124129 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
@@ -327,70 +327,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
}