Add default VLAN 4094 tag to all untagged traffic in fabric.p4

Also fix nop action in ingres_port_vlan table not invoking direct
counter.

This allows processing LLDP packets before any SR-related flow rule is
pushed

Change-Id: Ic6c33ff0c74e643d9e7c853e029bff924ba6f2ac
(cherry picked from commit 0433a9d002c6a9533ffd55de709aba5a6ca26f04)
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 89b5743..dfb2b04 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -10,6 +10,7 @@
         ["tmp_2", 32, false],
         ["tmp_3", 32, false],
         ["tmp_4", 32, false],
+        ["filtering_tmp_0", 1, false],
         ["next_tmp_2", 1, false],
         ["next_tmp_3", 1, false],
         ["next_tmp_4", 1, false],
@@ -23,7 +24,7 @@
         ["fabric_metadata_t.l4_src_port", 16, false],
         ["fabric_metadata_t.l4_dst_port", 16, false],
         ["fabric_metadata_t.compute_checksum", 1, false],
-        ["_padding_1", 7, false]
+        ["_padding_1", 6, false]
       ]
     },
     {
@@ -1658,14 +1659,8 @@
       "primitives" : []
     },
     {
-      "name" : "nop",
-      "id" : 9,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 10,
+      "id" : 9,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1691,7 +1686,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 11,
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1717,7 +1712,7 @@
     },
     {
       "name" : "FabricIngress.filtering.drop",
-      "id" : 12,
+      "id" : 11,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1734,7 +1729,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1765,7 +1760,7 @@
     },
     {
       "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 14,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1915,6 +1910,12 @@
       ]
     },
     {
+      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
+      "id" : 14,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
       "id" : 15,
       "runtime_data" : [
@@ -1938,7 +1939,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 94,
+            "line" : 99,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -2556,7 +2557,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 113,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -2747,7 +2748,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 113,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3115,7 +3116,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 113,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3306,7 +3307,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 113,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3424,19 +3425,23 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "filtering_tmp_0"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 92,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
+          ]
         }
       ]
     },
@@ -3450,7 +3455,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
+              "value" : ["scalars", "filtering_tmp_0"]
             },
             {
               "type" : "expression",
@@ -3480,23 +3485,19 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
+              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x07"
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 109,
+            "column" : 31,
+            "source_fragment" : "7; ..."
+          }
         }
       ]
     },
@@ -3510,23 +3511,19 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
+              "value" : ["vlan_tag", "ether_type"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x0800"
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 92,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
         }
       ]
     },
@@ -3540,7 +3537,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
+              "value" : ["scalars", "next_hasReturned_0"]
             },
             {
               "type" : "expression",
@@ -3551,7 +3548,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "bool",
-                    "value" : true
+                    "value" : false
                   }
                 }
               }
@@ -3570,6 +3567,96 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "next_tmp_4"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 42,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "next_tmp_4"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 43,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "next_tmp_3"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_8",
+      "id" : 44,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["scalars", "next_tmp_3"]
             },
             {
@@ -3591,8 +3678,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 42,
+      "name" : "act_9",
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3621,8 +3708,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 43,
+      "name" : "act_10",
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3651,8 +3738,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 44,
+      "name" : "act_11",
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3687,8 +3774,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 45,
+      "name" : "act_12",
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3736,8 +3823,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 46,
+      "name" : "act_13",
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3794,8 +3881,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 47,
+      "name" : "act_14",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3852,8 +3939,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 48,
+      "name" : "act_15",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3873,24 +3960,6 @@
     },
     {
       "name" : "NoAction",
-      "id" : 49,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
       "id" : 52,
       "runtime_data" : [],
       "primitives" : []
@@ -3902,15 +3971,33 @@
       "primitives" : []
     },
     {
-      "name" : "nop",
+      "name" : "NoAction",
       "id" : 54,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
+      "name" : "NoAction",
       "id" : 55,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "drop_now",
+      "id" : 58,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
@@ -3936,7 +4023,7 @@
     },
     {
       "name" : "drop_now",
-      "id" : 56,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3963,7 +4050,7 @@
     },
     {
       "name" : "FabricEgress.process_int_source.int_source_dscp",
-      "id" : 57,
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4031,7 +4118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 127,
             "column" : 35,
             "source_fragment" : "4; ..."
           }
@@ -4462,7 +4549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 122,
+            "line" : 125,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -4471,7 +4558,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_update_total_hop_cnt",
-      "id" : 58,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4520,7 +4607,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_transit",
-      "id" : 59,
+      "id" : 62,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -4603,13 +4690,13 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i0",
-      "id" : 60,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i1",
-      "id" : 61,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4682,7 +4769,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i2",
-      "id" : 62,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4723,7 +4810,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i3",
-      "id" : 63,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4830,7 +4917,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i4",
-      "id" : 64,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4916,7 +5003,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i5",
-      "id" : 65,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5068,7 +5155,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i6",
-      "id" : 66,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5188,7 +5275,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i7",
-      "id" : 67,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5374,7 +5461,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i8",
-      "id" : 68,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5415,7 +5502,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i9",
-      "id" : 69,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5522,7 +5609,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i10",
-      "id" : 70,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5597,7 +5684,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i11",
-      "id" : 71,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5738,7 +5825,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i12",
-      "id" : 72,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5858,7 +5945,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i13",
-      "id" : 73,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6044,7 +6131,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i14",
-      "id" : 74,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6198,7 +6285,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i15",
-      "id" : 75,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6418,13 +6505,13 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i0",
-      "id" : 76,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i1",
-      "id" : 77,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6465,7 +6552,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i2",
-      "id" : 78,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6525,7 +6612,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i3",
-      "id" : 79,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6619,7 +6706,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i4",
-      "id" : 80,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6683,7 +6770,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i5",
-      "id" : 81,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6781,7 +6868,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i6",
-      "id" : 82,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6898,7 +6985,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i7",
-      "id" : 83,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7049,7 +7136,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i8",
-      "id" : 84,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7090,7 +7177,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i9",
-      "id" : 85,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7165,7 +7252,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i10",
-      "id" : 86,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7259,7 +7346,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i11",
-      "id" : 87,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7387,7 +7474,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i12",
-      "id" : 88,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7485,7 +7572,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i13",
-      "id" : 89,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7617,7 +7704,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i14",
-      "id" : 90,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7768,7 +7855,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i15",
-      "id" : 91,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7953,7 +8040,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_ipv4",
-      "id" : 92,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8002,7 +8089,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_udp",
-      "id" : 93,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8051,7 +8138,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_shim",
-      "id" : 94,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8110,7 +8197,7 @@
     },
     {
       "name" : "FabricEgress.process_int_report.do_report_encapsulation",
-      "id" : 95,
+      "id" : 98,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -8644,7 +8731,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -8739,7 +8826,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 133,
+            "line" : 136,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -8786,7 +8873,7 @@
     },
     {
       "name" : "FabricEgress.process_int_sink.restore_header",
-      "id" : 96,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8844,7 +8931,7 @@
     },
     {
       "name" : "FabricEgress.process_int_sink.int_sink",
-      "id" : 97,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9175,7 +9262,7 @@
     },
     {
       "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 98,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9216,7 +9303,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 99,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9256,8 +9343,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 100,
+      "name" : "act_16",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9337,7 +9424,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 61,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
@@ -9367,17 +9454,61 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 13, 8, 12],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
-          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "action_ids" : [13, 12, 11, 14],
+          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.filtering.push_internal_vlan" : "FabricIngress.filtering.fwd_classifier",
-            "FabricIngress.filtering.set_vlan" : "FabricIngress.filtering.fwd_classifier",
-            "nop" : "FabricIngress.filtering.fwd_classifier",
-            "FabricIngress.filtering.drop" : "FabricIngress.filtering.fwd_classifier"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 13,
+            "action_const" : true,
+            "action_data" : ["0xffe"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 2,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [36],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_0" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 36,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [37],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -9385,10 +9516,10 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 2,
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 98,
+            "line" : 103,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
@@ -9420,9 +9551,9 @@
           "direct_meters" : null,
           "action_ids" : [15],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_6",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_6"
+            "FabricIngress.filtering.set_forwarding_type" : "node_10"
           },
           "default_entry" : {
             "action_id" : 15,
@@ -9432,8 +9563,31 @@
           }
         },
         {
+          "name" : "tbl_act_2",
+          "id" : 5,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [38],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_10",
+          "next_tables" : {
+            "act_2" : "node_10"
+          },
+          "default_entry" : {
+            "action_id" : 38,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 3,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 41,
@@ -9476,7 +9630,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 4,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 65,
@@ -9499,10 +9653,10 @@
           "direct_meters" : null,
           "action_ids" : [17, 3],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_0",
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_0",
-            "NoAction" : "tbl_act_0"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_3",
+            "NoAction" : "tbl_act_3"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -9512,8 +9666,8 @@
           }
         },
         {
-          "name" : "tbl_act_0",
-          "id" : 5,
+          "name" : "tbl_act_3",
+          "id" : 8,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9521,14 +9675,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
-          "actions" : ["act_0"],
+          "action_ids" : [39],
+          "actions" : ["act_3"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "act_0" : "FabricIngress.forwarding.acl"
+            "act_3" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -9536,7 +9690,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.unicast_v4",
-          "id" : 6,
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
@@ -9573,7 +9727,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.acl",
-          "id" : 7,
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 131,
@@ -9662,13 +9816,13 @@
           "direct_meters" : null,
           "action_ids" : [19, 20, 21, 22, 23],
           "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_1",
+          "base_default_next" : "tbl_act_4",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_1",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_1",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_1",
-            "FabricIngress.forwarding.drop" : "tbl_act_1",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_1"
+            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_4",
+            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_4",
+            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_4",
+            "FabricIngress.forwarding.drop" : "tbl_act_4",
+            "FabricIngress.forwarding.nop_acl" : "tbl_act_4"
           },
           "default_entry" : {
             "action_id" : 23,
@@ -9678,8 +9832,8 @@
           }
         },
         {
-          "name" : "tbl_act_1",
-          "id" : 8,
+          "name" : "tbl_act_4",
+          "id" : 11,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9687,14 +9841,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_1"],
+          "action_ids" : [40],
+          "actions" : ["act_4"],
           "base_default_next" : "FabricIngress.next.vlan_meta",
           "next_tables" : {
-            "act_1" : "FabricIngress.next.vlan_meta"
+            "act_4" : "FabricIngress.next.vlan_meta"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -9702,7 +9856,7 @@
         },
         {
           "name" : "FabricIngress.next.vlan_meta",
-          "id" : 9,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 65,
@@ -9723,7 +9877,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 9],
+          "action_ids" : [24, 8],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -9731,7 +9885,7 @@
             "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 8,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -9739,7 +9893,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 10,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 122,
@@ -9764,8 +9918,8 @@
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_2",
-            "__MISS__" : "tbl_act_3"
+            "__HIT__" : "tbl_act_5",
+            "__MISS__" : "tbl_act_6"
           },
           "default_entry" : {
             "action_id" : 5,
@@ -9775,8 +9929,8 @@
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 11,
+          "name" : "tbl_act_5",
+          "id" : 14,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9784,22 +9938,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_19",
+          "action_ids" : [41],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_2" : "node_19"
+            "act_5" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_3",
-          "id" : 12,
+          "name" : "tbl_act_6",
+          "id" : 15,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9807,14 +9961,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_3"],
-          "base_default_next" : "node_19",
+          "action_ids" : [42],
+          "actions" : ["act_6"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_3" : "node_19"
+            "act_6" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -9822,7 +9976,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 13,
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 175,
@@ -9848,13 +10002,13 @@
           "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_4",
-            "__MISS__" : "tbl_act_5"
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           }
         },
         {
-          "name" : "tbl_act_4",
-          "id" : 14,
+          "name" : "tbl_act_7",
+          "id" : 17,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9862,22 +10016,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_4"],
-          "base_default_next" : "node_23",
+          "action_ids" : [43],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_27",
           "next_tables" : {
-            "act_4" : "node_23"
+            "act_7" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
-          "id" : 15,
+          "name" : "tbl_act_8",
+          "id" : 18,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9885,14 +10039,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_23",
+          "action_ids" : [44],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_27",
           "next_tables" : {
-            "act_5" : "node_23"
+            "act_8" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -9900,7 +10054,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 16,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 207,
@@ -9925,8 +10079,8 @@
           "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_act_9",
+            "__MISS__" : "tbl_act_10"
           },
           "default_entry" : {
             "action_id" : 7,
@@ -9936,75 +10090,6 @@
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_6" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_7",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_7"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_7" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 43,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 19,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_29",
-          "next_tables" : {
-            "act_8" : "node_29"
-          },
-          "default_entry" : {
-            "action_id" : 44,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_9",
           "id" : 20,
           "key" : [],
@@ -10016,9 +10101,9 @@
           "direct_meters" : null,
           "action_ids" : [45],
           "actions" : ["act_9"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_31",
           "next_tables" : {
-            "act_9" : "node_33"
+            "act_9" : "node_31"
           },
           "default_entry" : {
             "action_id" : 45,
@@ -10039,9 +10124,9 @@
           "direct_meters" : null,
           "action_ids" : [46],
           "actions" : ["act_10"],
-          "base_default_next" : "node_35",
+          "base_default_next" : "node_31",
           "next_tables" : {
-            "act_10" : "node_35"
+            "act_10" : "node_31"
           },
           "default_entry" : {
             "action_id" : 46,
@@ -10062,9 +10147,9 @@
           "direct_meters" : null,
           "action_ids" : [47],
           "actions" : ["act_11"],
-          "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_11" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_11" : "node_33"
           },
           "default_entry" : {
             "action_id" : 47,
@@ -10074,8 +10159,77 @@
           }
         },
         {
-          "name" : "FabricIngress.process_set_source_sink.tb_set_source",
+          "name" : "tbl_act_12",
           "id" : 23,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [48],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_37",
+          "next_tables" : {
+            "act_12" : "node_37"
+          },
+          "default_entry" : {
+            "action_id" : 48,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_13",
+          "id" : 24,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [49],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_39",
+          "next_tables" : {
+            "act_13" : "node_39"
+          },
+          "default_entry" : {
+            "action_id" : 49,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_14",
+          "id" : 25,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [50],
+          "actions" : ["act_14"],
+          "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
+          "next_tables" : {
+            "act_14" : "FabricIngress.process_set_source_sink.tb_set_source"
+          },
+          "default_entry" : {
+            "action_id" : 50,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.process_set_source_sink.tb_set_source",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 101,
@@ -10096,7 +10250,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [10, 0],
+          "action_ids" : [9, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -10112,7 +10266,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 24,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 111,
@@ -10133,12 +10287,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 1],
+          "action_ids" : [10, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
-          "base_default_next" : "node_39",
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_39",
-            "NoAction" : "node_39"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_43",
+            "NoAction" : "node_43"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -10148,8 +10302,8 @@
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 25,
+          "name" : "tbl_act_15",
+          "id" : 28,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10157,14 +10311,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_12"],
+          "action_ids" : [51],
+          "actions" : ["act_15"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_12" : null
+            "act_15" : null
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10228,8 +10382,25 @@
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "filtering_tmp_0"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.filtering.fwd_classifier",
+          "false_next" : "tbl_act_2"
+        },
+        {
+          "name" : "node_10",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 235,
@@ -10251,11 +10422,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_8"
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
+          "name" : "node_12",
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 236,
@@ -10277,11 +10448,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_11"
+          "false_next" : "node_15"
         },
         {
-          "name" : "node_11",
-          "id" : 3,
+          "name" : "node_15",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 250,
@@ -10306,8 +10477,8 @@
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {
-          "name" : "node_19",
-          "id" : 4,
+          "name" : "node_23",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 219,
@@ -10333,11 +10504,11 @@
             }
           },
           "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_29"
+          "false_next" : "node_33"
         },
         {
-          "name" : "node_23",
-          "id" : 5,
+          "name" : "node_27",
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 220,
@@ -10363,11 +10534,11 @@
             }
           },
           "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_29"
+          "false_next" : "node_33"
         },
         {
-          "name" : "node_27",
-          "id" : 6,
+          "name" : "node_31",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 221,
@@ -10392,12 +10563,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
-          "false_next" : "node_29"
+          "true_next" : "tbl_act_11",
+          "false_next" : "node_33"
         },
         {
-          "name" : "node_29",
-          "id" : 7,
+          "name" : "node_33",
+          "id" : 8,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -10416,12 +10587,12 @@
               }
             }
           },
-          "true_next" : "node_30",
-          "false_next" : "node_33"
+          "true_next" : "node_34",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_30",
-          "id" : 8,
+          "name" : "node_34",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 228,
@@ -10446,12 +10617,12 @@
               }
             }
           },
-          "true_next" : "node_31",
-          "false_next" : "node_33"
+          "true_next" : "node_35",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_31",
-          "id" : 9,
+          "name" : "node_35",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 229,
@@ -10469,12 +10640,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
-          "false_next" : "node_33"
+          "true_next" : "tbl_act_12",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_33",
-          "id" : 10,
+          "name" : "node_37",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 27,
@@ -10495,12 +10666,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
-          "false_next" : "node_35"
+          "true_next" : "tbl_act_13",
+          "false_next" : "node_39"
         },
         {
-          "name" : "node_35",
-          "id" : 11,
+          "name" : "node_39",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -10521,12 +10692,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_14",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_39",
-          "id" : 12,
+          "name" : "node_43",
+          "id" : 13,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 70,
@@ -10548,7 +10719,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_12"
+          "true_next" : "tbl_act_15"
         }
       ]
     },
@@ -10561,11 +10732,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_43",
+      "init_table" : "node_47",
       "tables" : [
         {
           "name" : "tbl_drop_now",
-          "id" : 26,
+          "id" : 29,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10573,14 +10744,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
+          "action_ids" : [58],
           "actions" : ["drop_now"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "drop_now" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10588,7 +10759,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 27,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 258,
@@ -10615,15 +10786,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [99, 54],
+          "action_ids" : [102, 57],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_46",
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_46",
-            "nop" : "node_46"
+            "FabricEgress.egress_next.pop_vlan" : "node_50",
+            "nop" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 57,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -10631,7 +10802,7 @@
         },
         {
           "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 28,
+          "id" : 31,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10639,14 +10810,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [98],
+          "action_ids" : [101],
           "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_49",
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_49"
+            "FabricEgress.pkt_io_egress.pop_vlan" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10654,7 +10825,7 @@
         },
         {
           "name" : "tbl_drop_now_0",
-          "id" : 29,
+          "id" : 32,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10662,22 +10833,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [59],
           "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_13",
+          "base_default_next" : "tbl_act_16",
           "next_tables" : {
-            "drop_now" : "tbl_act_13"
+            "drop_now" : "tbl_act_16"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 30,
+          "name" : "tbl_act_16",
+          "id" : 33,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10685,14 +10856,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_52",
+          "action_ids" : [103],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_56",
           "next_tables" : {
-            "act_13" : "node_52"
+            "act_16" : "node_56"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10700,7 +10871,7 @@
         },
         {
           "name" : "FabricEgress.process_int_source.tb_int_source",
-          "id" : 31,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 66,
@@ -10739,15 +10910,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 49],
+          "action_ids" : [60, 52],
           "actions" : ["FabricEgress.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_55",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "FabricEgress.process_int_source.int_source_dscp" : "node_55",
-            "NoAction" : "node_55"
+            "FabricEgress.process_int_source.int_source_dscp" : "node_59",
+            "NoAction" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 52,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -10755,7 +10926,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_insert",
-          "id" : 32,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 227,
@@ -10769,7 +10940,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59, 50],
+          "action_ids" : [62, 53],
           "actions" : ["FabricEgress.process_int_transit.int_transit", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0003",
           "next_tables" : {
@@ -10777,7 +10948,7 @@
             "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0003"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 53,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -10785,7 +10956,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_inst_0003",
-          "id" : 33,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 237,
@@ -10806,7 +10977,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 51],
+          "action_ids" : [63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 54],
           "actions" : ["FabricEgress.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -10829,7 +11000,7 @@
             "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 54,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -10837,7 +11008,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_inst_0407",
-          "id" : 34,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 264,
@@ -10858,7 +11029,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 52],
+          "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 55],
           "actions" : ["FabricEgress.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_transit.int_set_header_0407_i15", "NoAction"],
           "base_default_next" : "tbl_process_int_transit_int_update_total_hop_cnt",
           "next_tables" : {
@@ -10881,7 +11052,7 @@
             "NoAction" : "tbl_process_int_transit_int_update_total_hop_cnt"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 55,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -10889,75 +11060,6 @@
         },
         {
           "name" : "tbl_process_int_transit_int_update_total_hop_cnt",
-          "id" : 35,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
-          "base_default_next" : "node_60",
-          "next_tables" : {
-            "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_60"
-          },
-          "default_entry" : {
-            "action_id" : 58,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_outer_encap_int_update_ipv4",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
-          "base_default_next" : "node_62",
-          "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_62"
-          },
-          "default_entry" : {
-            "action_id" : 92,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_outer_encap_int_update_udp",
-          "id" : 37,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
-          "base_default_next" : "node_64",
-          "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_udp" : "node_64"
-          },
-          "default_entry" : {
-            "action_id" : 93,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_outer_encap_int_update_shim",
           "id" : 38,
           "key" : [],
           "match_type" : "exact",
@@ -10966,14 +11068,83 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
-          "base_default_next" : "node_66",
+          "action_ids" : [61],
+          "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
+          "base_default_next" : "node_64",
           "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_shim" : "node_66"
+            "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_64"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_outer_encap_int_update_ipv4",
+          "id" : 39,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [95],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
+          "base_default_next" : "node_66",
+          "next_tables" : {
+            "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_66"
+          },
+          "default_entry" : {
+            "action_id" : 95,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_outer_encap_int_update_udp",
+          "id" : 40,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [96],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
+          "base_default_next" : "node_68",
+          "next_tables" : {
+            "FabricEgress.process_int_outer_encap.int_update_udp" : "node_68"
+          },
+          "default_entry" : {
+            "action_id" : 96,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_outer_encap_int_update_shim",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [97],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
+          "base_default_next" : "node_70",
+          "next_tables" : {
+            "FabricEgress.process_int_outer_encap.int_update_shim" : "node_70"
+          },
+          "default_entry" : {
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10981,7 +11152,7 @@
         },
         {
           "name" : "FabricEgress.process_int_report.tb_generate_report",
-          "id" : 39,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/int_report.p4",
             "line" : 87,
@@ -10995,15 +11166,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 53],
+          "action_ids" : [98, 56],
           "actions" : ["FabricEgress.process_int_report.do_report_encapsulation", "NoAction"],
-          "base_default_next" : "node_68",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricEgress.process_int_report.do_report_encapsulation" : "node_68",
-            "NoAction" : "node_68"
+            "FabricEgress.process_int_report.do_report_encapsulation" : "node_72",
+            "NoAction" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 56,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -11011,7 +11182,7 @@
         },
         {
           "name" : "tbl_process_int_sink_restore_header",
-          "id" : 40,
+          "id" : 43,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11019,14 +11190,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
+          "action_ids" : [99],
           "actions" : ["FabricEgress.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_sink.restore_header" : "tbl_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11034,7 +11205,7 @@
         },
         {
           "name" : "tbl_process_int_sink_int_sink",
-          "id" : 41,
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11042,14 +11213,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
+          "action_ids" : [100],
           "actions" : ["FabricEgress.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11059,8 +11230,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_43",
-          "id" : 13,
+          "name" : "node_47",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 272,
@@ -11112,8 +11283,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_46",
-          "id" : 14,
+          "name" : "node_50",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 42,
@@ -11134,12 +11305,12 @@
               }
             }
           },
-          "true_next" : "node_47",
-          "false_next" : "node_52"
+          "true_next" : "node_51",
+          "false_next" : "node_56"
         },
         {
-          "name" : "node_47",
-          "id" : 15,
+          "name" : "node_51",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -11185,11 +11356,11 @@
             }
           },
           "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_49"
+          "false_next" : "node_53"
         },
         {
-          "name" : "node_49",
-          "id" : 16,
+          "name" : "node_53",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 46,
@@ -11245,11 +11416,11 @@
             }
           },
           "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_13"
+          "false_next" : "tbl_act_16"
         },
         {
-          "name" : "node_52",
-          "id" : 17,
+          "name" : "node_56",
+          "id" : 18,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 94,
@@ -11325,11 +11496,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_53"
+          "true_next" : "node_57"
         },
         {
-          "name" : "node_53",
-          "id" : 18,
+          "name" : "node_57",
+          "id" : 19,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 97,
@@ -11351,11 +11522,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_source.tb_int_source",
-          "false_next" : "node_55"
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_55",
-          "id" : 19,
+          "name" : "node_59",
+          "id" : 20,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 100,
@@ -11377,8 +11548,8 @@
           "true_next" : "FabricEgress.process_int_transit.tb_int_insert"
         },
         {
-          "name" : "node_60",
-          "id" : 20,
+          "name" : "node_64",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 314,
@@ -11397,11 +11568,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_ipv4",
-          "false_next" : "node_62"
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_62",
-          "id" : 21,
+          "name" : "node_66",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 317,
@@ -11420,11 +11591,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_udp",
-          "false_next" : "node_64"
+          "false_next" : "node_68"
         },
         {
-          "name" : "node_64",
-          "id" : 22,
+          "name" : "node_68",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 320,
@@ -11443,11 +11614,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_shim",
-          "false_next" : "node_66"
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_66",
-          "id" : 23,
+          "name" : "node_70",
+          "id" : 24,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 104,
@@ -11469,11 +11640,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_report.tb_generate_report",
-          "false_next" : "node_68"
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_68",
-          "id" : 24,
+          "name" : "node_72",
+          "id" : 25,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 108,