[SDFAB-102] Backport changes required for policies to fabric.p4 (Redirect)
Change-Id: I357c908d31abad9c3f8d74723d937ea948e54808
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 7ca7062..3d2d9bb 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
@@ -47,7 +47,8 @@
["userMetadata._bng_ds_meter_result24", 32, false],
["userMetadata._bng_s_tag25", 12, false],
["userMetadata._bng_c_tag26", 12, false],
- ["_padding_0", 1, false]
+ ["userMetadata._port_type27", 2, false],
+ ["_padding_0", 7, false]
]
},
{
@@ -1978,7 +1979,7 @@
"binding" : "FabricIngress.filtering.fwd_classifier",
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 85,
+ "line" : 87,
"column" : 50,
"source_fragment" : "fwd_classifier_counter"
}
@@ -2008,9 +2009,33 @@
}
},
{
- "name" : "FabricIngress.acl.acl_counter",
+ "name" : "FabricIngress.pre_next.next_mpls_counter",
"id" : 8,
"is_direct" : true,
+ "binding" : "FabricIngress.pre_next.next_mpls",
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 29,
+ "column" : 50,
+ "source_fragment" : "next_mpls_counter"
+ }
+ },
+ {
+ "name" : "FabricIngress.pre_next.next_vlan_counter",
+ "id" : 9,
+ "is_direct" : true,
+ "binding" : "FabricIngress.pre_next.next_vlan",
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 54,
+ "column" : 50,
+ "source_fragment" : "next_vlan_counter"
+ }
+ },
+ {
+ "name" : "FabricIngress.acl.acl_counter",
+ "id" : 10,
+ "is_direct" : true,
"binding" : "FabricIngress.acl.acl",
"source_info" : {
"filename" : "include/control/acl.p4",
@@ -2020,44 +2045,32 @@
}
},
{
- "name" : "FabricIngress.next.next_vlan_counter",
- "id" : 9,
- "is_direct" : true,
- "binding" : "FabricIngress.next.next_vlan",
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 67,
- "column" : 50,
- "source_fragment" : "next_vlan_counter"
- }
- },
- {
"name" : "FabricIngress.next.hashed_counter",
- "id" : 10,
+ "id" : 11,
"is_direct" : true,
"binding" : "FabricIngress.next.hashed",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 184,
+ "line" : 126,
"column" : 50,
"source_fragment" : "hashed_counter"
}
},
{
"name" : "FabricIngress.next.multicast_counter",
- "id" : 11,
+ "id" : 12,
"is_direct" : true,
"binding" : "FabricIngress.next.multicast",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 228,
+ "line" : 163,
"column" : 50,
"source_fragment" : "multicast_counter"
}
},
{
"name" : "FabricIngress.port_counters_control.egress_port_counter",
- "id" : 12,
+ "id" : 13,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 26,
@@ -2069,7 +2082,7 @@
},
{
"name" : "FabricIngress.port_counters_control.ingress_port_counter",
- "id" : 13,
+ "id" : 14,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 27,
@@ -2081,7 +2094,7 @@
},
{
"name" : "FabricEgress.bng_egress.downstream.c_line_tx",
- "id" : 14,
+ "id" : 15,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 267,
@@ -2093,12 +2106,12 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan_counter",
- "id" : 15,
+ "id" : 16,
"is_direct" : true,
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 314,
+ "line" : 248,
"column" : 50,
"source_fragment" : "egress_vlan_counter"
}
@@ -2280,9 +2293,15 @@
"primitives" : []
},
{
- "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
+ "name" : "nop",
"id" : 8,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
+ "id" : 9,
+ "runtime_data" : [],
"primitives" : [
{
"op" : "assign",
@@ -2345,7 +2364,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_disabled",
- "id" : 9,
+ "id" : 10,
"runtime_data" : [],
"primitives" : [
{
@@ -2386,7 +2405,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
- "id" : 10,
+ "id" : 11,
"runtime_data" : [],
"primitives" : [
{
@@ -2403,7 +2422,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 120,
+ "line" : 132,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -2446,7 +2465,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.set_session",
- "id" : 11,
+ "id" : 12,
"runtime_data" : [
{
"name" : "pppoe_session_id",
@@ -2515,7 +2534,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.drop",
- "id" : 12,
+ "id" : 13,
"runtime_data" : [],
"primitives" : [
{
@@ -2575,19 +2594,19 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.qos_prio",
- "id" : 13,
- "runtime_data" : [],
- "primitives" : []
- },
- {
- "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
"id" : 14,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "FabricIngress.bng_ingress.set_line",
+ "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
"id" : 15,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.bng_ingress.set_line",
+ "id" : 16,
"runtime_data" : [
{
"name" : "line_id",
@@ -2618,7 +2637,7 @@
},
{
"name" : "FabricIngress.filtering.deny",
- "id" : 16,
+ "id" : 17,
"runtime_data" : [],
"primitives" : [
{
@@ -2678,22 +2697,70 @@
"column" : 34,
"source_fragment" : "= true; ..."
}
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._port_type27"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 119,
+ "column" : 38,
+ "source_fragment" : "0x0; ..."
+ }
}
]
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 17,
- "runtime_data" : [],
- "primitives" : []
+ "id" : 18,
+ "runtime_data" : [
+ {
+ "name" : "port_type",
+ "bitwidth" : 2
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._port_type27"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 44,
+ "column" : 34,
+ "source_fragment" : "= port_type; ..."
+ }
+ }
+ ]
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 18,
+ "id" : 19,
"runtime_data" : [
{
"name" : "vlan_id",
"bitwidth" : 12
+ },
+ {
+ "name" : "port_type",
+ "bitwidth" : 2
}
],
"primitives" : [
@@ -2711,16 +2778,35 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 47,
+ "line" : 49,
"column" : 32,
"source_fragment" : "= vlan_id; ..."
}
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._port_type27"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 44,
+ "column" : 34,
+ "source_fragment" : "= port_type; ..."
+ }
}
]
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 19,
+ "id" : 20,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -2742,7 +2828,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 88,
+ "line" : 90,
"column" : 33,
"source_fragment" : "= fwd_type; ..."
}
@@ -2751,7 +2837,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 20,
+ "id" : 21,
"runtime_data" : [
{
"name" : "next_id",
@@ -2782,7 +2868,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 21,
+ "id" : 22,
"runtime_data" : [
{
"name" : "next_id",
@@ -2832,7 +2918,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 22,
+ "id" : 23,
"runtime_data" : [
{
"name" : "next_id",
@@ -2863,13 +2949,196 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 23,
+ "id" : 24,
"runtime_data" : [],
"primitives" : []
},
{
+ "name" : "FabricIngress.pre_next.set_mpls_label",
+ "id" : 25,
+ "runtime_data" : [
+ {
+ "name" : "label",
+ "bitwidth" : 20
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._mpls_label8"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 32,
+ "column" : 35,
+ "source_fragment" : "= label; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.pre_next.set_vlan",
+ "id" : 26,
+ "runtime_data" : [
+ {
+ "name" : "vlan_id",
+ "bitwidth" : 12
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._vlan_id1"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 57,
+ "column" : 32,
+ "source_fragment" : "= vlan_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.pre_next.set_double_vlan",
+ "id" : 27,
+ "runtime_data" : [
+ {
+ "name" : "outer_vlan_id",
+ "bitwidth" : 12
+ },
+ {
+ "name" : "inner_vlan_id",
+ "bitwidth" : 12
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._vlan_id1"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 57,
+ "column" : 32,
+ "source_fragment" : "= vlan_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._push_double_vlan4"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 64,
+ "column" : 41,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._inner_vlan_id5"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 65,
+ "column" : 38,
+ "source_fragment" : "= inner_vlan_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._bng_s_tag25"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 67,
+ "column" : 34,
+ "source_fragment" : "= outer_vlan_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._bng_c_tag26"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 68,
+ "column" : 34,
+ "source_fragment" : "= inner_vlan_id; ..."
+ }
+ }
+ ]
+ },
+ {
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 24,
+ "id" : 28,
"runtime_data" : [
{
"name" : "next_id",
@@ -2900,7 +3169,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 25,
+ "id" : 29,
"runtime_data" : [],
"primitives" : [
{
@@ -2955,7 +3224,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 26,
+ "id" : 30,
"runtime_data" : [
{
"name" : "clone_id",
@@ -2986,7 +3255,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 27,
+ "id" : 31,
"runtime_data" : [],
"primitives" : [
{
@@ -3037,165 +3306,13 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 28,
+ "id" : 32,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "FabricIngress.next.set_vlan",
- "id" : 29,
- "runtime_data" : [
- {
- "name" : "vlan_id",
- "bitwidth" : 12
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._vlan_id1"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 70,
- "column" : 32,
- "source_fragment" : "= vlan_id; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.set_double_vlan",
- "id" : 30,
- "runtime_data" : [
- {
- "name" : "outer_vlan_id",
- "bitwidth" : 12
- },
- {
- "name" : "inner_vlan_id",
- "bitwidth" : 12
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._vlan_id1"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 70,
- "column" : 32,
- "source_fragment" : "= vlan_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._push_double_vlan4"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "bool",
- "value" : true
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 77,
- "column" : 41,
- "source_fragment" : "= true; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._inner_vlan_id5"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 78,
- "column" : 38,
- "source_fragment" : "= inner_vlan_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._bng_s_tag25"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 80,
- "column" : 34,
- "source_fragment" : "= outer_vlan_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._bng_c_tag26"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 81,
- "column" : 34,
- "source_fragment" : "= inner_vlan_id; ..."
- }
- }
- ]
- },
- {
"name" : "FabricIngress.next.output_hashed",
- "id" : 31,
+ "id" : 33,
"runtime_data" : [
{
"name" : "port_num",
@@ -3226,7 +3343,7 @@
},
{
"name" : "FabricIngress.next.routing_hashed",
- "id" : 32,
+ "id" : 34,
"runtime_data" : [
{
"name" : "port_num",
@@ -3302,108 +3419,8 @@
]
},
{
- "name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 33,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- },
- {
- "name" : "smac",
- "bitwidth" : 48
- },
- {
- "name" : "dmac",
- "bitwidth" : 48
- },
- {
- "name" : "label",
- "bitwidth" : 20
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata._mpls_label8"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 46,
- "column" : 35,
- "source_fragment" : "= label; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "src_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 36,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "dst_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 2
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 41,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 31,
- "column" : 5,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
- }
- }
- ]
- },
- {
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 34,
+ "id" : 35,
"runtime_data" : [
{
"name" : "group_id",
@@ -3425,7 +3442,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 231,
+ "line" : 166,
"column" : 8,
"source_fragment" : "standard_metadata.mcast_grp = group_id"
}
@@ -3454,7 +3471,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 232,
+ "line" : 167,
"column" : 37,
"source_fragment" : "= true; ..."
}
@@ -3463,7 +3480,7 @@
},
{
"name" : "packetio25",
- "id" : 35,
+ "id" : 36,
"runtime_data" : [],
"primitives" : [
{
@@ -3542,8 +3559,8 @@
]
},
{
- "name" : "filtering111",
- "id" : 36,
+ "name" : "filtering113",
+ "id" : 37,
"runtime_data" : [],
"primitives" : [
{
@@ -3560,7 +3577,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 111,
+ "line" : 113,
"column" : 36,
"source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
}
@@ -3579,7 +3596,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 112,
+ "line" : 114,
"column" : 37,
"source_fragment" : "= hdr.vlan_tag.pri; ..."
}
@@ -3598,7 +3615,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 113,
+ "line" : 115,
"column" : 37,
"source_fragment" : "= hdr.vlan_tag.cfi; ..."
}
@@ -3606,8 +3623,8 @@
]
},
{
- "name" : "filtering117",
- "id" : 37,
+ "name" : "filtering119",
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -3624,7 +3641,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 117,
+ "line" : 119,
"column" : 42,
"source_fragment" : "= hdr.inner_vlan_tag.vlan_id; ..."
}
@@ -3643,7 +3660,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 118,
+ "line" : 120,
"column" : 43,
"source_fragment" : "= hdr.inner_vlan_tag.pri; ..."
}
@@ -3662,7 +3679,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 119,
+ "line" : 121,
"column" : 43,
"source_fragment" : "= hdr.inner_vlan_tag.cfi; ..."
}
@@ -3670,8 +3687,8 @@
]
},
{
- "name" : "filtering127",
- "id" : 38,
+ "name" : "filtering129",
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -3688,7 +3705,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 127,
+ "line" : 129,
"column" : 37,
"source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
}
@@ -3696,8 +3713,8 @@
]
},
{
- "name" : "acl101",
- "id" : 39,
+ "name" : "acl102",
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -3714,7 +3731,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 101,
+ "line" : 102,
"column" : 16,
"source_fragment" : "l4_sport = hdr.inner_tcp.sport"
}
@@ -3733,7 +3750,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 102,
+ "line" : 103,
"column" : 16,
"source_fragment" : "l4_dport = hdr.inner_tcp.dport"
}
@@ -3741,8 +3758,8 @@
]
},
{
- "name" : "acl104",
- "id" : 40,
+ "name" : "acl105",
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -3759,7 +3776,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 104,
+ "line" : 105,
"column" : 16,
"source_fragment" : "l4_sport = hdr.inner_udp.sport"
}
@@ -3778,7 +3795,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 105,
+ "line" : 106,
"column" : 16,
"source_fragment" : "l4_dport = hdr.inner_udp.dport"
}
@@ -3786,8 +3803,8 @@
]
},
{
- "name" : "acl97",
- "id" : 41,
+ "name" : "acl98",
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -3804,7 +3821,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 97,
+ "line" : 98,
"column" : 12,
"source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
}
@@ -3823,7 +3840,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 98,
+ "line" : 99,
"column" : 12,
"source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
}
@@ -3842,7 +3859,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 99,
+ "line" : 100,
"column" : 12,
"source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
}
@@ -3850,8 +3867,8 @@
]
},
{
- "name" : "acl112",
- "id" : 42,
+ "name" : "acl113",
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -3868,7 +3885,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 112,
+ "line" : 113,
"column" : 16,
"source_fragment" : "l4_sport = hdr.tcp.sport"
}
@@ -3887,7 +3904,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 113,
+ "line" : 114,
"column" : 16,
"source_fragment" : "l4_dport = hdr.tcp.dport"
}
@@ -3895,8 +3912,8 @@
]
},
{
- "name" : "acl115",
- "id" : 43,
+ "name" : "acl116",
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3913,7 +3930,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 115,
+ "line" : 116,
"column" : 16,
"source_fragment" : "l4_sport = hdr.udp.sport"
}
@@ -3932,7 +3949,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 116,
+ "line" : 117,
"column" : 16,
"source_fragment" : "l4_dport = hdr.udp.dport"
}
@@ -3940,8 +3957,8 @@
]
},
{
- "name" : "acl108",
- "id" : 44,
+ "name" : "acl109",
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3958,7 +3975,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 108,
+ "line" : 109,
"column" : 12,
"source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
}
@@ -3977,7 +3994,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 109,
+ "line" : 110,
"column" : 12,
"source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
}
@@ -3996,7 +4013,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 110,
+ "line" : 111,
"column" : 12,
"source_fragment" : "ip_proto = hdr.ipv4.protocol"
}
@@ -4005,7 +4022,7 @@
},
{
"name" : "acl27",
- "id" : 45,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -4107,7 +4124,7 @@
},
{
"name" : "port_counter31",
- "id" : 46,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -4165,7 +4182,7 @@
},
{
"name" : "port_counter34",
- "id" : 47,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -4223,7 +4240,7 @@
},
{
"name" : "bng126",
- "id" : 48,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -4259,7 +4276,7 @@
},
{
"name" : "bng342",
- "id" : 49,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -4308,7 +4325,7 @@
},
{
"name" : "bng131",
- "id" : 50,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -4334,7 +4351,7 @@
},
{
"name" : "bng238",
- "id" : 51,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -4364,7 +4381,7 @@
},
{
"name" : "bng241",
- "id" : 52,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -4394,7 +4411,7 @@
},
{
"name" : "FabricEgress.bng_egress.downstream.encap_v4",
- "id" : 53,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -4411,7 +4428,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 124,
+ "line" : 136,
"column" : 33,
"source_fragment" : "0x8864; ..."
}
@@ -4582,7 +4599,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 138,
"column" : 35,
"source_fragment" : "0x0021; ..."
}
@@ -4591,7 +4608,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 54,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -4604,7 +4621,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 270,
+ "line" : 204,
"column" : 8,
"source_fragment" : "hdr.mpls.setInvalid()"
}
@@ -4623,7 +4640,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 272,
+ "line" : 206,
"column" : 8,
"source_fragment" : "hdr.eth_type.value = fabric_metadata.ip_eth_type; ..."
}
@@ -4632,7 +4649,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 55,
+ "id" : 56,
"runtime_data" : [],
"primitives" : [
{
@@ -4645,7 +4662,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 277,
+ "line" : 211,
"column" : 8,
"source_fragment" : "hdr.mpls.setValid()"
}
@@ -4664,7 +4681,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 278,
+ "line" : 212,
"column" : 8,
"source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
}
@@ -4683,7 +4700,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 279,
+ "line" : 213,
"column" : 8,
"source_fragment" : "hdr.mpls.tc = 3w0"
}
@@ -4702,7 +4719,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 280,
+ "line" : 214,
"column" : 8,
"source_fragment" : "hdr.mpls.bos = 1w1"
}
@@ -4721,7 +4738,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 281,
+ "line" : 215,
"column" : 8,
"source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
}
@@ -4740,7 +4757,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 118,
+ "line" : 130,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -4749,7 +4766,7 @@
},
{
"name" : "FabricEgress.egress_next.push_outer_vlan",
- "id" : 56,
+ "id" : 57,
"runtime_data" : [],
"primitives" : [
{
@@ -4762,7 +4779,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 289,
+ "line" : 223,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setValid()"
}
@@ -4781,7 +4798,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 290,
+ "line" : 224,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
}
@@ -4800,7 +4817,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 291,
+ "line" : 225,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
}
@@ -4819,7 +4836,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 129,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -4838,7 +4855,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 293,
+ "line" : 227,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
}
@@ -4847,7 +4864,7 @@
},
{
"name" : "FabricEgress.egress_next.push_inner_vlan",
- "id" : 57,
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -4860,7 +4877,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 300,
+ "line" : 234,
"column" : 8,
"source_fragment" : "hdr.inner_vlan_tag.setValid()"
}
@@ -4879,7 +4896,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 301,
+ "line" : 235,
"column" : 8,
"source_fragment" : "hdr.inner_vlan_tag.cfi = fabric_metadata.inner_vlan_cfi; ..."
}
@@ -4898,7 +4915,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 302,
+ "line" : 236,
"column" : 8,
"source_fragment" : "hdr.inner_vlan_tag.pri = fabric_metadata.inner_vlan_pri; ..."
}
@@ -4917,7 +4934,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 303,
+ "line" : 237,
"column" : 8,
"source_fragment" : "hdr.inner_vlan_tag.vlan_id = fabric_metadata.inner_vlan_id; ..."
}
@@ -4936,7 +4953,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 129,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -4955,7 +4972,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 129,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -4964,7 +4981,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 58,
+ "id" : 59,
"runtime_data" : [],
"primitives" : [
{
@@ -4977,7 +4994,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 289,
+ "line" : 223,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setValid()"
}
@@ -4996,7 +5013,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 290,
+ "line" : 224,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
}
@@ -5015,7 +5032,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 291,
+ "line" : 225,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
}
@@ -5034,7 +5051,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 129,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -5053,7 +5070,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 293,
+ "line" : 227,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
}
@@ -5062,7 +5079,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 59,
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -5075,7 +5092,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 322,
+ "line" : 256,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -5084,7 +5101,7 @@
},
{
"name" : "FabricEgress.egress_next.drop",
- "id" : 60,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -5097,7 +5114,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 327,
+ "line" : 261,
"column" : 8,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -5106,7 +5123,7 @@
},
{
"name" : "packetio41",
- "id" : 61,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -5123,7 +5140,7 @@
},
{
"name" : "packetio44",
- "id" : 62,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -5173,8 +5190,8 @@
]
},
{
- "name" : "next349",
- "id" : 63,
+ "name" : "next283",
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -5187,7 +5204,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 349,
+ "line" : 283,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -5195,8 +5212,8 @@
]
},
{
- "name" : "next365",
- "id" : 64,
+ "name" : "next299",
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -5209,7 +5226,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 365,
+ "line" : 299,
"column" : 12,
"source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
}
@@ -5217,8 +5234,8 @@
]
},
{
- "name" : "next376",
- "id" : 65,
+ "name" : "next310",
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -5231,7 +5248,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 310,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -5239,8 +5256,8 @@
]
},
{
- "name" : "next375",
- "id" : 66,
+ "name" : "next309",
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -5280,7 +5297,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 375,
+ "line" : 309,
"column" : 12,
"source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
}
@@ -5288,8 +5305,8 @@
]
},
{
- "name" : "next380",
- "id" : 67,
+ "name" : "next314",
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -5302,7 +5319,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -5310,8 +5327,8 @@
]
},
{
- "name" : "next379",
- "id" : 68,
+ "name" : "next313",
+ "id" : 69,
"runtime_data" : [],
"primitives" : [
{
@@ -5351,7 +5368,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 379,
+ "line" : 313,
"column" : 16,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -5365,7 +5382,7 @@
"id" : 0,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 46,
+ "line" : 47,
"column" : 8,
"source_fragment" : "FabricIngress"
},
@@ -5387,25 +5404,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
+ "action_ids" : [36],
"actions" : ["packetio25"],
"base_default_next" : "node_4",
"next_tables" : {
"packetio25" : "node_4"
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 36,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_filtering111",
+ "name" : "tbl_filtering113",
"id" : 1,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 111,
+ "line" : 113,
"column" : 36,
"source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
},
@@ -5416,25 +5433,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36],
- "actions" : ["filtering111"],
+ "action_ids" : [37],
+ "actions" : ["filtering113"],
"base_default_next" : "node_6",
"next_tables" : {
- "filtering111" : "node_6"
+ "filtering113" : "node_6"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_filtering117",
+ "name" : "tbl_filtering119",
"id" : 2,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 117,
+ "line" : 119,
"column" : 42,
"source_fragment" : "= hdr.inner_vlan_tag.vlan_id; ..."
},
@@ -5445,25 +5462,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
- "actions" : ["filtering117"],
+ "action_ids" : [38],
+ "actions" : ["filtering119"],
"base_default_next" : "node_8",
"next_tables" : {
- "filtering117" : "node_8"
+ "filtering119" : "node_8"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_filtering127",
+ "name" : "tbl_filtering129",
"id" : 3,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 127,
+ "line" : 129,
"column" : 37,
"source_fragment" : "="
},
@@ -5474,14 +5491,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
- "actions" : ["filtering127"],
+ "action_ids" : [39],
+ "actions" : ["filtering129"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
- "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
+ "filtering129" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5492,7 +5509,7 @@
"id" : 4,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 53,
+ "line" : 55,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -5528,7 +5545,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16, 17, 18],
+ "action_ids" : [17, 18, 19],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -5537,7 +5554,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 16,
+ "action_id" : 17,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5548,7 +5565,7 @@
"id" : 5,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 92,
+ "line" : 94,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -5584,14 +5601,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19],
+ "action_ids" : [20],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_12",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_12"
},
"default_entry" : {
- "action_id" : 19,
+ "action_id" : 20,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -5626,12 +5643,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 2],
+ "action_ids" : [21, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_19",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_bridging" : "tbl_acl27",
- "nop" : "tbl_acl27"
+ "FabricIngress.forwarding.set_next_id_bridging" : "node_19",
+ "nop" : "node_19"
},
"default_entry" : {
"action_id" : 2,
@@ -5663,12 +5680,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [21, 3],
+ "action_ids" : [22, 3],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_19",
"next_tables" : {
- "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_acl27",
- "nop" : "tbl_acl27"
+ "FabricIngress.forwarding.pop_mpls_and_next" : "node_19",
+ "nop" : "node_19"
},
"default_entry" : {
"action_id" : 3,
@@ -5700,13 +5717,13 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [22, 23, 4],
+ "action_ids" : [23, 24, 4],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_19",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_routing_v4" : "tbl_acl27",
- "FabricIngress.forwarding.nop_routing_v4" : "tbl_acl27",
- "nop" : "tbl_acl27"
+ "FabricIngress.forwarding.set_next_id_routing_v4" : "node_19",
+ "FabricIngress.forwarding.nop_routing_v4" : "node_19",
+ "nop" : "node_19"
},
"default_entry" : {
"action_id" : 4,
@@ -5716,9 +5733,84 @@
}
},
{
- "name" : "tbl_acl27",
+ "name" : "FabricIngress.pre_next.next_mpls",
"id" : 9,
"source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 36,
+ "column" : 10,
+ "source_fragment" : "next_mpls"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "next_id",
+ "target" : ["scalars", "userMetadata._next_id13"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [25, 5],
+ "actions" : ["FabricIngress.pre_next.set_mpls_label", "nop"],
+ "base_default_next" : "FabricIngress.pre_next.next_vlan",
+ "next_tables" : {
+ "FabricIngress.pre_next.set_mpls_label" : "FabricIngress.pre_next.next_vlan",
+ "nop" : "FabricIngress.pre_next.next_vlan"
+ },
+ "default_entry" : {
+ "action_id" : 5,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.pre_next.next_vlan",
+ "id" : 10,
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 73,
+ "column" : 10,
+ "source_fragment" : "next_vlan"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "next_id",
+ "target" : ["scalars", "userMetadata._next_id13"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [26, 27, 6],
+ "actions" : ["FabricIngress.pre_next.set_vlan", "FabricIngress.pre_next.set_double_vlan", "nop"],
+ "base_default_next" : "tbl_acl27",
+ "next_tables" : {
+ "FabricIngress.pre_next.set_vlan" : "tbl_acl27",
+ "FabricIngress.pre_next.set_double_vlan" : "tbl_acl27",
+ "nop" : "tbl_acl27"
+ },
+ "default_entry" : {
+ "action_id" : 6,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl27",
+ "id" : 11,
+ "source_info" : {
"filename" : "include/control/acl.p4",
"line" : 27,
"column" : 4,
@@ -5731,25 +5823,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [46],
"actions" : ["acl27"],
- "base_default_next" : "node_20",
+ "base_default_next" : "node_23",
"next_tables" : {
- "acl27" : "node_20"
+ "acl27" : "node_23"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl97",
- "id" : 10,
+ "name" : "tbl_acl98",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 97,
+ "line" : 98,
"column" : 21,
"source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
},
@@ -5760,25 +5852,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
- "actions" : ["acl97"],
- "base_default_next" : "node_22",
+ "action_ids" : [42],
+ "actions" : ["acl98"],
+ "base_default_next" : "node_25",
"next_tables" : {
- "acl97" : "node_22"
+ "acl98" : "node_25"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 42,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl101",
- "id" : 11,
+ "name" : "tbl_acl102",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 101,
+ "line" : 102,
"column" : 25,
"source_fragment" : "= hdr.inner_tcp.sport; ..."
},
@@ -5789,25 +5881,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
- "actions" : ["acl101"],
+ "action_ids" : [40],
+ "actions" : ["acl102"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl101" : "FabricIngress.acl.acl"
+ "acl102" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl104",
- "id" : 12,
+ "name" : "tbl_acl105",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 104,
+ "line" : 105,
"column" : 25,
"source_fragment" : "= hdr.inner_udp.sport; ..."
},
@@ -5818,25 +5910,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
- "actions" : ["acl104"],
+ "action_ids" : [41],
+ "actions" : ["acl105"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl104" : "FabricIngress.acl.acl"
+ "acl105" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl108",
- "id" : 13,
+ "name" : "tbl_acl109",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 108,
+ "line" : 109,
"column" : 21,
"source_fragment" : "= hdr.ipv4.src_addr; ..."
},
@@ -5847,25 +5939,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
- "actions" : ["acl108"],
- "base_default_next" : "node_28",
+ "action_ids" : [45],
+ "actions" : ["acl109"],
+ "base_default_next" : "node_31",
"next_tables" : {
- "acl108" : "node_28"
+ "acl109" : "node_31"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl112",
- "id" : 14,
+ "name" : "tbl_acl113",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 112,
+ "line" : 113,
"column" : 25,
"source_fragment" : "= hdr.tcp.sport; ..."
},
@@ -5876,25 +5968,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
- "actions" : ["acl112"],
+ "action_ids" : [43],
+ "actions" : ["acl113"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl112" : "FabricIngress.acl.acl"
+ "acl113" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl115",
- "id" : 15,
+ "name" : "tbl_acl116",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 115,
+ "line" : 116,
"column" : 25,
"source_fragment" : "= hdr.udp.sport; ..."
},
@@ -5905,14 +5997,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
- "actions" : ["acl115"],
+ "action_ids" : [44],
+ "actions" : ["acl116"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl115" : "FabricIngress.acl.acl"
+ "acl116" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5920,7 +6012,7 @@
},
{
"name" : "FabricIngress.acl.acl",
- "id" : 16,
+ "id" : 18,
"source_info" : {
"filename" : "include/control/acl.p4",
"line" : 66,
@@ -5999,6 +6091,12 @@
"name" : "l4_dport",
"target" : ["scalars", "acl_l4_dport"],
"mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "port_type",
+ "target" : ["scalars", "userMetadata._port_type27"],
+ "mask" : null
}
],
"match_type" : "ternary",
@@ -6007,18 +6105,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [24, 25, 26, 27, 28],
+ "action_ids" : [28, 29, 30, 31, 32],
"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_33",
+ "base_default_next" : "node_36",
"next_tables" : {
- "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"
+ "FabricIngress.acl.set_next_id_acl" : "node_36",
+ "FabricIngress.acl.punt_to_cpu" : "node_36",
+ "FabricIngress.acl.set_clone_session_id" : "node_36",
+ "FabricIngress.acl.drop" : "node_36",
+ "FabricIngress.acl.nop_acl" : "node_36"
},
"default_entry" : {
- "action_id" : 28,
+ "action_id" : 32,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6026,10 +6124,10 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 17,
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 202,
+ "line" : 138,
"column" : 10,
"source_fragment" : "hashed"
},
@@ -6048,22 +6146,21 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31, 32, 33, 6],
- "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+ "action_ids" : [33, 34, 7],
+ "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "nop"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
"FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
"FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
- "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
"nop" : "FabricIngress.next.multicast"
}
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 18,
+ "id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 236,
+ "line" : 171,
"column" : 10,
"source_fragment" : "multicast"
},
@@ -6081,53 +6178,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34, 7],
+ "action_ids" : [35, 8],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
- "base_default_next" : "FabricIngress.next.next_vlan",
+ "base_default_next" : "node_39",
"next_tables" : {
- "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
- "nop" : "FabricIngress.next.next_vlan"
+ "FabricIngress.next.set_mcast_group_id" : "node_39",
+ "nop" : "node_39"
},
"default_entry" : {
- "action_id" : 7,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "FabricIngress.next.next_vlan",
- "id" : 19,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 86,
- "column" : 10,
- "source_fragment" : "next_vlan"
- },
- "key" : [
- {
- "match_type" : "exact",
- "name" : "next_id",
- "target" : ["scalars", "userMetadata._next_id13"],
- "mask" : null
- }
- ],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : true,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [29, 30, 5],
- "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
- "base_default_next" : "node_37",
- "next_tables" : {
- "FabricIngress.next.set_vlan" : "node_37",
- "FabricIngress.next.set_double_vlan" : "node_37",
- "nop" : "node_37"
- },
- "default_entry" : {
- "action_id" : 5,
+ "action_id" : 8,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6135,7 +6194,7 @@
},
{
"name" : "tbl_port_counter31",
- "id" : 20,
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -6149,14 +6208,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [47],
"actions" : ["port_counter31"],
- "base_default_next" : "node_39",
+ "base_default_next" : "node_41",
"next_tables" : {
- "port_counter31" : "node_39"
+ "port_counter31" : "node_41"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6164,7 +6223,7 @@
},
{
"name" : "tbl_port_counter34",
- "id" : 21,
+ "id" : 22,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -6178,14 +6237,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [48],
"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" : 47,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6193,7 +6252,7 @@
},
{
"name" : "FabricIngress.bng_ingress.t_line_map",
- "id" : 22,
+ "id" : 23,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 323,
@@ -6220,14 +6279,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15],
+ "action_ids" : [16],
"actions" : ["FabricIngress.bng_ingress.set_line"],
- "base_default_next" : "node_42",
+ "base_default_next" : "node_44",
"next_tables" : {
- "FabricIngress.bng_ingress.set_line" : "node_42"
+ "FabricIngress.bng_ingress.set_line" : "node_44"
},
"default_entry" : {
- "action_id" : 15,
+ "action_id" : 16,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -6235,7 +6294,7 @@
},
{
"name" : "tbl_bng342",
- "id" : 23,
+ "id" : 24,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 342,
@@ -6249,14 +6308,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
+ "action_ids" : [50],
"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" : 49,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6264,7 +6323,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
- "id" : 24,
+ "id" : 25,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 51,
@@ -6291,12 +6350,12 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [8, 0],
+ "action_ids" : [9, 0],
"actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_bng126",
- "__MISS__" : "node_46"
+ "__MISS__" : "node_48"
},
"default_entry" : {
"action_id" : 0,
@@ -6307,7 +6366,7 @@
},
{
"name" : "tbl_bng126",
- "id" : 25,
+ "id" : 26,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 126,
@@ -6321,14 +6380,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
+ "action_ids" : [49],
"actions" : ["bng126"],
- "base_default_next" : "node_46",
+ "base_default_next" : "node_48",
"next_tables" : {
- "bng126" : "node_46"
+ "bng126" : "node_48"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6336,7 +6395,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
- "id" : 26,
+ "id" : 27,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 87,
@@ -6369,7 +6428,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10, 9],
+ "action_ids" : [11, 10],
"actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
"base_default_next" : null,
"next_tables" : {
@@ -6377,7 +6436,7 @@
"FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
},
"default_entry" : {
- "action_id" : 9,
+ "action_id" : 10,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6385,7 +6444,7 @@
},
{
"name" : "tbl_bng131",
- "id" : 27,
+ "id" : 28,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 131,
@@ -6399,14 +6458,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
+ "action_ids" : [51],
"actions" : ["bng131"],
"base_default_next" : null,
"next_tables" : {
"bng131" : null
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6414,7 +6473,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
- "id" : 28,
+ "id" : 29,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 169,
@@ -6435,12 +6494,12 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [1, 11, 12],
+ "action_ids" : [1, 12, 13],
"actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
"base_default_next" : null,
"next_tables" : {
"__MISS__" : null,
- "__HIT__" : "node_51"
+ "__HIT__" : "node_53"
},
"default_entry" : {
"action_id" : 1,
@@ -6451,7 +6510,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
- "id" : 29,
+ "id" : 30,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 194,
@@ -6490,7 +6549,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [13, 14],
+ "action_ids" : [14, 15],
"actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
"base_default_next" : null,
"next_tables" : {
@@ -6498,7 +6557,7 @@
"FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng241"
},
"default_entry" : {
- "action_id" : 14,
+ "action_id" : 15,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6506,7 +6565,7 @@
},
{
"name" : "tbl_bng238",
- "id" : 30,
+ "id" : 31,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 238,
@@ -6520,14 +6579,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51],
+ "action_ids" : [52],
"actions" : ["bng238"],
"base_default_next" : null,
"next_tables" : {
"bng238" : null
},
"default_entry" : {
- "action_id" : 51,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6535,7 +6594,7 @@
},
{
"name" : "tbl_bng241",
- "id" : 31,
+ "id" : 32,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 241,
@@ -6549,14 +6608,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
+ "action_ids" : [53],
"actions" : ["bng241"],
"base_default_next" : null,
"next_tables" : {
"bng241" : null
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6569,7 +6628,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 183,
+ "line" : 125,
"column" : 57,
"source_fragment" : "hashed_selector"
},
@@ -6630,7 +6689,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 110,
+ "line" : 112,
"column" : 12,
"source_fragment" : "hdr.vlan_tag.isValid()"
},
@@ -6645,7 +6704,7 @@
}
}
},
- "true_next" : "tbl_filtering111",
+ "true_next" : "tbl_filtering113",
"false_next" : "node_6"
},
{
@@ -6653,7 +6712,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 116,
+ "line" : 118,
"column" : 12,
"source_fragment" : "hdr.inner_vlan_tag.isValid()"
},
@@ -6668,7 +6727,7 @@
}
}
},
- "true_next" : "tbl_filtering117",
+ "true_next" : "tbl_filtering119",
"false_next" : "node_8"
},
{
@@ -6676,7 +6735,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 122,
+ "line" : 124,
"column" : 12,
"source_fragment" : "!hdr.mpls.isValid()"
},
@@ -6698,7 +6757,7 @@
}
}
},
- "true_next" : "tbl_filtering127",
+ "true_next" : "tbl_filtering129",
"false_next" : "FabricIngress.filtering.ingress_port_vlan"
},
{
@@ -6706,7 +6765,7 @@
"id" : 4,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 69,
+ "line" : 71,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_forwarding"
},
@@ -6729,7 +6788,7 @@
}
},
"true_next" : "node_13",
- "false_next" : "tbl_acl27"
+ "false_next" : "node_19"
},
{
"name" : "node_13",
@@ -6807,14 +6866,44 @@
}
},
"true_next" : "FabricIngress.forwarding.routing_v4",
+ "false_next" : "node_19"
+ },
+ {
+ "name" : "node_19",
+ "id" : 8,
+ "source_info" : {
+ "filename" : "fabric.p4",
+ "line" : 74,
+ "column" : 12,
+ "source_fragment" : "fabric_metadata.skip_next"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "not",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata._skip_next11"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "FabricIngress.pre_next.next_mpls",
"false_next" : "tbl_acl27"
},
{
- "name" : "node_20",
- "id" : 8,
+ "name" : "node_23",
+ "id" : 9,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 96,
+ "line" : 97,
"column" : 12,
"source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
},
@@ -6846,15 +6935,15 @@
}
}
},
- "true_next" : "tbl_acl97",
- "false_next" : "node_26"
+ "true_next" : "tbl_acl98",
+ "false_next" : "node_29"
},
{
- "name" : "node_22",
- "id" : 9,
+ "name" : "node_25",
+ "id" : 10,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 100,
+ "line" : 101,
"column" : 16,
"source_fragment" : "hdr.inner_tcp.isValid()"
},
@@ -6869,15 +6958,15 @@
}
}
},
- "true_next" : "tbl_acl101",
- "false_next" : "node_24"
+ "true_next" : "tbl_acl102",
+ "false_next" : "node_27"
},
{
- "name" : "node_24",
- "id" : 10,
+ "name" : "node_27",
+ "id" : 11,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 103,
+ "line" : 104,
"column" : 23,
"source_fragment" : "hdr.inner_udp.isValid()"
},
@@ -6892,15 +6981,15 @@
}
}
},
- "true_next" : "tbl_acl104",
+ "true_next" : "tbl_acl105",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_26",
- "id" : 11,
+ "name" : "node_29",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 107,
+ "line" : 108,
"column" : 19,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -6915,15 +7004,15 @@
}
}
},
- "true_next" : "tbl_acl108",
+ "true_next" : "tbl_acl109",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_28",
- "id" : 12,
+ "name" : "node_31",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 111,
+ "line" : 112,
"column" : 16,
"source_fragment" : "hdr.tcp.isValid()"
},
@@ -6938,15 +7027,15 @@
}
}
},
- "true_next" : "tbl_acl112",
- "false_next" : "node_30"
+ "true_next" : "tbl_acl113",
+ "false_next" : "node_33"
},
{
- "name" : "node_30",
- "id" : 13,
+ "name" : "node_33",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 114,
+ "line" : 115,
"column" : 23,
"source_fragment" : "hdr.udp.isValid()"
},
@@ -6961,15 +7050,15 @@
}
}
},
- "true_next" : "tbl_acl115",
+ "true_next" : "tbl_acl116",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_33",
- "id" : 14,
+ "name" : "node_36",
+ "id" : 15,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 73,
+ "line" : 78,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_next"
},
@@ -6995,8 +7084,8 @@
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_37",
- "id" : 15,
+ "name" : "node_39",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -7018,11 +7107,11 @@
}
},
"true_next" : "tbl_port_counter31",
- "false_next" : "node_39"
+ "false_next" : "node_41"
},
{
- "name" : "node_39",
- "id" : 16,
+ "name" : "node_41",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -7047,8 +7136,8 @@
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_42",
- "id" : 17,
+ "name" : "node_44",
+ "id" : 18,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 341,
@@ -7070,8 +7159,8 @@
"false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
},
{
- "name" : "node_46",
- "id" : 18,
+ "name" : "node_48",
+ "id" : 19,
"expression" : {
"type" : "expression",
"value" : {
@@ -7091,11 +7180,11 @@
}
},
"false_next" : null,
- "true_next" : "node_47"
+ "true_next" : "node_49"
},
{
- "name" : "node_47",
- "id" : 19,
+ "name" : "node_49",
+ "id" : 20,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 128,
@@ -7117,8 +7206,8 @@
"true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
},
{
- "name" : "node_51",
- "id" : 20,
+ "name" : "node_53",
+ "id" : 21,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 235,
@@ -7146,15 +7235,15 @@
"id" : 1,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 91,
+ "line" : 96,
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_57",
+ "init_table" : "node_59",
"tables" : [
{
"name" : "tbl_packetio41",
- "id" : 32,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -7168,14 +7257,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
+ "action_ids" : [62],
"actions" : ["packetio41"],
- "base_default_next" : "node_59",
+ "base_default_next" : "node_61",
"next_tables" : {
- "packetio41" : "node_59"
+ "packetio41" : "node_61"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7183,7 +7272,7 @@
},
{
"name" : "tbl_packetio44",
- "id" : 33,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -7197,25 +7286,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [62],
+ "action_ids" : [63],
"actions" : ["packetio44"],
- "base_default_next" : "node_61",
+ "base_default_next" : "node_63",
"next_tables" : {
- "packetio44" : "node_61"
+ "packetio44" : "node_63"
},
"default_entry" : {
- "action_id" : 62,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next349",
- "id" : 34,
+ "name" : "tbl_next283",
+ "id" : 35,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 349,
+ "line" : 283,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -7226,14 +7315,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [63],
- "actions" : ["next349"],
- "base_default_next" : "node_63",
+ "action_ids" : [64],
+ "actions" : ["next283"],
+ "base_default_next" : "node_65",
"next_tables" : {
- "next349" : "node_63"
+ "next283" : "node_65"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7241,10 +7330,10 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 35,
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 353,
+ "line" : 287,
"column" : 36,
"source_fragment" : "pop_mpls_if_present()"
},
@@ -7255,14 +7344,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54],
+ "action_ids" : [55],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
- "base_default_next" : "node_67",
+ "base_default_next" : "node_69",
"next_tables" : {
- "FabricEgress.egress_next.pop_mpls_if_present" : "node_67"
+ "FabricEgress.egress_next.pop_mpls_if_present" : "node_69"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7270,10 +7359,10 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 36,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 355,
+ "line" : 289,
"column" : 12,
"source_fragment" : "set_mpls()"
},
@@ -7284,14 +7373,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
+ "action_ids" : [56],
"actions" : ["FabricEgress.egress_next.set_mpls"],
- "base_default_next" : "node_67",
+ "base_default_next" : "node_69",
"next_tables" : {
- "FabricEgress.egress_next.set_mpls" : "node_67"
+ "FabricEgress.egress_next.set_mpls" : "node_69"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 56,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7299,10 +7388,10 @@
},
{
"name" : "tbl_egress_next_push_outer_vlan",
- "id" : 37,
+ "id" : 38,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 361,
+ "line" : 295,
"column" : 12,
"source_fragment" : "push_outer_vlan()"
},
@@ -7313,14 +7402,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56],
+ "action_ids" : [57],
"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" : 56,
+ "action_id" : 57,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7328,10 +7417,10 @@
},
{
"name" : "tbl_egress_next_push_inner_vlan",
- "id" : 38,
+ "id" : 39,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 362,
+ "line" : 296,
"column" : 12,
"source_fragment" : "push_inner_vlan()"
},
@@ -7342,25 +7431,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
+ "action_ids" : [58],
"actions" : ["FabricEgress.egress_next.push_inner_vlan"],
- "base_default_next" : "node_72",
+ "base_default_next" : "node_74",
"next_tables" : {
- "FabricEgress.egress_next.push_inner_vlan" : "node_72"
+ "FabricEgress.egress_next.push_inner_vlan" : "node_74"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 58,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next365",
- "id" : 39,
+ "name" : "tbl_next299",
+ "id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 365,
+ "line" : 299,
"column" : 12,
"source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
},
@@ -7371,14 +7460,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
- "actions" : ["next365"],
+ "action_ids" : [65],
+ "actions" : ["next299"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
- "next365" : "FabricEgress.egress_next.egress_vlan"
+ "next299" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 65,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7386,10 +7475,10 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 40,
+ "id" : 41,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 331,
+ "line" : 265,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -7413,27 +7502,27 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58, 59, 60],
+ "action_ids" : [59, 60, 61],
"actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
- "base_default_next" : "node_72",
+ "base_default_next" : "node_74",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_72",
- "FabricEgress.egress_next.pop_vlan" : "node_72",
- "FabricEgress.egress_next.drop" : "node_72"
+ "FabricEgress.egress_next.push_vlan" : "node_74",
+ "FabricEgress.egress_next.pop_vlan" : "node_74",
+ "FabricEgress.egress_next.drop" : "node_74"
},
"default_entry" : {
- "action_id" : 60,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next375",
- "id" : 41,
+ "name" : "tbl_next309",
+ "id" : 42,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 375,
+ "line" : 309,
"column" : 25,
"source_fragment" : "="
},
@@ -7444,25 +7533,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [66],
- "actions" : ["next375"],
- "base_default_next" : "node_74",
+ "action_ids" : [67],
+ "actions" : ["next309"],
+ "base_default_next" : "node_76",
"next_tables" : {
- "next375" : "node_74"
+ "next309" : "node_76"
},
"default_entry" : {
- "action_id" : 66,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next376",
- "id" : 42,
+ "name" : "tbl_next310",
+ "id" : 43,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 310,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -7473,25 +7562,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [65],
- "actions" : ["next376"],
- "base_default_next" : "node_80",
+ "action_ids" : [66],
+ "actions" : ["next310"],
+ "base_default_next" : "node_82",
"next_tables" : {
- "next376" : "node_80"
+ "next310" : "node_82"
},
"default_entry" : {
- "action_id" : 65,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next379",
- "id" : 43,
+ "name" : "tbl_next313",
+ "id" : 44,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 379,
+ "line" : 313,
"column" : 29,
"source_fragment" : "="
},
@@ -7502,25 +7591,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [68],
- "actions" : ["next379"],
- "base_default_next" : "node_78",
+ "action_ids" : [69],
+ "actions" : ["next313"],
+ "base_default_next" : "node_80",
"next_tables" : {
- "next379" : "node_78"
+ "next313" : "node_80"
},
"default_entry" : {
- "action_id" : 68,
+ "action_id" : 69,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next380",
- "id" : 44,
+ "name" : "tbl_next314",
+ "id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -7531,14 +7620,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [67],
- "actions" : ["next380"],
- "base_default_next" : "node_80",
+ "action_ids" : [68],
+ "actions" : ["next314"],
+ "base_default_next" : "node_82",
"next_tables" : {
- "next380" : "node_80"
+ "next314" : "node_82"
},
"default_entry" : {
- "action_id" : 67,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7546,7 +7635,7 @@
},
{
"name" : "tbl_bng_egress_downstream_encap_v4",
- "id" : 45,
+ "id" : 46,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 297,
@@ -7560,14 +7649,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [53],
+ "action_ids" : [54],
"actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.bng_egress.downstream.encap_v4" : null
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7577,11 +7666,11 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_57",
- "id" : 21,
+ "name" : "node_59",
+ "id" : 22,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 103,
+ "line" : 108,
"column" : 33,
"source_fragment" : "fabric_metadata"
},
@@ -7597,11 +7686,11 @@
}
},
"true_next" : "tbl_packetio41",
- "false_next" : "node_59"
+ "false_next" : "node_61"
},
{
- "name" : "node_59",
- "id" : 22,
+ "name" : "node_61",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -7623,14 +7712,14 @@
}
},
"true_next" : "tbl_packetio44",
- "false_next" : "node_61"
+ "false_next" : "node_63"
},
{
- "name" : "node_61",
- "id" : 23,
+ "name" : "node_63",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 347,
+ "line" : 281,
"column" : 12,
"source_fragment" : "fabric_metadata.is_multicast == true ..."
},
@@ -7665,15 +7754,15 @@
}
}
},
- "true_next" : "tbl_next349",
- "false_next" : "node_63"
+ "true_next" : "tbl_next283",
+ "false_next" : "node_65"
},
{
- "name" : "node_63",
- "id" : 24,
+ "name" : "node_65",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 352,
+ "line" : 286,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_label == 0"
},
@@ -7691,15 +7780,15 @@
}
}
},
- "true_next" : "node_64",
+ "true_next" : "node_66",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_64",
- "id" : 25,
+ "name" : "node_66",
+ "id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 353,
+ "line" : 287,
"column" : 16,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -7715,14 +7804,14 @@
}
},
"true_next" : "tbl_egress_next_pop_mpls_if_present",
- "false_next" : "node_67"
+ "false_next" : "node_69"
},
{
- "name" : "node_67",
- "id" : 26,
+ "name" : "node_69",
+ "id" : 27,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 104,
+ "line" : 109,
"column" : 31,
"source_fragment" : "fabric_metadata"
},
@@ -7738,14 +7827,14 @@
}
},
"true_next" : "tbl_egress_next_push_outer_vlan",
- "false_next" : "tbl_next365"
+ "false_next" : "tbl_next299"
},
{
- "name" : "node_72",
- "id" : 27,
+ "name" : "node_74",
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 374,
+ "line" : 308,
"column" : 12,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -7760,15 +7849,15 @@
}
}
},
- "true_next" : "tbl_next375",
- "false_next" : "node_76"
+ "true_next" : "tbl_next309",
+ "false_next" : "node_78"
},
{
- "name" : "node_74",
- "id" : 28,
+ "name" : "node_76",
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 310,
"column" : 16,
"source_fragment" : "hdr.mpls.ttl == 0"
},
@@ -7786,15 +7875,15 @@
}
}
},
- "true_next" : "tbl_next376",
- "false_next" : "node_80"
+ "true_next" : "tbl_next310",
+ "false_next" : "node_82"
},
{
- "name" : "node_76",
- "id" : 29,
+ "name" : "node_78",
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 378,
+ "line" : 312,
"column" : 15,
"source_fragment" : "hdr.ipv4.isValid() && fabric_metadata.fwd_type != FWD_BRIDGING"
},
@@ -7829,15 +7918,15 @@
}
}
},
- "true_next" : "tbl_next379",
- "false_next" : "node_80"
+ "true_next" : "tbl_next313",
+ "false_next" : "node_82"
},
{
- "name" : "node_78",
- "id" : 30,
+ "name" : "node_80",
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl == 0"
},
@@ -7855,12 +7944,12 @@
}
}
},
- "true_next" : "tbl_next380",
- "false_next" : "node_80"
+ "true_next" : "tbl_next314",
+ "false_next" : "node_82"
},
{
- "name" : "node_80",
- "id" : 31,
+ "name" : "node_82",
+ "id" : 32,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 358,
@@ -7882,11 +7971,11 @@
}
},
"false_next" : null,
- "true_next" : "node_81"
+ "true_next" : "node_83"
},
{
- "name" : "node_81",
- "id" : 32,
+ "name" : "node_83",
+ "id" : 33,
"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 6124129..29aa49f 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
@@ -315,6 +315,57 @@
}
tables {
preamble {
+ id: 36626242
+ name: "FabricIngress.pre_next.next_mpls"
+ alias: "next_mpls"
+ }
+ match_fields {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 22765924
+ }
+ action_refs {
+ id: 28485346
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ const_default_action_id: 28485346
+ direct_resource_ids: 330020245
+ size: 1024
+}
+tables {
+ preamble {
+ id: 48011802
+ name: "FabricIngress.pre_next.next_vlan"
+ alias: "next_vlan"
+ }
+ match_fields {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 33475378
+ }
+ action_refs {
+ id: 26738842
+ }
+ action_refs {
+ id: 28485346
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ const_default_action_id: 28485346
+ direct_resource_ids: 333692067
+ size: 1024
+}
+tables {
+ preamble {
id: 44104738
name: "FabricIngress.acl.acl"
alias: "acl"
@@ -391,6 +442,12 @@
bitwidth: 16
match_type: TERNARY
}
+ match_fields {
+ id: 13
+ name: "port_type"
+ bitwidth: 2
+ match_type: TERNARY
+ }
action_refs {
id: 23623126
}
@@ -412,33 +469,6 @@
}
tables {
preamble {
- id: 35696861
- name: "FabricIngress.next.next_vlan"
- alias: "next_vlan"
- }
- match_fields {
- id: 1
- name: "next_id"
- bitwidth: 32
- match_type: EXACT
- }
- action_refs {
- id: 22099101
- }
- action_refs {
- id: 17655305
- }
- action_refs {
- id: 28485346
- annotations: "@defaultonly"
- scope: DEFAULT_ONLY
- }
- const_default_action_id: 28485346
- direct_resource_ids: 326370320
- size: 1024
-}
-tables {
- preamble {
id: 47960972
name: "FabricIngress.next.hashed"
alias: "hashed"
@@ -456,9 +486,6 @@
id: 20985706
}
action_refs {
- id: 27920375
- }
- action_refs {
id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
@@ -611,6 +638,11 @@
name: "FabricIngress.filtering.permit"
alias: "permit"
}
+ params {
+ id: 1
+ name: "port_type"
+ bitwidth: 2
+ }
}
actions {
preamble {
@@ -623,6 +655,11 @@
name: "vlan_id"
bitwidth: 12
}
+ params {
+ id: 2
+ name: "port_type"
+ bitwidth: 2
+ }
}
actions {
preamble {
@@ -681,6 +718,47 @@
}
actions {
preamble {
+ id: 22765924
+ name: "FabricIngress.pre_next.set_mpls_label"
+ alias: "set_mpls_label"
+ }
+ params {
+ id: 1
+ name: "label"
+ bitwidth: 20
+ }
+}
+actions {
+ preamble {
+ id: 33475378
+ name: "FabricIngress.pre_next.set_vlan"
+ alias: "set_vlan"
+ }
+ params {
+ id: 1
+ name: "vlan_id"
+ bitwidth: 12
+ }
+}
+actions {
+ preamble {
+ id: 26738842
+ name: "FabricIngress.pre_next.set_double_vlan"
+ alias: "set_double_vlan"
+ }
+ params {
+ id: 1
+ name: "outer_vlan_id"
+ bitwidth: 12
+ }
+ params {
+ id: 2
+ name: "inner_vlan_id"
+ bitwidth: 12
+ }
+}
+actions {
+ preamble {
id: 23623126
name: "FabricIngress.acl.set_next_id_acl"
alias: "set_next_id_acl"
@@ -726,35 +804,6 @@
}
actions {
preamble {
- id: 22099101
- name: "FabricIngress.next.set_vlan"
- alias: "set_vlan"
- }
- params {
- id: 1
- name: "vlan_id"
- bitwidth: 12
- }
-}
-actions {
- preamble {
- id: 17655305
- name: "FabricIngress.next.set_double_vlan"
- alias: "set_double_vlan"
- }
- params {
- id: 1
- name: "outer_vlan_id"
- bitwidth: 12
- }
- params {
- id: 2
- name: "inner_vlan_id"
- bitwidth: 12
- }
-}
-actions {
- preamble {
id: 27301117
name: "FabricIngress.next.output_hashed"
alias: "output_hashed"
@@ -789,33 +838,6 @@
}
actions {
preamble {
- id: 27920375
- name: "FabricIngress.next.mpls_routing_hashed"
- alias: "mpls_routing_hashed"
- }
- params {
- id: 1
- name: "port_num"
- bitwidth: 9
- }
- params {
- id: 2
- name: "smac"
- bitwidth: 48
- }
- params {
- id: 3
- name: "dmac"
- bitwidth: 48
- }
- params {
- id: 4
- name: "label"
- bitwidth: 20
- }
-}
-actions {
- preamble {
id: 21629581
name: "FabricIngress.next.set_mcast_group_id"
alias: "set_mcast_group_id"
@@ -988,6 +1010,28 @@
}
direct_counters {
preamble {
+ id: 330020245
+ name: "FabricIngress.pre_next.next_mpls_counter"
+ alias: "next_mpls_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 36626242
+}
+direct_counters {
+ preamble {
+ id: 333692067
+ name: "FabricIngress.pre_next.next_vlan_counter"
+ alias: "next_vlan_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 48011802
+}
+direct_counters {
+ preamble {
id: 319194241
name: "FabricIngress.acl.acl_counter"
alias: "acl_counter"
@@ -999,17 +1043,6 @@
}
direct_counters {
preamble {
- id: 326370320
- name: "FabricIngress.next.next_vlan_counter"
- alias: "next_vlan_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 35696861
-}
-direct_counters {
- preamble {
id: 322798228
name: "FabricIngress.next.hashed_counter"
alias: "hashed_counter"