[AETHER-1032] Backport AETHER-538 to fabric.p4
AETHER-538 introduces a new design for the egress pipeline
where the tagged ports are explicitily matched in the
egress_vlan table. Moreover, no match means dropped with
this new design.
Change-Id: If6f8c73aad0effd01f18c87c147535378e8db84c
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 1151554..739695a 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -5,12 +5,11 @@
"id" : 0,
"fields" : [
["last_ipv4_dscp_0", 6, false],
+ ["tmp", 16, false],
["tmp_0", 16, false],
- ["tmp_1", 16, false],
- ["tmp_2", 4, false],
- ["tmp", 32, false],
+ ["tmp_1", 4, false],
+ ["tmp_2", 32, false],
["tmp_3", 32, false],
- ["egress_next_tmp", 1, false],
["process_int_main_process_int_transit_hasReturned", 1, false],
["fabric_metadata_t._ip_eth_type0", 16, false],
["fabric_metadata_t._vlan_id1", 12, false],
@@ -37,7 +36,7 @@
["fabric_metadata_t._int_meta_new_bytes22", 16, false],
["fabric_metadata_t._int_meta_ig_tstamp23", 32, false],
["fabric_metadata_t._int_meta_eg_tstamp24", 32, false],
- ["_padding_0", 6, false]
+ ["_padding_0", 7, false]
]
},
{
@@ -562,7 +561,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_0"]
+ "value" : ["scalars", "tmp"]
},
{
"type" : "lookahead",
@@ -600,7 +599,7 @@
"transition_key" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_0"]
+ "value" : ["scalars", "tmp"]
}
]
},
@@ -621,7 +620,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_1"]
+ "value" : ["scalars", "tmp_0"]
},
{
"type" : "lookahead",
@@ -647,7 +646,7 @@
"transition_key" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_1"]
+ "value" : ["scalars", "tmp_0"]
}
]
},
@@ -757,7 +756,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_2"]
+ "value" : ["scalars", "tmp_1"]
},
{
"type" : "lookahead",
@@ -783,7 +782,7 @@
"transition_key" : [
{
"type" : "field",
- "value" : ["scalars", "tmp_2"]
+ "value" : ["scalars", "tmp_1"]
}
]
},
@@ -1309,7 +1308,7 @@
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 313,
+ "line" : 314,
"column" : 50,
"source_fragment" : "egress_vlan_counter"
}
@@ -2492,7 +2491,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "tmp"]
+ "value" : ["scalars", "tmp_2"]
},
{
"type" : "expression",
@@ -2528,7 +2527,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "tmp"]
+ "value" : ["scalars", "tmp_2"]
}
],
"source_info" : {
@@ -2611,7 +2610,7 @@
"primitives" : []
},
{
- "name" : "nop",
+ "name" : "NoAction",
"id" : 36,
"runtime_data" : [],
"primitives" : []
@@ -2623,14 +2622,8 @@
"primitives" : []
},
{
- "name" : "NoAction",
- "id" : 38,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
- "id" : 39,
+ "id" : 38,
"runtime_data" : [
{
"name" : "max_hop",
@@ -3125,7 +3118,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
- "id" : 40,
+ "id" : 39,
"runtime_data" : [
{
"name" : "switch_id",
@@ -3185,13 +3178,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
- "id" : 41,
+ "id" : 40,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
- "id" : 42,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -3348,7 +3341,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
- "id" : 43,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -3473,7 +3466,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
- "id" : 44,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -3664,7 +3657,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
- "id" : 45,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3834,7 +3827,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
- "id" : 46,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -4070,7 +4063,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
- "id" : 47,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -4274,7 +4267,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
- "id" : 48,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -4544,7 +4537,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
- "id" : 49,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -4669,7 +4662,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
- "id" : 50,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -4860,7 +4853,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
- "id" : 51,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -5019,7 +5012,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
- "id" : 52,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -5244,7 +5237,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
- "id" : 53,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -5448,7 +5441,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
- "id" : 54,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -5718,7 +5711,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
- "id" : 55,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -5956,7 +5949,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
- "id" : 56,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -6260,13 +6253,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
- "id" : 57,
+ "id" : 56,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
- "id" : 58,
+ "id" : 57,
"runtime_data" : [],
"primitives" : [
{
@@ -6391,7 +6384,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
- "id" : 59,
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -6535,7 +6528,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
- "id" : 60,
+ "id" : 59,
"runtime_data" : [],
"primitives" : [
{
@@ -6713,7 +6706,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
- "id" : 61,
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -6861,7 +6854,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
- "id" : 62,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -7043,7 +7036,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
- "id" : 63,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -7244,7 +7237,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
- "id" : 64,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -7479,7 +7472,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
- "id" : 65,
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -7604,7 +7597,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
- "id" : 66,
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -7763,7 +7756,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
- "id" : 67,
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -7941,7 +7934,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
- "id" : 68,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -8153,7 +8146,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
- "id" : 69,
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -8335,7 +8328,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
- "id" : 70,
+ "id" : 69,
"runtime_data" : [],
"primitives" : [
{
@@ -8551,7 +8544,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
- "id" : 71,
+ "id" : 70,
"runtime_data" : [],
"primitives" : [
{
@@ -8786,7 +8779,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
- "id" : 72,
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -9055,7 +9048,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 73,
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -9096,7 +9089,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 74,
+ "id" : 73,
"runtime_data" : [],
"primitives" : [
{
@@ -9213,7 +9206,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 75,
+ "id" : 74,
"runtime_data" : [],
"primitives" : [
{
@@ -9311,7 +9304,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 76,
+ "id" : 75,
"runtime_data" : [],
"primitives" : [
{
@@ -9324,7 +9317,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 316,
+ "line" : 322,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -9332,6 +9325,28 @@
]
},
{
+ "name" : "FabricEgress.egress_next.drop",
+ "id" : 76,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "mark_to_drop",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "standard_metadata"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 327,
+ "column" : 8,
+ "source_fragment" : "mark_to_drop(standard_metadata)"
+ }
+ }
+ ]
+ },
+ {
"name" : "act_4",
"id" : 77,
"runtime_data" : [],
@@ -9414,7 +9429,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 337,
+ "line" : 349,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9427,66 +9442,6 @@
"runtime_data" : [],
"primitives" : [
{
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "egress_next_tmp"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "bool",
- "value" : true
- }
- }
- }
- }
- ]
- }
- ]
- },
- {
- "name" : "act_8",
- "id" : 81,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "egress_next_tmp"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "bool",
- "value" : false
- }
- }
- }
- }
- ]
- }
- ]
- },
- {
- "name" : "act_9",
- "id" : 82,
- "runtime_data" : [],
- "primitives" : [
- {
"op" : "mark_to_drop",
"parameters" : [
{
@@ -9496,7 +9451,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 376,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9504,8 +9459,8 @@
]
},
{
- "name" : "act_10",
- "id" : 83,
+ "name" : "act_8",
+ "id" : 81,
"runtime_data" : [],
"primitives" : [
{
@@ -9545,7 +9500,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 369,
+ "line" : 375,
"column" : 12,
"source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
}
@@ -9553,8 +9508,8 @@
]
},
{
- "name" : "act_11",
- "id" : 84,
+ "name" : "act_9",
+ "id" : 82,
"runtime_data" : [],
"primitives" : [
{
@@ -9567,7 +9522,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 374,
+ "line" : 380,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9575,8 +9530,8 @@
]
},
{
- "name" : "act_12",
- "id" : 85,
+ "name" : "act_10",
+ "id" : 83,
"runtime_data" : [],
"primitives" : [
{
@@ -9616,7 +9571,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 373,
+ "line" : 379,
"column" : 16,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -9624,8 +9579,8 @@
]
},
{
- "name" : "act_13",
- "id" : 86,
+ "name" : "act_11",
+ "id" : 84,
"runtime_data" : [],
"primitives" : [
{
@@ -9654,8 +9609,8 @@
]
},
{
- "name" : "act_14",
- "id" : 87,
+ "name" : "act_12",
+ "id" : 85,
"runtime_data" : [],
"primitives" : [
{
@@ -9690,8 +9645,8 @@
]
},
{
- "name" : "act_15",
- "id" : 88,
+ "name" : "act_13",
+ "id" : 86,
"runtime_data" : [],
"primitives" : [
{
@@ -9739,8 +9694,8 @@
]
},
{
- "name" : "act_16",
- "id" : 89,
+ "name" : "act_14",
+ "id" : 87,
"runtime_data" : [],
"primitives" : [
{
@@ -9788,8 +9743,8 @@
]
},
{
- "name" : "act_17",
- "id" : 90,
+ "name" : "act_15",
+ "id" : 88,
"runtime_data" : [],
"primitives" : [
{
@@ -9837,8 +9792,8 @@
]
},
{
- "name" : "act_18",
- "id" : 91,
+ "name" : "act_16",
+ "id" : 89,
"runtime_data" : [],
"primitives" : [
{
@@ -10948,7 +10903,7 @@
"id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 337,
+ "line" : 349,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -10977,7 +10932,7 @@
"id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 341,
+ "line" : 353,
"column" : 36,
"source_fragment" : "pop_mpls_if_present()"
},
@@ -10988,14 +10943,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [73],
+ "action_ids" : [72],
"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" : 73,
+ "action_id" : 72,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11006,7 +10961,7 @@
"id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 343,
+ "line" : 355,
"column" : 12,
"source_fragment" : "set_mpls()"
},
@@ -11017,14 +10972,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [74],
+ "action_ids" : [73],
"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" : 74,
+ "action_id" : 73,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11035,7 +10990,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 320,
+ "line" : 331,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -11059,15 +11014,16 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [76, 36],
- "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
- "base_default_next" : null,
+ "action_ids" : [74, 75, 76],
+ "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
+ "base_default_next" : "node_41",
"next_tables" : {
- "__HIT__" : "tbl_act_7",
- "__MISS__" : "tbl_act_8"
+ "FabricEgress.egress_next.push_vlan" : "node_41",
+ "FabricEgress.egress_next.pop_vlan" : "node_41",
+ "FabricEgress.egress_next.drop" : "node_41"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 76,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11076,29 +11032,12 @@
{
"name" : "tbl_act_7",
"id" : 22,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [80],
- "actions" : ["act_7"],
- "base_default_next" : "node_43",
- "next_tables" : {
- "act_7" : "node_43"
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 375,
+ "column" : 25,
+ "source_fragment" : "="
},
- "default_entry" : {
- "action_id" : 80,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_8",
- "id" : 23,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11120,13 +11059,13 @@
}
},
{
- "name" : "tbl_egress_next_push_vlan",
- "id" : 24,
+ "name" : "tbl_act_8",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 360,
- "column" : 20,
- "source_fragment" : "push_vlan()"
+ "line" : 376,
+ "column" : 35,
+ "source_fragment" : "mark_to_drop(standard_metadata)"
},
"key" : [],
"match_type" : "exact",
@@ -11135,14 +11074,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [75],
- "actions" : ["FabricEgress.egress_next.push_vlan"],
- "base_default_next" : "node_46",
+ "action_ids" : [80],
+ "actions" : ["act_7"],
+ "base_default_next" : "node_49",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_46"
+ "act_7" : "node_49"
},
"default_entry" : {
- "action_id" : 75,
+ "action_id" : 80,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11150,11 +11089,11 @@
},
{
"name" : "tbl_act_9",
- "id" : 25,
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 369,
- "column" : 25,
+ "line" : 379,
+ "column" : 29,
"source_fragment" : "="
},
"key" : [],
@@ -11166,9 +11105,9 @@
"direct_meters" : null,
"action_ids" : [83],
"actions" : ["act_10"],
- "base_default_next" : "node_48",
+ "base_default_next" : "node_47",
"next_tables" : {
- "act_10" : "node_48"
+ "act_10" : "node_47"
},
"default_entry" : {
"action_id" : 83,
@@ -11179,11 +11118,11 @@
},
{
"name" : "tbl_act_10",
- "id" : 26,
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
- "column" : 35,
+ "line" : 380,
+ "column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
"key" : [],
@@ -11195,9 +11134,9 @@
"direct_meters" : null,
"action_ids" : [82],
"actions" : ["act_9"],
- "base_default_next" : "node_54",
+ "base_default_next" : "node_49",
"next_tables" : {
- "act_9" : "node_54"
+ "act_9" : "node_49"
},
"default_entry" : {
"action_id" : 82,
@@ -11207,66 +11146,8 @@
}
},
{
- "name" : "tbl_act_11",
- "id" : 27,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 373,
- "column" : 29,
- "source_fragment" : "="
- },
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [85],
- "actions" : ["act_12"],
- "base_default_next" : "node_52",
- "next_tables" : {
- "act_12" : "node_52"
- },
- "default_entry" : {
- "action_id" : 85,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_12",
- "id" : 28,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 374,
- "column" : 39,
- "source_fragment" : "mark_to_drop(standard_metadata)"
- },
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [84],
- "actions" : ["act_11"],
- "base_default_next" : "node_54",
- "next_tables" : {
- "act_11" : "node_54"
- },
- "default_entry" : {
- "action_id" : 84,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
"name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "id" : 29,
+ "id" : 26,
"source_info" : {
"filename" : "include/int/int_source.p4",
"line" : 66,
@@ -11305,12 +11186,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39, 34],
+ "action_ids" : [38, 34],
"actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
- "base_default_next" : "node_57",
+ "base_default_next" : "node_52",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_57",
- "nop" : "node_57"
+ "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_52",
+ "nop" : "node_52"
},
"default_entry" : {
"action_id" : 34,
@@ -11320,8 +11201,8 @@
}
},
{
- "name" : "tbl_act_13",
- "id" : 30,
+ "name" : "tbl_act_11",
+ "id" : 27,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11329,14 +11210,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [86],
- "actions" : ["act_13"],
+ "action_ids" : [84],
+ "actions" : ["act_11"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
"next_tables" : {
- "act_13" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+ "act_11" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
},
"default_entry" : {
- "action_id" : 86,
+ "action_id" : 84,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11344,7 +11225,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
- "id" : 31,
+ "id" : 28,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 315,
@@ -11365,12 +11246,12 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40, 35],
+ "action_ids" : [39, 35],
"actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
- "base_default_next" : "node_60",
+ "base_default_next" : "node_55",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_60",
- "nop" : "node_60"
+ "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_55",
+ "nop" : "node_55"
},
"default_entry" : {
"action_id" : 35,
@@ -11380,8 +11261,8 @@
}
},
{
- "name" : "tbl_act_14",
- "id" : 32,
+ "name" : "tbl_act_12",
+ "id" : 29,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 420,
@@ -11395,14 +11276,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [87],
- "actions" : ["act_14"],
- "base_default_next" : "node_62",
+ "action_ids" : [85],
+ "actions" : ["act_12"],
+ "base_default_next" : "node_57",
"next_tables" : {
- "act_14" : "node_62"
+ "act_12" : "node_57"
},
"default_entry" : {
- "action_id" : 87,
+ "action_id" : 85,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11410,7 +11291,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
- "id" : 33,
+ "id" : 30,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 331,
@@ -11431,7 +11312,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 37],
+ "action_ids" : [40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 36],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -11454,7 +11335,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 36,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -11474,7 +11355,7 @@
}
],
"action_entry" : {
- "action_id" : 41,
+ "action_id" : 40,
"action_data" : []
},
"priority" : 1
@@ -11493,7 +11374,7 @@
}
],
"action_entry" : {
- "action_id" : 42,
+ "action_id" : 41,
"action_data" : []
},
"priority" : 2
@@ -11512,7 +11393,7 @@
}
],
"action_entry" : {
- "action_id" : 43,
+ "action_id" : 42,
"action_data" : []
},
"priority" : 3
@@ -11531,7 +11412,7 @@
}
],
"action_entry" : {
- "action_id" : 44,
+ "action_id" : 43,
"action_data" : []
},
"priority" : 4
@@ -11550,7 +11431,7 @@
}
],
"action_entry" : {
- "action_id" : 45,
+ "action_id" : 44,
"action_data" : []
},
"priority" : 5
@@ -11569,7 +11450,7 @@
}
],
"action_entry" : {
- "action_id" : 46,
+ "action_id" : 45,
"action_data" : []
},
"priority" : 6
@@ -11588,7 +11469,7 @@
}
],
"action_entry" : {
- "action_id" : 47,
+ "action_id" : 46,
"action_data" : []
},
"priority" : 7
@@ -11607,7 +11488,7 @@
}
],
"action_entry" : {
- "action_id" : 48,
+ "action_id" : 47,
"action_data" : []
},
"priority" : 8
@@ -11626,7 +11507,7 @@
}
],
"action_entry" : {
- "action_id" : 49,
+ "action_id" : 48,
"action_data" : []
},
"priority" : 9
@@ -11645,7 +11526,7 @@
}
],
"action_entry" : {
- "action_id" : 50,
+ "action_id" : 49,
"action_data" : []
},
"priority" : 10
@@ -11664,7 +11545,7 @@
}
],
"action_entry" : {
- "action_id" : 51,
+ "action_id" : 50,
"action_data" : []
},
"priority" : 11
@@ -11683,7 +11564,7 @@
}
],
"action_entry" : {
- "action_id" : 52,
+ "action_id" : 51,
"action_data" : []
},
"priority" : 12
@@ -11702,7 +11583,7 @@
}
],
"action_entry" : {
- "action_id" : 53,
+ "action_id" : 52,
"action_data" : []
},
"priority" : 13
@@ -11721,7 +11602,7 @@
}
],
"action_entry" : {
- "action_id" : 54,
+ "action_id" : 53,
"action_data" : []
},
"priority" : 14
@@ -11740,7 +11621,7 @@
}
],
"action_entry" : {
- "action_id" : 55,
+ "action_id" : 54,
"action_data" : []
},
"priority" : 15
@@ -11759,7 +11640,7 @@
}
],
"action_entry" : {
- "action_id" : 56,
+ "action_id" : 55,
"action_data" : []
},
"priority" : 16
@@ -11768,7 +11649,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
- "id" : 34,
+ "id" : 31,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 375,
@@ -11789,30 +11670,30 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 38],
+ "action_ids" : [56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 37],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
- "base_default_next" : "tbl_act_15",
+ "base_default_next" : "tbl_act_13",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_15",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_15",
- "NoAction" : "tbl_act_15"
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_13",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_13",
+ "NoAction" : "tbl_act_13"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 37,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -11832,7 +11713,7 @@
}
],
"action_entry" : {
- "action_id" : 57,
+ "action_id" : 56,
"action_data" : []
},
"priority" : 1
@@ -11851,7 +11732,7 @@
}
],
"action_entry" : {
- "action_id" : 58,
+ "action_id" : 57,
"action_data" : []
},
"priority" : 2
@@ -11870,7 +11751,7 @@
}
],
"action_entry" : {
- "action_id" : 59,
+ "action_id" : 58,
"action_data" : []
},
"priority" : 3
@@ -11889,7 +11770,7 @@
}
],
"action_entry" : {
- "action_id" : 60,
+ "action_id" : 59,
"action_data" : []
},
"priority" : 4
@@ -11908,7 +11789,7 @@
}
],
"action_entry" : {
- "action_id" : 61,
+ "action_id" : 60,
"action_data" : []
},
"priority" : 5
@@ -11927,7 +11808,7 @@
}
],
"action_entry" : {
- "action_id" : 62,
+ "action_id" : 61,
"action_data" : []
},
"priority" : 6
@@ -11946,7 +11827,7 @@
}
],
"action_entry" : {
- "action_id" : 63,
+ "action_id" : 62,
"action_data" : []
},
"priority" : 7
@@ -11965,7 +11846,7 @@
}
],
"action_entry" : {
- "action_id" : 64,
+ "action_id" : 63,
"action_data" : []
},
"priority" : 8
@@ -11984,7 +11865,7 @@
}
],
"action_entry" : {
- "action_id" : 65,
+ "action_id" : 64,
"action_data" : []
},
"priority" : 9
@@ -12003,7 +11884,7 @@
}
],
"action_entry" : {
- "action_id" : 66,
+ "action_id" : 65,
"action_data" : []
},
"priority" : 10
@@ -12022,7 +11903,7 @@
}
],
"action_entry" : {
- "action_id" : 67,
+ "action_id" : 66,
"action_data" : []
},
"priority" : 11
@@ -12041,7 +11922,7 @@
}
],
"action_entry" : {
- "action_id" : 68,
+ "action_id" : 67,
"action_data" : []
},
"priority" : 12
@@ -12060,7 +11941,7 @@
}
],
"action_entry" : {
- "action_id" : 69,
+ "action_id" : 68,
"action_data" : []
},
"priority" : 13
@@ -12079,7 +11960,7 @@
}
],
"action_entry" : {
- "action_id" : 70,
+ "action_id" : 69,
"action_data" : []
},
"priority" : 14
@@ -12098,7 +11979,7 @@
}
],
"action_entry" : {
- "action_id" : 71,
+ "action_id" : 70,
"action_data" : []
},
"priority" : 15
@@ -12117,7 +11998,7 @@
}
],
"action_entry" : {
- "action_id" : 72,
+ "action_id" : 71,
"action_data" : []
},
"priority" : 16
@@ -12125,8 +12006,8 @@
]
},
{
- "name" : "tbl_act_15",
- "id" : 35,
+ "name" : "tbl_act_13",
+ "id" : 32,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 425,
@@ -12140,22 +12021,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [89],
- "actions" : ["act_16"],
- "base_default_next" : "node_66",
+ "action_ids" : [87],
+ "actions" : ["act_14"],
+ "base_default_next" : "node_61",
"next_tables" : {
- "act_16" : "node_66"
+ "act_14" : "node_61"
},
"default_entry" : {
- "action_id" : 89,
+ "action_id" : 87,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_16",
- "id" : 36,
+ "name" : "tbl_act_14",
+ "id" : 33,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 428,
@@ -12169,22 +12050,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [88],
- "actions" : ["act_15"],
- "base_default_next" : "node_68",
+ "action_ids" : [86],
+ "actions" : ["act_13"],
+ "base_default_next" : "node_63",
"next_tables" : {
- "act_15" : "node_68"
+ "act_13" : "node_63"
},
"default_entry" : {
- "action_id" : 88,
+ "action_id" : 86,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_17",
- "id" : 37,
+ "name" : "tbl_act_15",
+ "id" : 34,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 431,
@@ -12198,22 +12079,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [90],
- "actions" : ["act_17"],
- "base_default_next" : "node_70",
+ "action_ids" : [88],
+ "actions" : ["act_15"],
+ "base_default_next" : "node_65",
"next_tables" : {
- "act_17" : "node_70"
+ "act_15" : "node_65"
},
"default_entry" : {
- "action_id" : 90,
+ "action_id" : 88,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_18",
- "id" : 38,
+ "name" : "tbl_act_16",
+ "id" : 35,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 434,
@@ -12227,14 +12108,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [91],
- "actions" : ["act_18"],
+ "action_ids" : [89],
+ "actions" : ["act_16"],
"base_default_next" : null,
"next_tables" : {
- "act_18" : null
+ "act_16" : null
},
"default_entry" : {
- "action_id" : 91,
+ "action_id" : 89,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12307,7 +12188,7 @@
"id" : 12,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 335,
+ "line" : 347,
"column" : 12,
"source_fragment" : "fabric_metadata.is_multicast == true ..."
},
@@ -12360,7 +12241,7 @@
"id" : 13,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 340,
+ "line" : 352,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_label == 0"
},
@@ -12386,7 +12267,7 @@
"id" : 14,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 341,
+ "line" : 353,
"column" : 16,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -12405,67 +12286,11 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_43",
+ "name" : "node_41",
"id" : 15,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 357,
- "column" : 16,
- "source_fragment" : "!egress_vlan.apply().hit"
- },
- "expression" : {
- "type" : "expression",
- "value" : {
- "op" : "not",
- "left" : null,
- "right" : {
- "type" : "expression",
- "value" : {
- "op" : "d2b",
- "left" : null,
- "right" : {
- "type" : "field",
- "value" : ["scalars", "egress_next_tmp"]
- }
- }
- }
- }
- },
- "true_next" : "node_44",
- "false_next" : "node_46"
- },
- {
- "name" : "node_44",
- "id" : 16,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 359,
- "column" : 20,
- "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
- },
- "expression" : {
- "type" : "expression",
- "value" : {
- "op" : "!=",
- "left" : {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
- },
- "right" : {
- "type" : "hexstr",
- "value" : "0x0ffe"
- }
- }
- },
- "true_next" : "tbl_egress_next_push_vlan",
- "false_next" : "node_46"
- },
- {
- "name" : "node_46",
- "id" : 17,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 368,
+ "line" : 374,
"column" : 12,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -12480,15 +12305,15 @@
}
}
},
- "true_next" : "tbl_act_9",
- "false_next" : "node_50"
+ "true_next" : "tbl_act_7",
+ "false_next" : "node_45"
},
{
- "name" : "node_48",
- "id" : 18,
+ "name" : "node_43",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 376,
"column" : 16,
"source_fragment" : "hdr.mpls.ttl == 0"
},
@@ -12506,15 +12331,15 @@
}
}
},
- "true_next" : "tbl_act_10",
- "false_next" : "node_54"
+ "true_next" : "tbl_act_8",
+ "false_next" : "node_49"
},
{
- "name" : "node_50",
- "id" : 19,
+ "name" : "node_45",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 372,
+ "line" : 378,
"column" : 15,
"source_fragment" : "hdr.ipv4.isValid() && fabric_metadata.fwd_type != FWD_BRIDGING"
},
@@ -12549,15 +12374,15 @@
}
}
},
- "true_next" : "tbl_act_11",
- "false_next" : "node_54"
+ "true_next" : "tbl_act_9",
+ "false_next" : "node_49"
},
{
- "name" : "node_52",
- "id" : 20,
+ "name" : "node_47",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 374,
+ "line" : 380,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl == 0"
},
@@ -12575,12 +12400,12 @@
}
}
},
- "true_next" : "tbl_act_12",
- "false_next" : "node_54"
+ "true_next" : "tbl_act_10",
+ "false_next" : "node_49"
},
{
- "name" : "node_54",
- "id" : 21,
+ "name" : "node_49",
+ "id" : 19,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 102,
@@ -12656,11 +12481,11 @@
}
},
"false_next" : null,
- "true_next" : "node_55"
+ "true_next" : "node_50"
},
{
- "name" : "node_55",
- "id" : 22,
+ "name" : "node_50",
+ "id" : 20,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 106,
@@ -12689,11 +12514,11 @@
}
},
"true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "false_next" : "node_57"
+ "false_next" : "node_52"
},
{
- "name" : "node_57",
- "id" : 23,
+ "name" : "node_52",
+ "id" : 21,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 110,
@@ -12712,11 +12537,11 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_13"
+ "true_next" : "tbl_act_11"
},
{
- "name" : "node_60",
- "id" : 24,
+ "name" : "node_55",
+ "id" : 22,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 419,
@@ -12744,12 +12569,12 @@
}
}
},
- "true_next" : "tbl_act_14",
- "false_next" : "node_62"
+ "true_next" : "tbl_act_12",
+ "false_next" : "node_57"
},
{
- "name" : "node_62",
- "id" : 25,
+ "name" : "node_57",
+ "id" : 23,
"expression" : {
"type" : "expression",
"value" : {
@@ -12772,8 +12597,8 @@
"true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
},
{
- "name" : "node_66",
- "id" : 26,
+ "name" : "node_61",
+ "id" : 24,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 427,
@@ -12791,12 +12616,12 @@
}
}
},
- "true_next" : "tbl_act_16",
- "false_next" : "node_68"
+ "true_next" : "tbl_act_14",
+ "false_next" : "node_63"
},
{
- "name" : "node_68",
- "id" : 27,
+ "name" : "node_63",
+ "id" : 25,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 430,
@@ -12814,12 +12639,12 @@
}
}
},
- "true_next" : "tbl_act_17",
- "false_next" : "node_70"
+ "true_next" : "tbl_act_15",
+ "false_next" : "node_65"
},
{
- "name" : "node_70",
- "id" : 28,
+ "name" : "node_65",
+ "id" : 26,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 433,
@@ -12838,7 +12663,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_18"
+ "true_next" : "tbl_act_16"
}
]
}
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index a661e7a..add34cf 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -471,14 +471,17 @@
match_type: EXACT
}
action_refs {
+ id: 16807339
+ }
+ action_refs {
id: 16790030
}
action_refs {
- id: 16819938
+ id: 16787838
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
+ const_default_action_id: 16787838
direct_resource_ids: 318827144
size: 1024
}
@@ -612,7 +615,7 @@
preamble {
id: 16820765
name: "FabricIngress.acl.drop"
- alias: "drop"
+ alias: "acl.drop"
}
}
actions {
@@ -779,11 +782,25 @@
}
actions {
preamble {
+ id: 16807339
+ name: "FabricEgress.egress_next.push_vlan"
+ alias: "push_vlan"
+ }
+}
+actions {
+ preamble {
id: 16790030
name: "FabricEgress.egress_next.pop_vlan"
alias: "pop_vlan"
}
}
+actions {
+ preamble {
+ id: 16787838
+ name: "FabricEgress.egress_next.drop"
+ alias: "egress_next.drop"
+ }
+}
action_profiles {
preamble {
id: 285217164