NoAction in ACL should be mapped to NOP
Change-Id: Ia3c9038eb726379ed2f95635c28ddf5794e646de
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 a347d4f..89b5743 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
@@ -1340,7 +1340,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 222,
+ "line" : 223,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1664,14 +1664,8 @@
"primitives" : []
},
{
- "name" : "nop",
- "id" : 10,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "FabricIngress.process_set_source_sink.int_set_source",
- "id" : 11,
+ "id" : 10,
"runtime_data" : [],
"primitives" : [
{
@@ -1697,7 +1691,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_sink",
- "id" : 12,
+ "id" : 11,
"runtime_data" : [],
"primitives" : [
{
@@ -1723,7 +1717,7 @@
},
{
"name" : "FabricIngress.filtering.drop",
- "id" : 13,
+ "id" : 12,
"runtime_data" : [],
"primitives" : [
{
@@ -1740,7 +1734,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 14,
+ "id" : 13,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1771,7 +1765,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 15,
+ "id" : 14,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1922,7 +1916,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 16,
+ "id" : 15,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -1953,7 +1947,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 17,
+ "id" : 16,
"runtime_data" : [
{
"name" : "next_id",
@@ -1984,7 +1978,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 18,
+ "id" : 17,
"runtime_data" : [
{
"name" : "next_id",
@@ -2030,7 +2024,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
- "id" : 19,
+ "id" : 18,
"runtime_data" : [
{
"name" : "next_id",
@@ -2061,7 +2055,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_acl",
- "id" : 20,
+ "id" : 19,
"runtime_data" : [
{
"name" : "next_id",
@@ -2092,7 +2086,7 @@
},
{
"name" : "FabricIngress.forwarding.punt_to_cpu",
- "id" : 21,
+ "id" : 20,
"runtime_data" : [],
"primitives" : [
{
@@ -2128,7 +2122,7 @@
},
{
"name" : "FabricIngress.forwarding.clone_to_cpu",
- "id" : 22,
+ "id" : 21,
"runtime_data" : [],
"primitives" : [
{
@@ -2164,7 +2158,7 @@
},
{
"name" : "FabricIngress.forwarding.drop",
- "id" : 23,
+ "id" : 22,
"runtime_data" : [],
"primitives" : [
{
@@ -2180,6 +2174,12 @@
]
},
{
+ "name" : "FabricIngress.forwarding.nop_acl",
+ "id" : 23,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
"name" : "FabricIngress.next.set_vlan",
"id" : 24,
"runtime_data" : [
@@ -9367,7 +9367,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 14, 8, 13],
+ "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",
"next_tables" : {
@@ -9418,14 +9418,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16],
+ "action_ids" : [15],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_6",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_6"
},
"default_entry" : {
- "action_id" : 16,
+ "action_id" : 15,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -9460,7 +9460,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17, 2],
+ "action_ids" : [16, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -9497,7 +9497,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [18, 3],
+ "action_ids" : [17, 3],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
"base_default_next" : "tbl_act_0",
"next_tables" : {
@@ -9557,7 +9557,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 4],
+ "action_ids" : [18, 4],
"actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -9576,7 +9576,7 @@
"id" : 7,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 127,
+ "line" : 131,
"column" : 10,
"source_fragment" : "acl"
},
@@ -9660,18 +9660,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 21, 22, 23, 9],
- "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "nop"],
+ "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",
"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",
- "nop" : "tbl_act_1"
+ "FabricIngress.forwarding.nop_acl" : "tbl_act_1"
},
"default_entry" : {
- "action_id" : 9,
+ "action_id" : 23,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -9723,7 +9723,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [24, 10],
+ "action_ids" : [24, 9],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -9731,7 +9731,7 @@
"nop" : "FabricIngress.next.simple"
},
"default_entry" : {
- "action_id" : 10,
+ "action_id" : 9,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -10096,7 +10096,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 0],
+ "action_ids" : [10, 0],
"actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
"next_tables" : {
@@ -10133,7 +10133,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 1],
+ "action_ids" : [11, 1],
"actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
"base_default_next" : "node_39",
"next_tables" : {
@@ -10232,7 +10232,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 231,
+ "line" : 235,
"column" : 11,
"source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
},
@@ -10258,7 +10258,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 232,
+ "line" : 236,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
},
@@ -10284,7 +10284,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 246,
+ "line" : 250,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
},
@@ -11252,7 +11252,7 @@
"id" : 17,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 100,
+ "line" : 94,
"column" : 12,
"source_fragment" : "standard_metadata.ingress_port != 255 && ..."
},
@@ -11332,7 +11332,7 @@
"id" : 18,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 103,
+ "line" : 97,
"column" : 16,
"source_fragment" : "fabric_metadata.int_meta.source == 1"
},
@@ -11358,7 +11358,7 @@
"id" : 19,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 106,
+ "line" : 100,
"column" : 15,
"source_fragment" : "hdr.int_header.isValid()"
},
@@ -11450,7 +11450,7 @@
"id" : 23,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 110,
+ "line" : 104,
"column" : 20,
"source_fragment" : "standard_metadata.instance_type == 1"
},
@@ -11476,7 +11476,7 @@
"id" : 24,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 114,
+ "line" : 108,
"column" : 20,
"source_fragment" : "fabric_metadata.int_meta.sink == 1"
},