[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/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index f2edc55..3b0151c 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -36,7 +36,8 @@
["userMetadata.l4_dport", 16, false],
["userMetadata.ipv4_src_addr", 32, false],
["userMetadata.ipv4_dst_addr", 32, false],
- ["_padding_0", 5, false]
+ ["userMetadata.port_type", 2, false],
+ ["_padding_0", 3, false]
]
},
{
@@ -1792,7 +1793,7 @@
"binding" : "FabricIngress.filtering.fwd_classifier",
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 85,
+ "line" : 87,
"column" : 50,
"source_fragment" : "fwd_classifier_counter"
}
@@ -1822,9 +1823,33 @@
}
},
{
- "name" : "FabricIngress.acl.acl_counter",
+ "name" : "FabricIngress.pre_next.next_mpls_counter",
"id" : 4,
"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" : 5,
+ "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" : 6,
+ "is_direct" : true,
"binding" : "FabricIngress.acl.acl",
"source_info" : {
"filename" : "include/control/acl.p4",
@@ -1834,56 +1859,44 @@
}
},
{
- "name" : "FabricIngress.next.next_vlan_counter",
- "id" : 5,
- "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.xconnect_counter",
- "id" : 6,
+ "id" : 7,
"is_direct" : true,
"binding" : "FabricIngress.next.xconnect",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 107,
+ "line" : 56,
"column" : 50,
"source_fragment" : "xconnect_counter"
}
},
{
"name" : "FabricIngress.next.hashed_counter",
- "id" : 7,
+ "id" : 8,
"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" : 8,
+ "id" : 9,
"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" : 9,
+ "id" : 10,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 26,
@@ -1895,7 +1908,7 @@
},
{
"name" : "FabricIngress.port_counters_control.ingress_port_counter",
- "id" : 10,
+ "id" : 11,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 27,
@@ -1907,12 +1920,12 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan_counter",
- "id" : 11,
+ "id" : 12,
"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"
}
@@ -2088,9 +2101,15 @@
"primitives" : []
},
{
- "name" : "FabricIngress.filtering.deny",
+ "name" : "nop",
"id" : 7,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.filtering.deny",
+ "id" : 8,
+ "runtime_data" : [],
"primitives" : [
{
"op" : "assign",
@@ -2149,22 +2168,70 @@
"column" : 8,
"source_fragment" : "fabric_metadata.skip_next = true"
}
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata.port_type"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 119,
+ "column" : 38,
+ "source_fragment" : "0x0; ..."
+ }
}
]
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 8,
- "runtime_data" : [],
- "primitives" : []
+ "id" : 9,
+ "runtime_data" : [
+ {
+ "name" : "port_type",
+ "bitwidth" : 2
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata.port_type"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 44,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.port_type = port_type"
+ }
+ }
+ ]
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 9,
+ "id" : 10,
"runtime_data" : [
{
"name" : "vlan_id",
"bitwidth" : 12
+ },
+ {
+ "name" : "port_type",
+ "bitwidth" : 2
}
],
"primitives" : [
@@ -2182,16 +2249,35 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 47,
+ "line" : 49,
"column" : 8,
"source_fragment" : "fabric_metadata.vlan_id = vlan_id"
}
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata.port_type"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 44,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.port_type = port_type; ..."
+ }
}
]
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 10,
+ "id" : 11,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -2213,7 +2299,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 88,
+ "line" : 90,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -2222,7 +2308,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 11,
+ "id" : 12,
"runtime_data" : [
{
"name" : "next_id",
@@ -2253,7 +2339,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 12,
+ "id" : 13,
"runtime_data" : [
{
"name" : "next_id",
@@ -2303,7 +2389,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 13,
+ "id" : 14,
"runtime_data" : [
{
"name" : "next_id",
@@ -2334,13 +2420,75 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 14,
+ "id" : 15,
"runtime_data" : [],
"primitives" : []
},
{
+ "name" : "FabricIngress.pre_next.set_mpls_label",
+ "id" : 16,
+ "runtime_data" : [
+ {
+ "name" : "label",
+ "bitwidth" : 20
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata.mpls_label"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 32,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.mpls_label = label"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.pre_next.set_vlan",
+ "id" : 17,
+ "runtime_data" : [
+ {
+ "name" : "vlan_id",
+ "bitwidth" : 12
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "userMetadata.vlan_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/pre_next.p4",
+ "line" : 57,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+ }
+ }
+ ]
+ },
+ {
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 15,
+ "id" : 18,
"runtime_data" : [
{
"name" : "next_id",
@@ -2371,7 +2519,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 16,
+ "id" : 19,
"runtime_data" : [],
"primitives" : [
{
@@ -2426,7 +2574,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 17,
+ "id" : 20,
"runtime_data" : [
{
"name" : "clone_id",
@@ -2457,7 +2605,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 18,
+ "id" : 21,
"runtime_data" : [],
"primitives" : [
{
@@ -2508,105 +2656,12 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 19,
+ "id" : 22,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "FabricIngress.next.set_vlan",
- "id" : 20,
- "runtime_data" : [
- {
- "name" : "vlan_id",
- "bitwidth" : 12
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata.vlan_id"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 70,
- "column" : 8,
- "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
- }
- }
- ]
- },
- {
"name" : "FabricIngress.next.output_xconnect",
- "id" : 21,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- }
- ],
- "primitives" : [
- {
- "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_next_id_xconnect",
- "id" : 22,
- "runtime_data" : [
- {
- "name" : "next_id",
- "bitwidth" : 32
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "userMetadata.next_id"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 115,
- "column" : 8,
- "source_fragment" : "fabric_metadata.next_id = next_id"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.output_hashed",
"id" : 23,
"runtime_data" : [
{
@@ -2637,20 +2692,12 @@
]
},
{
- "name" : "FabricIngress.next.routing_hashed",
+ "name" : "FabricIngress.next.set_next_id_xconnect",
"id" : 24,
"runtime_data" : [
{
- "name" : "port_num",
- "bitwidth" : 9
- },
- {
- "name" : "smac",
- "bitwidth" : 48
- },
- {
- "name" : "dmac",
- "bitwidth" : 48
+ "name" : "next_id",
+ "bitwidth" : 32
}
],
"primitives" : [
@@ -2659,39 +2706,32 @@
"parameters" : [
{
"type" : "field",
- "value" : ["ethernet", "src_addr"]
+ "value" : ["scalars", "userMetadata.next_id"]
},
{
"type" : "runtime_data",
- "value" : 1
+ "value" : 0
}
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 36,
+ "line" : 64,
"column" : 8,
- "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ "source_fragment" : "fabric_metadata.next_id = next_id"
}
- },
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.output_hashed",
+ "id" : 25,
+ "runtime_data" : [
{
- "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; ..."
- }
- },
+ "name" : "port_num",
+ "bitwidth" : 9
+ }
+ ],
+ "primitives" : [
{
"op" : "assign",
"parameters" : [
@@ -2714,8 +2754,8 @@
]
},
{
- "name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 25,
+ "name" : "FabricIngress.next.routing_hashed",
+ "id" : 26,
"runtime_data" : [
{
"name" : "port_num",
@@ -2728,10 +2768,6 @@
{
"name" : "dmac",
"bitwidth" : 48
- },
- {
- "name" : "label",
- "bitwidth" : 20
}
],
"primitives" : [
@@ -2740,25 +2776,6 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "userMetadata.mpls_label"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 46,
- "column" : 8,
- "source_fragment" : "fabric_metadata.mpls_label = label; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
"value" : ["ethernet", "src_addr"]
},
{
@@ -2815,7 +2832,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 26,
+ "id" : 27,
"runtime_data" : [
{
"name" : "group_id",
@@ -2837,7 +2854,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 231,
+ "line" : 166,
"column" : 8,
"source_fragment" : "standard_metadata.mcast_grp = group_id"
}
@@ -2866,7 +2883,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 232,
+ "line" : 167,
"column" : 8,
"source_fragment" : "fabric_metadata.is_multicast = true"
}
@@ -2875,7 +2892,7 @@
},
{
"name" : "packetio25",
- "id" : 27,
+ "id" : 28,
"runtime_data" : [],
"primitives" : [
{
@@ -2954,8 +2971,8 @@
]
},
{
- "name" : "filtering111",
- "id" : 28,
+ "name" : "filtering113",
+ "id" : 29,
"runtime_data" : [],
"primitives" : [
{
@@ -2972,7 +2989,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 111,
+ "line" : 113,
"column" : 12,
"source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
}
@@ -2991,7 +3008,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 112,
+ "line" : 114,
"column" : 12,
"source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
}
@@ -3010,7 +3027,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 113,
+ "line" : 115,
"column" : 12,
"source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
}
@@ -3018,8 +3035,8 @@
]
},
{
- "name" : "filtering127",
- "id" : 29,
+ "name" : "filtering129",
+ "id" : 30,
"runtime_data" : [],
"primitives" : [
{
@@ -3036,7 +3053,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 127,
+ "line" : 129,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
}
@@ -3044,8 +3061,8 @@
]
},
{
- "name" : "acl101",
- "id" : 30,
+ "name" : "acl102",
+ "id" : 31,
"runtime_data" : [],
"primitives" : [
{
@@ -3062,7 +3079,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 101,
+ "line" : 102,
"column" : 16,
"source_fragment" : "l4_sport = hdr.inner_tcp.sport"
}
@@ -3081,7 +3098,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 102,
+ "line" : 103,
"column" : 16,
"source_fragment" : "l4_dport = hdr.inner_tcp.dport"
}
@@ -3089,8 +3106,8 @@
]
},
{
- "name" : "acl104",
- "id" : 31,
+ "name" : "acl105",
+ "id" : 32,
"runtime_data" : [],
"primitives" : [
{
@@ -3107,7 +3124,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 104,
+ "line" : 105,
"column" : 16,
"source_fragment" : "l4_sport = hdr.inner_udp.sport"
}
@@ -3126,7 +3143,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 105,
+ "line" : 106,
"column" : 16,
"source_fragment" : "l4_dport = hdr.inner_udp.dport"
}
@@ -3134,8 +3151,8 @@
]
},
{
- "name" : "acl97",
- "id" : 32,
+ "name" : "acl98",
+ "id" : 33,
"runtime_data" : [],
"primitives" : [
{
@@ -3152,7 +3169,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 97,
+ "line" : 98,
"column" : 12,
"source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
}
@@ -3171,7 +3188,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 98,
+ "line" : 99,
"column" : 12,
"source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
}
@@ -3190,7 +3207,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 99,
+ "line" : 100,
"column" : 12,
"source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
}
@@ -3198,8 +3215,8 @@
]
},
{
- "name" : "acl112",
- "id" : 33,
+ "name" : "acl113",
+ "id" : 34,
"runtime_data" : [],
"primitives" : [
{
@@ -3216,7 +3233,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 112,
+ "line" : 113,
"column" : 16,
"source_fragment" : "l4_sport = hdr.tcp.sport"
}
@@ -3235,7 +3252,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 113,
+ "line" : 114,
"column" : 16,
"source_fragment" : "l4_dport = hdr.tcp.dport"
}
@@ -3243,8 +3260,8 @@
]
},
{
- "name" : "acl115",
- "id" : 34,
+ "name" : "acl116",
+ "id" : 35,
"runtime_data" : [],
"primitives" : [
{
@@ -3261,7 +3278,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 115,
+ "line" : 116,
"column" : 16,
"source_fragment" : "l4_sport = hdr.udp.sport"
}
@@ -3280,7 +3297,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 116,
+ "line" : 117,
"column" : 16,
"source_fragment" : "l4_dport = hdr.udp.dport"
}
@@ -3288,8 +3305,8 @@
]
},
{
- "name" : "acl108",
- "id" : 35,
+ "name" : "acl109",
+ "id" : 36,
"runtime_data" : [],
"primitives" : [
{
@@ -3306,7 +3323,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 108,
+ "line" : 109,
"column" : 12,
"source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
}
@@ -3325,7 +3342,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 109,
+ "line" : 110,
"column" : 12,
"source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
}
@@ -3344,7 +3361,7 @@
],
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 110,
+ "line" : 111,
"column" : 12,
"source_fragment" : "ip_proto = hdr.ipv4.protocol"
}
@@ -3353,7 +3370,7 @@
},
{
"name" : "acl27",
- "id" : 36,
+ "id" : 37,
"runtime_data" : [],
"primitives" : [
{
@@ -3455,7 +3472,7 @@
},
{
"name" : "port_counter31",
- "id" : 37,
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -3513,7 +3530,7 @@
},
{
"name" : "port_counter34",
- "id" : 38,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -3571,7 +3588,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 39,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -3584,7 +3601,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 270,
+ "line" : 204,
"column" : 8,
"source_fragment" : "hdr.mpls.setInvalid()"
}
@@ -3603,7 +3620,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"
}
@@ -3612,7 +3629,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 40,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -3625,7 +3642,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 277,
+ "line" : 211,
"column" : 8,
"source_fragment" : "hdr.mpls.setValid()"
}
@@ -3644,7 +3661,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 278,
+ "line" : 212,
"column" : 8,
"source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
}
@@ -3663,7 +3680,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 279,
+ "line" : 213,
"column" : 8,
"source_fragment" : "hdr.mpls.tc = 3w0"
}
@@ -3682,7 +3699,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 280,
+ "line" : 214,
"column" : 8,
"source_fragment" : "hdr.mpls.bos = 1w1"
}
@@ -3701,7 +3718,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 281,
+ "line" : 215,
"column" : 8,
"source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
}
@@ -3720,7 +3737,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 118,
+ "line" : 130,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -3729,7 +3746,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 41,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -3742,7 +3759,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 289,
+ "line" : 223,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setValid()"
}
@@ -3761,7 +3778,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 290,
+ "line" : 224,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
}
@@ -3780,7 +3797,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 291,
+ "line" : 225,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
}
@@ -3799,7 +3816,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 129,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3818,7 +3835,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"
}
@@ -3827,7 +3844,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 42,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -3840,7 +3857,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 322,
+ "line" : 256,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -3849,7 +3866,7 @@
},
{
"name" : "FabricEgress.egress_next.drop",
- "id" : 43,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3862,7 +3879,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 327,
+ "line" : 261,
"column" : 8,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -3871,7 +3888,7 @@
},
{
"name" : "packetio41",
- "id" : 44,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3888,7 +3905,7 @@
},
{
"name" : "packetio44",
- "id" : 45,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -3938,29 +3955,7 @@
]
},
{
- "name" : "next349",
- "id" : 46,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "mark_to_drop",
- "parameters" : [
- {
- "type" : "header",
- "value" : "standard_metadata"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 349,
- "column" : 12,
- "source_fragment" : "mark_to_drop(standard_metadata)"
- }
- }
- ]
- },
- {
- "name" : "next376",
+ "name" : "next283",
"id" : 47,
"runtime_data" : [],
"primitives" : [
@@ -3974,7 +3969,29 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 283,
+ "column" : 12,
+ "source_fragment" : "mark_to_drop(standard_metadata)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "next310",
+ "id" : 48,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "mark_to_drop",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "standard_metadata"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 310,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -3982,8 +3999,8 @@
]
},
{
- "name" : "next375",
- "id" : 48,
+ "name" : "next309",
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -4023,7 +4040,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 375,
+ "line" : 309,
"column" : 12,
"source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
}
@@ -4031,8 +4048,8 @@
]
},
{
- "name" : "next380",
- "id" : 49,
+ "name" : "next314",
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -4045,7 +4062,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -4053,8 +4070,8 @@
]
},
{
- "name" : "next379",
- "id" : 50,
+ "name" : "next313",
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -4094,7 +4111,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 379,
+ "line" : 313,
"column" : 16,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -4108,7 +4125,7 @@
"id" : 0,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 46,
+ "line" : 47,
"column" : 8,
"source_fragment" : "FabricIngress"
},
@@ -4130,25 +4147,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27],
+ "action_ids" : [28],
"actions" : ["packetio25"],
"base_default_next" : "node_4",
"next_tables" : {
"packetio25" : "node_4"
},
"default_entry" : {
- "action_id" : 27,
+ "action_id" : 28,
"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; ..."
},
@@ -4159,25 +4176,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [28],
- "actions" : ["filtering111"],
+ "action_ids" : [29],
+ "actions" : ["filtering113"],
"base_default_next" : "node_6",
"next_tables" : {
- "filtering111" : "node_6"
+ "filtering113" : "node_6"
},
"default_entry" : {
- "action_id" : 28,
+ "action_id" : 29,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_filtering127",
+ "name" : "tbl_filtering129",
"id" : 2,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 127,
+ "line" : 129,
"column" : 37,
"source_fragment" : "="
},
@@ -4188,14 +4205,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [29],
- "actions" : ["filtering127"],
+ "action_ids" : [30],
+ "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" : 29,
+ "action_id" : 30,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4206,7 +4223,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 53,
+ "line" : 55,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -4236,7 +4253,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [7, 8, 9],
+ "action_ids" : [8, 9, 10],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -4245,7 +4262,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 7,
+ "action_id" : 8,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4256,7 +4273,7 @@
"id" : 4,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 92,
+ "line" : 94,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -4292,14 +4309,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10],
+ "action_ids" : [11],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_10",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_10"
},
"default_entry" : {
- "action_id" : 10,
+ "action_id" : 11,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -4334,12 +4351,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 0],
+ "action_ids" : [12, 0],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_17",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_bridging" : "tbl_acl27",
- "nop" : "tbl_acl27"
+ "FabricIngress.forwarding.set_next_id_bridging" : "node_17",
+ "nop" : "node_17"
},
"default_entry" : {
"action_id" : 0,
@@ -4371,12 +4388,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 1],
+ "action_ids" : [13, 1],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_17",
"next_tables" : {
- "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_acl27",
- "nop" : "tbl_acl27"
+ "FabricIngress.forwarding.pop_mpls_and_next" : "node_17",
+ "nop" : "node_17"
},
"default_entry" : {
"action_id" : 1,
@@ -4408,13 +4425,13 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [13, 14, 2],
+ "action_ids" : [14, 15, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
- "base_default_next" : "tbl_acl27",
+ "base_default_next" : "node_17",
"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_17",
+ "FabricIngress.forwarding.nop_routing_v4" : "node_17",
+ "nop" : "node_17"
},
"default_entry" : {
"action_id" : 2,
@@ -4424,9 +4441,83 @@
}
},
{
- "name" : "tbl_acl27",
+ "name" : "FabricIngress.pre_next.next_mpls",
"id" : 8,
"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_id"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [16, 3],
+ "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" : 3,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.pre_next.next_vlan",
+ "id" : 9,
+ "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_id"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [17, 4],
+ "actions" : ["FabricIngress.pre_next.set_vlan", "nop"],
+ "base_default_next" : "tbl_acl27",
+ "next_tables" : {
+ "FabricIngress.pre_next.set_vlan" : "tbl_acl27",
+ "nop" : "tbl_acl27"
+ },
+ "default_entry" : {
+ "action_id" : 4,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_acl27",
+ "id" : 10,
+ "source_info" : {
"filename" : "include/control/acl.p4",
"line" : 27,
"column" : 4,
@@ -4439,25 +4530,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36],
+ "action_ids" : [37],
"actions" : ["acl27"],
- "base_default_next" : "node_18",
+ "base_default_next" : "node_21",
"next_tables" : {
- "acl27" : "node_18"
+ "acl27" : "node_21"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl97",
- "id" : 9,
+ "name" : "tbl_acl98",
+ "id" : 11,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 97,
+ "line" : 98,
"column" : 21,
"source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
},
@@ -4468,25 +4559,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32],
- "actions" : ["acl97"],
- "base_default_next" : "node_20",
+ "action_ids" : [33],
+ "actions" : ["acl98"],
+ "base_default_next" : "node_23",
"next_tables" : {
- "acl97" : "node_20"
+ "acl98" : "node_23"
},
"default_entry" : {
- "action_id" : 32,
+ "action_id" : 33,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl101",
- "id" : 10,
+ "name" : "tbl_acl102",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 101,
+ "line" : 102,
"column" : 25,
"source_fragment" : "= hdr.inner_tcp.sport; ..."
},
@@ -4497,25 +4588,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30],
- "actions" : ["acl101"],
+ "action_ids" : [31],
+ "actions" : ["acl102"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl101" : "FabricIngress.acl.acl"
+ "acl102" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 30,
+ "action_id" : 31,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl104",
- "id" : 11,
+ "name" : "tbl_acl105",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 104,
+ "line" : 105,
"column" : 25,
"source_fragment" : "= hdr.inner_udp.sport; ..."
},
@@ -4526,25 +4617,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31],
- "actions" : ["acl104"],
+ "action_ids" : [32],
+ "actions" : ["acl105"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl104" : "FabricIngress.acl.acl"
+ "acl105" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 31,
+ "action_id" : 32,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl108",
- "id" : 12,
+ "name" : "tbl_acl109",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 108,
+ "line" : 109,
"column" : 21,
"source_fragment" : "= hdr.ipv4.src_addr; ..."
},
@@ -4555,25 +4646,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
- "actions" : ["acl108"],
- "base_default_next" : "node_26",
+ "action_ids" : [36],
+ "actions" : ["acl109"],
+ "base_default_next" : "node_29",
"next_tables" : {
- "acl108" : "node_26"
+ "acl109" : "node_29"
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 36,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl112",
- "id" : 13,
+ "name" : "tbl_acl113",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 112,
+ "line" : 113,
"column" : 25,
"source_fragment" : "= hdr.tcp.sport; ..."
},
@@ -4584,25 +4675,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
- "actions" : ["acl112"],
+ "action_ids" : [34],
+ "actions" : ["acl113"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl112" : "FabricIngress.acl.acl"
+ "acl113" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 33,
+ "action_id" : 34,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_acl115",
- "id" : 14,
+ "name" : "tbl_acl116",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 115,
+ "line" : 116,
"column" : 25,
"source_fragment" : "= hdr.udp.sport; ..."
},
@@ -4613,14 +4704,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34],
- "actions" : ["acl115"],
+ "action_ids" : [35],
+ "actions" : ["acl116"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
- "acl115" : "FabricIngress.acl.acl"
+ "acl116" : "FabricIngress.acl.acl"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 35,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4628,7 +4719,7 @@
},
{
"name" : "FabricIngress.acl.acl",
- "id" : 15,
+ "id" : 17,
"source_info" : {
"filename" : "include/control/acl.p4",
"line" : 66,
@@ -4707,6 +4798,12 @@
"name" : "l4_dport",
"target" : ["scalars", "acl_l4_dport"],
"mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "port_type",
+ "target" : ["scalars", "userMetadata.port_type"],
+ "mask" : null
}
],
"match_type" : "ternary",
@@ -4715,18 +4812,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 16, 17, 18, 19],
+ "action_ids" : [18, 19, 20, 21, 22],
"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_31",
+ "base_default_next" : "node_34",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_31",
- "FabricIngress.acl.punt_to_cpu" : "node_31",
- "FabricIngress.acl.set_clone_session_id" : "node_31",
- "FabricIngress.acl.drop" : "node_31",
- "FabricIngress.acl.nop_acl" : "node_31"
+ "FabricIngress.acl.set_next_id_acl" : "node_34",
+ "FabricIngress.acl.punt_to_cpu" : "node_34",
+ "FabricIngress.acl.set_clone_session_id" : "node_34",
+ "FabricIngress.acl.drop" : "node_34",
+ "FabricIngress.acl.nop_acl" : "node_34"
},
"default_entry" : {
- "action_id" : 19,
+ "action_id" : 22,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4734,10 +4831,10 @@
},
{
"name" : "FabricIngress.next.xconnect",
- "id" : 16,
+ "id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 119,
+ "line" : 68,
"column" : 10,
"source_fragment" : "xconnect"
},
@@ -4761,7 +4858,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [21, 22, 4],
+ "action_ids" : [23, 24, 5],
"actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
@@ -4770,7 +4867,7 @@
"nop" : "FabricIngress.next.hashed"
},
"default_entry" : {
- "action_id" : 4,
+ "action_id" : 5,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4778,10 +4875,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"
},
@@ -4800,22 +4897,21 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [23, 24, 25, 5],
- "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+ "action_ids" : [25, 26, 6],
+ "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"
},
@@ -4833,52 +4929,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [26, 6],
+ "action_ids" : [27, 7],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
- "base_default_next" : "FabricIngress.next.next_vlan",
+ "base_default_next" : "node_38",
"next_tables" : {
- "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
- "nop" : "FabricIngress.next.next_vlan"
+ "FabricIngress.next.set_mcast_group_id" : "node_38",
+ "nop" : "node_38"
},
"default_entry" : {
- "action_id" : 6,
- "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_id"],
- "mask" : null
- }
- ],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : true,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [20, 3],
- "actions" : ["FabricIngress.next.set_vlan", "nop"],
- "base_default_next" : "node_36",
- "next_tables" : {
- "FabricIngress.next.set_vlan" : "node_36",
- "nop" : "node_36"
- },
- "default_entry" : {
- "action_id" : 3,
+ "action_id" : 7,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4886,7 +4945,7 @@
},
{
"name" : "tbl_port_counter31",
- "id" : 20,
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -4900,14 +4959,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [38],
"actions" : ["port_counter31"],
- "base_default_next" : "node_38",
+ "base_default_next" : "node_40",
"next_tables" : {
- "port_counter31" : "node_38"
+ "port_counter31" : "node_40"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4915,7 +4974,7 @@
},
{
"name" : "tbl_port_counter34",
- "id" : 21,
+ "id" : 22,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -4929,14 +4988,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
+ "action_ids" : [39],
"actions" : ["port_counter34"],
"base_default_next" : null,
"next_tables" : {
"port_counter34" : null
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4949,7 +5008,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 183,
+ "line" : 125,
"column" : 57,
"source_fragment" : "hashed_selector"
},
@@ -5010,7 +5069,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 110,
+ "line" : 112,
"column" : 12,
"source_fragment" : "hdr.vlan_tag.isValid()"
},
@@ -5025,7 +5084,7 @@
}
}
},
- "true_next" : "tbl_filtering111",
+ "true_next" : "tbl_filtering113",
"false_next" : "node_6"
},
{
@@ -5033,7 +5092,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 122,
+ "line" : 124,
"column" : 12,
"source_fragment" : "!hdr.mpls.isValid()"
},
@@ -5055,7 +5114,7 @@
}
}
},
- "true_next" : "tbl_filtering127",
+ "true_next" : "tbl_filtering129",
"false_next" : "FabricIngress.filtering.ingress_port_vlan"
},
{
@@ -5063,7 +5122,7 @@
"id" : 3,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 69,
+ "line" : 71,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_forwarding"
},
@@ -5086,7 +5145,7 @@
}
},
"true_next" : "node_11",
- "false_next" : "tbl_acl27"
+ "false_next" : "node_17"
},
{
"name" : "node_11",
@@ -5164,14 +5223,44 @@
}
},
"true_next" : "FabricIngress.forwarding.routing_v4",
+ "false_next" : "node_17"
+ },
+ {
+ "name" : "node_17",
+ "id" : 7,
+ "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_next"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "FabricIngress.pre_next.next_mpls",
"false_next" : "tbl_acl27"
},
{
- "name" : "node_18",
- "id" : 7,
+ "name" : "node_21",
+ "id" : 8,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 96,
+ "line" : 97,
"column" : 12,
"source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
},
@@ -5203,15 +5292,15 @@
}
}
},
- "true_next" : "tbl_acl97",
- "false_next" : "node_24"
+ "true_next" : "tbl_acl98",
+ "false_next" : "node_27"
},
{
- "name" : "node_20",
- "id" : 8,
+ "name" : "node_23",
+ "id" : 9,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 100,
+ "line" : 101,
"column" : 16,
"source_fragment" : "hdr.inner_tcp.isValid()"
},
@@ -5226,15 +5315,15 @@
}
}
},
- "true_next" : "tbl_acl101",
- "false_next" : "node_22"
+ "true_next" : "tbl_acl102",
+ "false_next" : "node_25"
},
{
- "name" : "node_22",
- "id" : 9,
+ "name" : "node_25",
+ "id" : 10,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 103,
+ "line" : 104,
"column" : 23,
"source_fragment" : "hdr.inner_udp.isValid()"
},
@@ -5249,15 +5338,15 @@
}
}
},
- "true_next" : "tbl_acl104",
+ "true_next" : "tbl_acl105",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_24",
- "id" : 10,
+ "name" : "node_27",
+ "id" : 11,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 107,
+ "line" : 108,
"column" : 19,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -5272,15 +5361,15 @@
}
}
},
- "true_next" : "tbl_acl108",
+ "true_next" : "tbl_acl109",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_26",
- "id" : 11,
+ "name" : "node_29",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 111,
+ "line" : 112,
"column" : 16,
"source_fragment" : "hdr.tcp.isValid()"
},
@@ -5295,15 +5384,15 @@
}
}
},
- "true_next" : "tbl_acl112",
- "false_next" : "node_28"
+ "true_next" : "tbl_acl113",
+ "false_next" : "node_31"
},
{
- "name" : "node_28",
- "id" : 12,
+ "name" : "node_31",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/acl.p4",
- "line" : 114,
+ "line" : 115,
"column" : 23,
"source_fragment" : "hdr.udp.isValid()"
},
@@ -5318,15 +5407,15 @@
}
}
},
- "true_next" : "tbl_acl115",
+ "true_next" : "tbl_acl116",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_31",
- "id" : 13,
+ "name" : "node_34",
+ "id" : 14,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 73,
+ "line" : 78,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_next"
},
@@ -5352,8 +5441,8 @@
"true_next" : "FabricIngress.next.xconnect"
},
{
- "name" : "node_36",
- "id" : 14,
+ "name" : "node_38",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -5375,11 +5464,11 @@
}
},
"true_next" : "tbl_port_counter31",
- "false_next" : "node_38"
+ "false_next" : "node_40"
},
{
- "name" : "node_38",
- "id" : 15,
+ "name" : "node_40",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -5410,15 +5499,15 @@
"id" : 1,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 91,
+ "line" : 96,
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_42",
+ "init_table" : "node_44",
"tables" : [
{
"name" : "tbl_packetio41",
- "id" : 22,
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -5432,14 +5521,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [45],
"actions" : ["packetio41"],
- "base_default_next" : "node_44",
+ "base_default_next" : "node_46",
"next_tables" : {
- "packetio41" : "node_44"
+ "packetio41" : "node_46"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5447,7 +5536,7 @@
},
{
"name" : "tbl_packetio44",
- "id" : 23,
+ "id" : 24,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -5461,25 +5550,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [46],
"actions" : ["packetio44"],
- "base_default_next" : "node_46",
+ "base_default_next" : "node_48",
"next_tables" : {
- "packetio44" : "node_46"
+ "packetio44" : "node_48"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next349",
- "id" : 24,
+ "name" : "tbl_next283",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 349,
+ "line" : 283,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -5490,14 +5579,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
- "actions" : ["next349"],
- "base_default_next" : "node_48",
+ "action_ids" : [47],
+ "actions" : ["next283"],
+ "base_default_next" : "node_50",
"next_tables" : {
- "next349" : "node_48"
+ "next283" : "node_50"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5505,10 +5594,10 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 25,
+ "id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 353,
+ "line" : 287,
"column" : 36,
"source_fragment" : "pop_mpls_if_present()"
},
@@ -5519,14 +5608,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [40],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5534,10 +5623,10 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 26,
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 355,
+ "line" : 289,
"column" : 12,
"source_fragment" : "set_mpls()"
},
@@ -5548,14 +5637,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [41],
"actions" : ["FabricEgress.egress_next.set_mpls"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5563,10 +5652,10 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 27,
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 331,
+ "line" : 265,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -5590,27 +5679,27 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41, 42, 43],
+ "action_ids" : [42, 43, 44],
"actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
- "base_default_next" : "node_53",
+ "base_default_next" : "node_55",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_53",
- "FabricEgress.egress_next.pop_vlan" : "node_53",
- "FabricEgress.egress_next.drop" : "node_53"
+ "FabricEgress.egress_next.push_vlan" : "node_55",
+ "FabricEgress.egress_next.pop_vlan" : "node_55",
+ "FabricEgress.egress_next.drop" : "node_55"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next375",
- "id" : 28,
+ "name" : "tbl_next309",
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 375,
+ "line" : 309,
"column" : 25,
"source_fragment" : "="
},
@@ -5621,25 +5710,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
- "actions" : ["next375"],
- "base_default_next" : "node_55",
+ "action_ids" : [49],
+ "actions" : ["next309"],
+ "base_default_next" : "node_57",
"next_tables" : {
- "next375" : "node_55"
+ "next309" : "node_57"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next376",
- "id" : 29,
+ "name" : "tbl_next310",
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 310,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -5650,25 +5739,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
- "actions" : ["next376"],
+ "action_ids" : [48],
+ "actions" : ["next310"],
"base_default_next" : null,
"next_tables" : {
- "next376" : null
+ "next310" : null
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next379",
- "id" : 30,
+ "name" : "tbl_next313",
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 379,
+ "line" : 313,
"column" : 29,
"source_fragment" : "="
},
@@ -5679,25 +5768,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
- "actions" : ["next379"],
- "base_default_next" : "node_59",
+ "action_ids" : [51],
+ "actions" : ["next313"],
+ "base_default_next" : "node_61",
"next_tables" : {
- "next379" : "node_59"
+ "next313" : "node_61"
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_next380",
- "id" : 31,
+ "name" : "tbl_next314",
+ "id" : 32,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -5708,14 +5797,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
- "actions" : ["next380"],
+ "action_ids" : [50],
+ "actions" : ["next314"],
"base_default_next" : null,
"next_tables" : {
- "next380" : null
+ "next314" : null
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5725,8 +5814,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_42",
- "id" : 16,
+ "name" : "node_44",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 39,
@@ -5745,11 +5834,11 @@
}
},
"true_next" : "tbl_packetio41",
- "false_next" : "node_44"
+ "false_next" : "node_46"
},
{
- "name" : "node_44",
- "id" : 17,
+ "name" : "node_46",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -5771,14 +5860,14 @@
}
},
"true_next" : "tbl_packetio44",
- "false_next" : "node_46"
+ "false_next" : "node_48"
},
{
- "name" : "node_46",
- "id" : 18,
+ "name" : "node_48",
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 347,
+ "line" : 281,
"column" : 12,
"source_fragment" : "fabric_metadata.is_multicast == true ..."
},
@@ -5813,15 +5902,15 @@
}
}
},
- "true_next" : "tbl_next349",
- "false_next" : "node_48"
+ "true_next" : "tbl_next283",
+ "false_next" : "node_50"
},
{
- "name" : "node_48",
- "id" : 19,
+ "name" : "node_50",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 352,
+ "line" : 286,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_label == 0"
},
@@ -5839,15 +5928,15 @@
}
}
},
- "true_next" : "node_49",
+ "true_next" : "node_51",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_49",
- "id" : 20,
+ "name" : "node_51",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 353,
+ "line" : 287,
"column" : 16,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -5866,11 +5955,11 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_53",
- "id" : 21,
+ "name" : "node_55",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 374,
+ "line" : 308,
"column" : 12,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -5885,15 +5974,15 @@
}
}
},
- "true_next" : "tbl_next375",
- "false_next" : "node_57"
+ "true_next" : "tbl_next309",
+ "false_next" : "node_59"
},
{
- "name" : "node_55",
- "id" : 22,
+ "name" : "node_57",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 376,
+ "line" : 310,
"column" : 16,
"source_fragment" : "hdr.mpls.ttl == 0"
},
@@ -5912,14 +6001,14 @@
}
},
"false_next" : null,
- "true_next" : "tbl_next376"
+ "true_next" : "tbl_next310"
},
{
- "name" : "node_57",
- "id" : 23,
+ "name" : "node_59",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 378,
+ "line" : 312,
"column" : 15,
"source_fragment" : "hdr.ipv4.isValid() && fabric_metadata.fwd_type != FWD_BRIDGING"
},
@@ -5955,14 +6044,14 @@
}
},
"false_next" : null,
- "true_next" : "tbl_next379"
+ "true_next" : "tbl_next313"
},
{
- "name" : "node_59",
- "id" : 24,
+ "name" : "node_61",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 380,
+ "line" : 314,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl == 0"
},
@@ -5981,7 +6070,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_next380"
+ "true_next" : "tbl_next314"
}
]
}