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/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index d3137e5..5b29faa 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -187,8 +187,8 @@
PiActionId.of("FabricIngress.next.mpls_routing_v6_simple");
public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_UPDATE_TOTAL_HOP_CNT =
PiActionId.of("FabricEgress.process_int_transit.int_update_total_hop_cnt");
- public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_HASHED =
- PiActionId.of("FabricIngress.next.mpls_routing_v6_hashed");
+ public static final PiActionId FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN =
+ PiActionId.of("FabricIngress.filtering.nop_ingress_port_vlan");
public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I14 =
PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i14");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING =
@@ -318,6 +318,8 @@
PiActionId.of("FabricIngress.next.mpls_routing_v4_simple");
public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ACL =
PiActionId.of("FabricIngress.forwarding.nop_acl");
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_HASHED =
+ PiActionId.of("FabricIngress.next.mpls_routing_v6_hashed");
public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
PiActionId.of("FabricIngress.next.l3_routing_vlan");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ACL =
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index e5d11a5..d14aa1a 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -53,6 +53,8 @@
private static final String INVALID_TREATMENT = "Invalid treatment for %s block [%s]";
private static final String INVALID_TREATMENT_WITH_EXP = "Invalid treatment for %s block: %s [%s]";
private static final PiAction NOP = PiAction.builder().withId(FabricConstants.NOP).build();
+ private static final PiAction NOP_INGRESS_PORT_VLAN = PiAction.builder()
+ .withId(FabricConstants.FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN).build();
private static final PiAction NOP_ACL = PiAction.builder()
.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ACL).build();
@@ -81,7 +83,7 @@
Instruction noActInst = Instructions.createNoAction();
if (instructions.isEmpty() || instructions.contains(noActInst)) {
// nop
- return NOP;
+ return NOP_INGRESS_PORT_VLAN;
}
L2ModificationInstruction.ModVlanHeaderInstruction pushVlanInst = null;
diff --git a/pipelines/fabric/src/main/resources/include/control/filtering.p4 b/pipelines/fabric/src/main/resources/include/control/filtering.p4
index c5030d7..dcabea7 100644
--- a/pipelines/fabric/src/main/resources/include/control/filtering.p4
+++ b/pipelines/fabric/src/main/resources/include/control/filtering.p4
@@ -58,6 +58,11 @@
ingress_port_vlan_counter.count();
}
+ action nop_ingress_port_vlan() {
+ nop();
+ ingress_port_vlan_counter.count();
+ }
+
table ingress_port_vlan {
key = {
standard_metadata.ingress_port: exact;
@@ -68,11 +73,11 @@
actions = {
push_internal_vlan;
set_vlan;
- @defaultonly nop;
drop;
+ nop_ingress_port_vlan();
}
- const default_action = nop();
+ const default_action = push_internal_vlan(DEFAULT_VLAN_ID);
counters = ingress_port_vlan_counter;
}
@@ -111,7 +116,12 @@
}
apply {
- ingress_port_vlan.apply();
- fwd_classifier.apply();
+ if (ingress_port_vlan.apply().hit) {
+ fwd_classifier.apply();
+ } else {
+ // Packet from unconfigured port. Skip forwarding processing,
+ // except for ACL table in case we want to punt to cpu.
+ fabric_metadata.fwd_type = FWD_UNKNOWN;
+ }
}
}
diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4
index d717853..77808bd 100644
--- a/pipelines/fabric/src/main/resources/include/define.p4
+++ b/pipelines/fabric/src/main/resources/include/define.p4
@@ -106,6 +106,9 @@
const fwd_type_t FWD_IPV4_MULTICAST = 3;
const fwd_type_t FWD_IPV6_UNICAST = 4;
const fwd_type_t FWD_IPV6_MULTICAST = 5;
+const fwd_type_t FWD_UNKNOWN = 7;
+
+const vlan_id_t DEFAULT_VLAN_ID = 12w4094;
const bit<8> DEFAULT_MPLS_TTL = 64;
const bit<8> DEFAULT_IPV4_TTL = 64;
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 520f2b1..9d32a41 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -13,6 +13,7 @@
["tmp_5", 32, false],
["spgw_ingress_tmp_1", 1, false],
["spgw_ingress_tmp_2", 1, false],
+ ["filtering_tmp_0", 1, false],
["next_tmp_2", 1, false],
["next_tmp_3", 1, false],
["next_tmp_4", 1, false],
@@ -28,7 +29,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_2", 3, false]
+ ["_padding_2", 2, false]
]
},
{
@@ -2131,14 +2132,8 @@
"primitives" : []
},
{
- "name" : "nop",
- "id" : 14,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "drop_now",
- "id" : 15,
+ "id" : 14,
"runtime_data" : [],
"primitives" : [
{
@@ -2165,7 +2160,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.gtpu_decap",
- "id" : 16,
+ "id" : 15,
"runtime_data" : [],
"primitives" : [
{
@@ -2217,7 +2212,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 17,
+ "id" : 16,
"runtime_data" : [
{
"name" : "teid",
@@ -2294,7 +2289,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_source",
- "id" : 18,
+ "id" : 17,
"runtime_data" : [],
"primitives" : [
{
@@ -2320,7 +2315,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_sink",
- "id" : 19,
+ "id" : 18,
"runtime_data" : [],
"primitives" : [
{
@@ -2346,7 +2341,7 @@
},
{
"name" : "FabricIngress.filtering.drop",
- "id" : 20,
+ "id" : 19,
"runtime_data" : [],
"primitives" : [
{
@@ -2363,7 +2358,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 21,
+ "id" : 20,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -2394,7 +2389,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 22,
+ "id" : 21,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -2544,6 +2539,12 @@
]
},
{
+ "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
+ "id" : 22,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
"name" : "FabricIngress.filtering.set_forwarding_type",
"id" : 23,
"runtime_data" : [
@@ -2567,7 +2568,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 94,
+ "line" : 99,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -3278,7 +3279,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3469,7 +3470,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3837,7 +3838,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -4028,7 +4029,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -4423,7 +4424,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 116,
+ "line" : 119,
"column" : 36,
"source_fragment" : "2w1; ..."
}
@@ -4509,7 +4510,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 120,
"column" : 38,
"source_fragment" : "2w2; ..."
}
@@ -4535,7 +4536,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 115,
+ "line" : 118,
"column" : 37,
"source_fragment" : "2w0; ..."
}
@@ -4637,19 +4638,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; ..."
- }
+ ]
}
]
},
@@ -4663,7 +4668,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_hasReturned_0"]
+ "value" : ["scalars", "filtering_tmp_0"]
},
{
"type" : "expression",
@@ -4693,23 +4698,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; ..."
+ }
}
]
},
@@ -4723,23 +4724,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; ..."
+ }
}
]
},
@@ -4753,7 +4750,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_tmp_3"]
+ "value" : ["scalars", "next_hasReturned_0"]
},
{
"type" : "expression",
@@ -4764,7 +4761,7 @@
"left" : null,
"right" : {
"type" : "bool",
- "value" : true
+ "value" : false
}
}
}
@@ -4783,6 +4780,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_20",
+ "id" : 67,
+ "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_21",
+ "id" : 68,
+ "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_22",
+ "id" : 69,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "next_tmp_3"]
},
{
@@ -4804,8 +4891,8 @@
]
},
{
- "name" : "act_20",
- "id" : 67,
+ "name" : "act_23",
+ "id" : 70,
"runtime_data" : [],
"primitives" : [
{
@@ -4834,8 +4921,8 @@
]
},
{
- "name" : "act_21",
- "id" : 68,
+ "name" : "act_24",
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -4864,8 +4951,8 @@
]
},
{
- "name" : "act_22",
- "id" : 69,
+ "name" : "act_25",
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -4900,8 +4987,8 @@
]
},
{
- "name" : "act_23",
- "id" : 70,
+ "name" : "act_26",
+ "id" : 73,
"runtime_data" : [],
"primitives" : [
{
@@ -4949,8 +5036,8 @@
]
},
{
- "name" : "act_24",
- "id" : 71,
+ "name" : "act_27",
+ "id" : 74,
"runtime_data" : [],
"primitives" : [
{
@@ -4998,8 +5085,8 @@
]
},
{
- "name" : "act_25",
- "id" : 72,
+ "name" : "act_28",
+ "id" : 75,
"runtime_data" : [],
"primitives" : [
{
@@ -5056,8 +5143,8 @@
]
},
{
- "name" : "act_26",
- "id" : 73,
+ "name" : "act_29",
+ "id" : 76,
"runtime_data" : [],
"primitives" : [
{
@@ -5114,8 +5201,8 @@
]
},
{
- "name" : "act_27",
- "id" : 74,
+ "name" : "act_30",
+ "id" : 77,
"runtime_data" : [],
"primitives" : [
{
@@ -5135,24 +5222,6 @@
},
{
"name" : "NoAction",
- "id" : 75,
- "runtime_data" : [],
- "primitives" : []
- },
- {
- "name" : "NoAction",
- "id" : 76,
- "runtime_data" : [],
- "primitives" : []
- },
- {
- "name" : "NoAction",
- "id" : 77,
- "runtime_data" : [],
- "primitives" : []
- },
- {
- "name" : "NoAction",
"id" : 78,
"runtime_data" : [],
"primitives" : []
@@ -5164,15 +5233,33 @@
"primitives" : []
},
{
- "name" : "nop",
+ "name" : "NoAction",
"id" : 80,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "drop_now",
+ "name" : "NoAction",
"id" : 81,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 82,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "nop",
+ "id" : 83,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "drop_now",
+ "id" : 84,
+ "runtime_data" : [],
"primitives" : [
{
"op" : "drop",
@@ -5198,7 +5285,7 @@
},
{
"name" : "drop_now",
- "id" : 82,
+ "id" : 85,
"runtime_data" : [],
"primitives" : [
{
@@ -5225,7 +5312,7 @@
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 83,
+ "id" : 86,
"runtime_data" : [],
"primitives" : [
{
@@ -5432,7 +5519,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -5817,7 +5904,7 @@
},
{
"name" : "FabricEgress.process_int_source.int_source_dscp",
- "id" : 84,
+ "id" : 87,
"runtime_data" : [
{
"name" : "max_hop",
@@ -5885,7 +5972,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 124,
+ "line" : 127,
"column" : 35,
"source_fragment" : "4; ..."
}
@@ -6316,7 +6403,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 122,
+ "line" : 125,
"column" : 24,
"source_fragment" : "0x1; ..."
}
@@ -6325,7 +6412,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_update_total_hop_cnt",
- "id" : 85,
+ "id" : 88,
"runtime_data" : [],
"primitives" : [
{
@@ -6374,7 +6461,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_transit",
- "id" : 86,
+ "id" : 89,
"runtime_data" : [
{
"name" : "switch_id",
@@ -6457,13 +6544,13 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i0",
- "id" : 87,
+ "id" : 90,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i1",
- "id" : 88,
+ "id" : 91,
"runtime_data" : [],
"primitives" : [
{
@@ -6536,7 +6623,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i2",
- "id" : 89,
+ "id" : 92,
"runtime_data" : [],
"primitives" : [
{
@@ -6577,7 +6664,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i3",
- "id" : 90,
+ "id" : 93,
"runtime_data" : [],
"primitives" : [
{
@@ -6684,7 +6771,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i4",
- "id" : 91,
+ "id" : 94,
"runtime_data" : [],
"primitives" : [
{
@@ -6770,7 +6857,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i5",
- "id" : 92,
+ "id" : 95,
"runtime_data" : [],
"primitives" : [
{
@@ -6922,7 +7009,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i6",
- "id" : 93,
+ "id" : 96,
"runtime_data" : [],
"primitives" : [
{
@@ -7042,7 +7129,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i7",
- "id" : 94,
+ "id" : 97,
"runtime_data" : [],
"primitives" : [
{
@@ -7228,7 +7315,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i8",
- "id" : 95,
+ "id" : 98,
"runtime_data" : [],
"primitives" : [
{
@@ -7269,7 +7356,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i9",
- "id" : 96,
+ "id" : 99,
"runtime_data" : [],
"primitives" : [
{
@@ -7376,7 +7463,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i10",
- "id" : 97,
+ "id" : 100,
"runtime_data" : [],
"primitives" : [
{
@@ -7451,7 +7538,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i11",
- "id" : 98,
+ "id" : 101,
"runtime_data" : [],
"primitives" : [
{
@@ -7592,7 +7679,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i12",
- "id" : 99,
+ "id" : 102,
"runtime_data" : [],
"primitives" : [
{
@@ -7712,7 +7799,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i13",
- "id" : 100,
+ "id" : 103,
"runtime_data" : [],
"primitives" : [
{
@@ -7898,7 +7985,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i14",
- "id" : 101,
+ "id" : 104,
"runtime_data" : [],
"primitives" : [
{
@@ -8052,7 +8139,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0003_i15",
- "id" : 102,
+ "id" : 105,
"runtime_data" : [],
"primitives" : [
{
@@ -8272,13 +8359,13 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i0",
- "id" : 103,
+ "id" : 106,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i1",
- "id" : 104,
+ "id" : 107,
"runtime_data" : [],
"primitives" : [
{
@@ -8319,7 +8406,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i2",
- "id" : 105,
+ "id" : 108,
"runtime_data" : [],
"primitives" : [
{
@@ -8379,7 +8466,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i3",
- "id" : 106,
+ "id" : 109,
"runtime_data" : [],
"primitives" : [
{
@@ -8473,7 +8560,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i4",
- "id" : 107,
+ "id" : 110,
"runtime_data" : [],
"primitives" : [
{
@@ -8537,7 +8624,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i5",
- "id" : 108,
+ "id" : 111,
"runtime_data" : [],
"primitives" : [
{
@@ -8635,7 +8722,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i6",
- "id" : 109,
+ "id" : 112,
"runtime_data" : [],
"primitives" : [
{
@@ -8752,7 +8839,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i7",
- "id" : 110,
+ "id" : 113,
"runtime_data" : [],
"primitives" : [
{
@@ -8903,7 +8990,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i8",
- "id" : 111,
+ "id" : 114,
"runtime_data" : [],
"primitives" : [
{
@@ -8944,7 +9031,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i9",
- "id" : 112,
+ "id" : 115,
"runtime_data" : [],
"primitives" : [
{
@@ -9019,7 +9106,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i10",
- "id" : 113,
+ "id" : 116,
"runtime_data" : [],
"primitives" : [
{
@@ -9113,7 +9200,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i11",
- "id" : 114,
+ "id" : 117,
"runtime_data" : [],
"primitives" : [
{
@@ -9241,7 +9328,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i12",
- "id" : 115,
+ "id" : 118,
"runtime_data" : [],
"primitives" : [
{
@@ -9339,7 +9426,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i13",
- "id" : 116,
+ "id" : 119,
"runtime_data" : [],
"primitives" : [
{
@@ -9471,7 +9558,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i14",
- "id" : 117,
+ "id" : 120,
"runtime_data" : [],
"primitives" : [
{
@@ -9622,7 +9709,7 @@
},
{
"name" : "FabricEgress.process_int_transit.int_set_header_0407_i15",
- "id" : 118,
+ "id" : 121,
"runtime_data" : [],
"primitives" : [
{
@@ -9807,7 +9894,7 @@
},
{
"name" : "FabricEgress.process_int_outer_encap.int_update_ipv4",
- "id" : 119,
+ "id" : 122,
"runtime_data" : [],
"primitives" : [
{
@@ -9856,7 +9943,7 @@
},
{
"name" : "FabricEgress.process_int_outer_encap.int_update_udp",
- "id" : 120,
+ "id" : 123,
"runtime_data" : [],
"primitives" : [
{
@@ -9905,7 +9992,7 @@
},
{
"name" : "FabricEgress.process_int_outer_encap.int_update_shim",
- "id" : 121,
+ "id" : 124,
"runtime_data" : [],
"primitives" : [
{
@@ -9964,7 +10051,7 @@
},
{
"name" : "FabricEgress.process_int_report.do_report_encapsulation",
- "id" : 122,
+ "id" : 125,
"runtime_data" : [
{
"name" : "src_mac",
@@ -10498,7 +10585,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 132,
"column" : 31,
"source_fragment" : "0; ..."
}
@@ -10593,7 +10680,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 133,
+ "line" : 136,
"column" : 21,
"source_fragment" : "1; ..."
}
@@ -10640,7 +10727,7 @@
},
{
"name" : "FabricEgress.process_int_sink.restore_header",
- "id" : 123,
+ "id" : 126,
"runtime_data" : [],
"primitives" : [
{
@@ -10698,7 +10785,7 @@
},
{
"name" : "FabricEgress.process_int_sink.int_sink",
- "id" : 124,
+ "id" : 127,
"runtime_data" : [],
"primitives" : [
{
@@ -11029,7 +11116,7 @@
},
{
"name" : "FabricEgress.pkt_io_egress.pop_vlan",
- "id" : 125,
+ "id" : 128,
"runtime_data" : [],
"primitives" : [
{
@@ -11070,7 +11157,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 126,
+ "id" : 129,
"runtime_data" : [],
"primitives" : [
{
@@ -11110,8 +11197,8 @@
]
},
{
- "name" : "act_28",
- "id" : 127,
+ "name" : "act_31",
+ "id" : 130,
"runtime_data" : [],
"primitives" : [
{
@@ -11417,14 +11504,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15],
+ "action_ids" : [14],
"actions" : ["drop_now"],
"base_default_next" : "tbl_act_8",
"next_tables" : {
"drop_now" : "tbl_act_8"
},
"default_entry" : {
- "action_id" : 15,
+ "action_id" : 14,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11463,14 +11550,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16],
+ "action_ids" : [15],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_27",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
},
"default_entry" : {
- "action_id" : 16,
+ "action_id" : 15,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11499,7 +11586,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17, 0],
+ "action_ids" : [16, 0],
"actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
"base_default_next" : null,
"next_tables" : {
@@ -11633,7 +11720,7 @@
"id" : 19,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 61,
+ "line" : 66,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -11663,17 +11750,61 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [22, 21, 13, 20],
- "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
- "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+ "action_ids" : [21, 20, 19, 22],
+ "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_14",
+ "__MISS__" : "tbl_act_15"
},
"default_entry" : {
- "action_id" : 13,
+ "action_id" : 21,
+ "action_const" : true,
+ "action_data" : ["0xffe"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_14",
+ "id" : 20,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [61],
+ "actions" : ["act_14"],
+ "base_default_next" : "node_32",
+ "next_tables" : {
+ "act_14" : "node_32"
+ },
+ "default_entry" : {
+ "action_id" : 61,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_15",
+ "id" : 21,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [62],
+ "actions" : ["act_15"],
+ "base_default_next" : "node_32",
+ "next_tables" : {
+ "act_15" : "node_32"
+ },
+ "default_entry" : {
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11681,10 +11812,10 @@
},
{
"name" : "FabricIngress.filtering.fwd_classifier",
- "id" : 20,
+ "id" : 22,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 98,
+ "line" : 103,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -11716,9 +11847,9 @@
"direct_meters" : null,
"action_ids" : [23],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
- "base_default_next" : "node_31",
+ "base_default_next" : "node_35",
"next_tables" : {
- "FabricIngress.filtering.set_forwarding_type" : "node_31"
+ "FabricIngress.filtering.set_forwarding_type" : "node_35"
},
"default_entry" : {
"action_id" : 23,
@@ -11728,8 +11859,31 @@
}
},
{
+ "name" : "tbl_act_16",
+ "id" : 23,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [63],
+ "actions" : ["act_16"],
+ "base_default_next" : "node_35",
+ "next_tables" : {
+ "act_16" : "node_35"
+ },
+ "default_entry" : {
+ "action_id" : 63,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
"name" : "FabricIngress.forwarding.bridging",
- "id" : 21,
+ "id" : 24,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 41,
@@ -11772,7 +11926,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 22,
+ "id" : 25,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 65,
@@ -11795,10 +11949,10 @@
"direct_meters" : null,
"action_ids" : [25, 5],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
- "base_default_next" : "tbl_act_14",
+ "base_default_next" : "tbl_act_17",
"next_tables" : {
- "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_14",
- "NoAction" : "tbl_act_14"
+ "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
+ "NoAction" : "tbl_act_17"
},
"default_entry" : {
"action_id" : 5,
@@ -11808,8 +11962,8 @@
}
},
{
- "name" : "tbl_act_14",
- "id" : 23,
+ "name" : "tbl_act_17",
+ "id" : 26,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11817,14 +11971,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
- "actions" : ["act_14"],
+ "action_ids" : [64],
+ "actions" : ["act_17"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "act_14" : "FabricIngress.forwarding.acl"
+ "act_17" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11832,7 +11986,7 @@
},
{
"name" : "FabricIngress.forwarding.unicast_v4",
- "id" : 24,
+ "id" : 27,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 87,
@@ -11869,7 +12023,7 @@
},
{
"name" : "FabricIngress.forwarding.multicast_v4",
- "id" : 25,
+ "id" : 28,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 172,
@@ -11912,7 +12066,7 @@
},
{
"name" : "FabricIngress.forwarding.unicast_v6",
- "id" : 26,
+ "id" : 29,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 197,
@@ -11949,7 +12103,7 @@
},
{
"name" : "FabricIngress.forwarding.multicast_v6",
- "id" : 27,
+ "id" : 30,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 220,
@@ -11992,7 +12146,7 @@
},
{
"name" : "FabricIngress.forwarding.acl",
- "id" : 28,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 131,
@@ -12081,13 +12235,13 @@
"direct_meters" : null,
"action_ids" : [27, 28, 29, 30, 31],
"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_15",
+ "base_default_next" : "tbl_act_18",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_15",
- "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_15",
- "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_15",
- "FabricIngress.forwarding.drop" : "tbl_act_15",
- "FabricIngress.forwarding.nop_acl" : "tbl_act_15"
+ "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
+ "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
+ "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
+ "FabricIngress.forwarding.drop" : "tbl_act_18",
+ "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
},
"default_entry" : {
"action_id" : 31,
@@ -12097,8 +12251,8 @@
}
},
{
- "name" : "tbl_act_15",
- "id" : 29,
+ "name" : "tbl_act_18",
+ "id" : 32,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12106,14 +12260,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [62],
- "actions" : ["act_15"],
+ "action_ids" : [65],
+ "actions" : ["act_18"],
"base_default_next" : "FabricIngress.next.vlan_meta",
"next_tables" : {
- "act_15" : "FabricIngress.next.vlan_meta"
+ "act_18" : "FabricIngress.next.vlan_meta"
},
"default_entry" : {
- "action_id" : 62,
+ "action_id" : 65,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12121,7 +12275,7 @@
},
{
"name" : "FabricIngress.next.vlan_meta",
- "id" : 30,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 65,
@@ -12142,7 +12296,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35, 14],
+ "action_ids" : [35, 13],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -12150,7 +12304,7 @@
"nop" : "FabricIngress.next.simple"
},
"default_entry" : {
- "action_id" : 14,
+ "action_id" : 13,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -12158,7 +12312,7 @@
},
{
"name" : "FabricIngress.next.simple",
- "id" : 31,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 122,
@@ -12183,8 +12337,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_16",
- "__MISS__" : "tbl_act_17"
+ "__HIT__" : "tbl_act_19",
+ "__MISS__" : "tbl_act_20"
},
"default_entry" : {
"action_id" : 10,
@@ -12194,8 +12348,8 @@
}
},
{
- "name" : "tbl_act_16",
- "id" : 32,
+ "name" : "tbl_act_19",
+ "id" : 35,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12203,22 +12357,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [63],
- "actions" : ["act_16"],
- "base_default_next" : "node_50",
+ "action_ids" : [66],
+ "actions" : ["act_19"],
+ "base_default_next" : "node_54",
"next_tables" : {
- "act_16" : "node_50"
+ "act_19" : "node_54"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_17",
- "id" : 33,
+ "name" : "tbl_act_20",
+ "id" : 36,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12226,14 +12380,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
- "actions" : ["act_17"],
- "base_default_next" : "node_50",
+ "action_ids" : [67],
+ "actions" : ["act_20"],
+ "base_default_next" : "node_54",
"next_tables" : {
- "act_17" : "node_50"
+ "act_20" : "node_54"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12241,7 +12395,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 34,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 175,
@@ -12267,13 +12421,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_18",
- "__MISS__" : "tbl_act_19"
+ "__HIT__" : "tbl_act_21",
+ "__MISS__" : "tbl_act_22"
}
},
{
- "name" : "tbl_act_18",
- "id" : 35,
+ "name" : "tbl_act_21",
+ "id" : 38,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12281,22 +12435,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [65],
- "actions" : ["act_18"],
- "base_default_next" : "node_54",
+ "action_ids" : [68],
+ "actions" : ["act_21"],
+ "base_default_next" : "node_58",
"next_tables" : {
- "act_18" : "node_54"
+ "act_21" : "node_58"
},
"default_entry" : {
- "action_id" : 65,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_19",
- "id" : 36,
+ "name" : "tbl_act_22",
+ "id" : 39,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12304,14 +12458,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [66],
- "actions" : ["act_19"],
- "base_default_next" : "node_54",
+ "action_ids" : [69],
+ "actions" : ["act_22"],
+ "base_default_next" : "node_58",
"next_tables" : {
- "act_19" : "node_54"
+ "act_22" : "node_58"
},
"default_entry" : {
- "action_id" : 66,
+ "action_id" : 69,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12319,7 +12473,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 37,
+ "id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 207,
@@ -12344,8 +12498,8 @@
"actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_20",
- "__MISS__" : "tbl_act_21"
+ "__HIT__" : "tbl_act_23",
+ "__MISS__" : "tbl_act_24"
},
"default_entry" : {
"action_id" : 12,
@@ -12355,75 +12509,6 @@
}
},
{
- "name" : "tbl_act_20",
- "id" : 38,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [67],
- "actions" : ["act_20"],
- "base_default_next" : "node_58",
- "next_tables" : {
- "act_20" : "node_58"
- },
- "default_entry" : {
- "action_id" : 67,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_21",
- "id" : 39,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [68],
- "actions" : ["act_21"],
- "base_default_next" : "node_58",
- "next_tables" : {
- "act_21" : "node_58"
- },
- "default_entry" : {
- "action_id" : 68,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_22",
- "id" : 40,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [69],
- "actions" : ["act_22"],
- "base_default_next" : "node_60",
- "next_tables" : {
- "act_22" : "node_60"
- },
- "default_entry" : {
- "action_id" : 69,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
"name" : "tbl_act_23",
"id" : 41,
"key" : [],
@@ -12435,9 +12520,9 @@
"direct_meters" : null,
"action_ids" : [70],
"actions" : ["act_23"],
- "base_default_next" : "node_66",
+ "base_default_next" : "node_62",
"next_tables" : {
- "act_23" : "node_66"
+ "act_23" : "node_62"
},
"default_entry" : {
"action_id" : 70,
@@ -12458,9 +12543,9 @@
"direct_meters" : null,
"action_ids" : [71],
"actions" : ["act_24"],
- "base_default_next" : "node_66",
+ "base_default_next" : "node_62",
"next_tables" : {
- "act_24" : "node_66"
+ "act_24" : "node_62"
},
"default_entry" : {
"action_id" : 71,
@@ -12481,9 +12566,9 @@
"direct_meters" : null,
"action_ids" : [72],
"actions" : ["act_25"],
- "base_default_next" : "node_68",
+ "base_default_next" : "node_64",
"next_tables" : {
- "act_25" : "node_68"
+ "act_25" : "node_64"
},
"default_entry" : {
"action_id" : 72,
@@ -12504,9 +12589,9 @@
"direct_meters" : null,
"action_ids" : [73],
"actions" : ["act_26"],
- "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
+ "base_default_next" : "node_70",
"next_tables" : {
- "act_26" : "FabricIngress.process_set_source_sink.tb_set_source"
+ "act_26" : "node_70"
},
"default_entry" : {
"action_id" : 73,
@@ -12516,8 +12601,77 @@
}
},
{
- "name" : "FabricIngress.process_set_source_sink.tb_set_source",
+ "name" : "tbl_act_27",
"id" : 45,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [74],
+ "actions" : ["act_27"],
+ "base_default_next" : "node_70",
+ "next_tables" : {
+ "act_27" : "node_70"
+ },
+ "default_entry" : {
+ "action_id" : 74,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_28",
+ "id" : 46,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [75],
+ "actions" : ["act_28"],
+ "base_default_next" : "node_72",
+ "next_tables" : {
+ "act_28" : "node_72"
+ },
+ "default_entry" : {
+ "action_id" : 75,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_29",
+ "id" : 47,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [76],
+ "actions" : ["act_29"],
+ "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
+ "next_tables" : {
+ "act_29" : "FabricIngress.process_set_source_sink.tb_set_source"
+ },
+ "default_entry" : {
+ "action_id" : 76,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.process_set_source_sink.tb_set_source",
+ "id" : 48,
"source_info" : {
"filename" : "include/int_source.p4",
"line" : 101,
@@ -12538,7 +12692,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [18, 2],
+ "action_ids" : [17, 2],
"actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
"next_tables" : {
@@ -12554,7 +12708,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.tb_set_sink",
- "id" : 46,
+ "id" : 49,
"source_info" : {
"filename" : "include/int_source.p4",
"line" : 111,
@@ -12575,12 +12729,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 3],
+ "action_ids" : [18, 3],
"actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
- "base_default_next" : "node_72",
+ "base_default_next" : "node_76",
"next_tables" : {
- "FabricIngress.process_set_source_sink.int_set_sink" : "node_72",
- "NoAction" : "node_72"
+ "FabricIngress.process_set_source_sink.int_set_sink" : "node_76",
+ "NoAction" : "node_76"
},
"default_entry" : {
"action_id" : 3,
@@ -12590,8 +12744,8 @@
}
},
{
- "name" : "tbl_act_27",
- "id" : 47,
+ "name" : "tbl_act_30",
+ "id" : 50,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12599,14 +12753,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [74],
- "actions" : ["act_27"],
+ "action_ids" : [77],
+ "actions" : ["act_30"],
"base_default_next" : null,
"next_tables" : {
- "act_27" : null
+ "act_30" : null
},
"default_entry" : {
- "action_id" : 74,
+ "action_id" : 77,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12841,8 +12995,25 @@
"false_next" : "FabricIngress.filtering.ingress_port_vlan"
},
{
- "name" : "node_31",
+ "name" : "node_32",
"id" : 8,
+ "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_16"
+ },
+ {
+ "name" : "node_35",
+ "id" : 9,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 235,
@@ -12864,11 +13035,11 @@
}
},
"true_next" : "FabricIngress.forwarding.bridging",
- "false_next" : "node_33"
+ "false_next" : "node_37"
},
{
- "name" : "node_33",
- "id" : 9,
+ "name" : "node_37",
+ "id" : 10,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 236,
@@ -12890,11 +13061,11 @@
}
},
"true_next" : "FabricIngress.forwarding.mpls",
- "false_next" : "node_36"
+ "false_next" : "node_40"
},
{
- "name" : "node_36",
- "id" : 10,
+ "name" : "node_40",
+ "id" : 11,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 242,
@@ -12916,11 +13087,11 @@
}
},
"true_next" : "FabricIngress.forwarding.unicast_v4",
- "false_next" : "node_38"
+ "false_next" : "node_42"
},
{
- "name" : "node_38",
- "id" : 11,
+ "name" : "node_42",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 244,
@@ -12942,11 +13113,11 @@
}
},
"true_next" : "FabricIngress.forwarding.multicast_v4",
- "false_next" : "node_40"
+ "false_next" : "node_44"
},
{
- "name" : "node_40",
- "id" : 12,
+ "name" : "node_44",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 247,
@@ -12968,11 +13139,11 @@
}
},
"true_next" : "FabricIngress.forwarding.unicast_v6",
- "false_next" : "node_42"
+ "false_next" : "node_46"
},
{
- "name" : "node_42",
- "id" : 13,
+ "name" : "node_46",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 249,
@@ -12997,8 +13168,8 @@
"false_next" : "FabricIngress.forwarding.acl"
},
{
- "name" : "node_50",
- "id" : 14,
+ "name" : "node_54",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 219,
@@ -13024,11 +13195,11 @@
}
},
"true_next" : "FabricIngress.next.hashed",
- "false_next" : "node_60"
+ "false_next" : "node_64"
},
{
- "name" : "node_54",
- "id" : 15,
+ "name" : "node_58",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 220,
@@ -13054,11 +13225,11 @@
}
},
"true_next" : "FabricIngress.next.multicast",
- "false_next" : "node_60"
+ "false_next" : "node_64"
},
{
- "name" : "node_58",
- "id" : 16,
+ "name" : "node_62",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 221,
@@ -13083,12 +13254,12 @@
}
}
},
- "true_next" : "tbl_act_22",
- "false_next" : "node_60"
+ "true_next" : "tbl_act_25",
+ "false_next" : "node_64"
},
{
- "name" : "node_60",
- "id" : 17,
+ "name" : "node_64",
+ "id" : 18,
"expression" : {
"type" : "expression",
"value" : {
@@ -13107,12 +13278,12 @@
}
}
},
- "true_next" : "node_61",
- "false_next" : "node_66"
+ "true_next" : "node_65",
+ "false_next" : "node_70"
},
{
- "name" : "node_61",
- "id" : 18,
+ "name" : "node_65",
+ "id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 228,
@@ -13137,12 +13308,12 @@
}
}
},
- "true_next" : "node_62",
- "false_next" : "node_66"
+ "true_next" : "node_66",
+ "false_next" : "node_70"
},
{
- "name" : "node_62",
- "id" : 19,
+ "name" : "node_66",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 229,
@@ -13160,12 +13331,12 @@
}
}
},
- "true_next" : "tbl_act_23",
- "false_next" : "node_64"
+ "true_next" : "tbl_act_26",
+ "false_next" : "node_68"
},
{
- "name" : "node_64",
- "id" : 20,
+ "name" : "node_68",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 233,
@@ -13183,12 +13354,12 @@
}
}
},
- "true_next" : "tbl_act_24",
- "false_next" : "node_66"
+ "true_next" : "tbl_act_27",
+ "false_next" : "node_70"
},
{
- "name" : "node_66",
- "id" : 21,
+ "name" : "node_70",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 27,
@@ -13209,12 +13380,12 @@
}
}
},
- "true_next" : "tbl_act_25",
- "false_next" : "node_68"
+ "true_next" : "tbl_act_28",
+ "false_next" : "node_72"
},
{
- "name" : "node_68",
- "id" : 22,
+ "name" : "node_72",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -13235,12 +13406,12 @@
}
}
},
- "true_next" : "tbl_act_26",
+ "true_next" : "tbl_act_29",
"false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
},
{
- "name" : "node_72",
- "id" : 23,
+ "name" : "node_76",
+ "id" : 24,
"source_info" : {
"filename" : "fabric.p4",
"line" : 70,
@@ -13262,7 +13433,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_27"
+ "true_next" : "tbl_act_30"
}
]
},
@@ -13275,11 +13446,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_76",
+ "init_table" : "node_80",
"tables" : [
{
"name" : "tbl_drop_now_0",
- "id" : 48,
+ "id" : 51,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13287,14 +13458,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [81],
+ "action_ids" : [84],
"actions" : ["drop_now"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"drop_now" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 81,
+ "action_id" : 84,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13302,7 +13473,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 49,
+ "id" : 52,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 258,
@@ -13329,15 +13500,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [126, 80],
+ "action_ids" : [129, 83],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
- "base_default_next" : "node_79",
+ "base_default_next" : "node_83",
"next_tables" : {
- "FabricEgress.egress_next.pop_vlan" : "node_79",
- "nop" : "node_79"
+ "FabricEgress.egress_next.pop_vlan" : "node_83",
+ "nop" : "node_83"
},
"default_entry" : {
- "action_id" : 80,
+ "action_id" : 83,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13345,75 +13516,6 @@
},
{
"name" : "tbl_pkt_io_egress_pop_vlan",
- "id" : 50,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [125],
- "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
- "base_default_next" : "node_82",
- "next_tables" : {
- "FabricEgress.pkt_io_egress.pop_vlan" : "node_82"
- },
- "default_entry" : {
- "action_id" : 125,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_drop_now_1",
- "id" : 51,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [82],
- "actions" : ["drop_now"],
- "base_default_next" : "tbl_act_28",
- "next_tables" : {
- "drop_now" : "tbl_act_28"
- },
- "default_entry" : {
- "action_id" : 82,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_28",
- "id" : 52,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [127],
- "actions" : ["act_28"],
- "base_default_next" : "node_85",
- "next_tables" : {
- "act_28" : "node_85"
- },
- "default_entry" : {
- "action_id" : 127,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_spgw_egress_gtpu_encap",
"id" : 53,
"key" : [],
"match_type" : "exact",
@@ -13422,14 +13524,83 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [83],
- "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
- "base_default_next" : "node_87",
+ "action_ids" : [128],
+ "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
+ "base_default_next" : "node_86",
"next_tables" : {
- "FabricEgress.spgw_egress.gtpu_encap" : "node_87"
+ "FabricEgress.pkt_io_egress.pop_vlan" : "node_86"
},
"default_entry" : {
- "action_id" : 83,
+ "action_id" : 128,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_drop_now_1",
+ "id" : 54,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [85],
+ "actions" : ["drop_now"],
+ "base_default_next" : "tbl_act_31",
+ "next_tables" : {
+ "drop_now" : "tbl_act_31"
+ },
+ "default_entry" : {
+ "action_id" : 85,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_31",
+ "id" : 55,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [130],
+ "actions" : ["act_31"],
+ "base_default_next" : "node_89",
+ "next_tables" : {
+ "act_31" : "node_89"
+ },
+ "default_entry" : {
+ "action_id" : 130,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_spgw_egress_gtpu_encap",
+ "id" : 56,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [86],
+ "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+ "base_default_next" : "node_91",
+ "next_tables" : {
+ "FabricEgress.spgw_egress.gtpu_encap" : "node_91"
+ },
+ "default_entry" : {
+ "action_id" : 86,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13437,7 +13608,7 @@
},
{
"name" : "FabricEgress.process_int_source.tb_int_source",
- "id" : 54,
+ "id" : 57,
"source_info" : {
"filename" : "include/int_source.p4",
"line" : 66,
@@ -13476,15 +13647,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [84, 75],
+ "action_ids" : [87, 78],
"actions" : ["FabricEgress.process_int_source.int_source_dscp", "NoAction"],
- "base_default_next" : "node_90",
+ "base_default_next" : "node_94",
"next_tables" : {
- "FabricEgress.process_int_source.int_source_dscp" : "node_90",
- "NoAction" : "node_90"
+ "FabricEgress.process_int_source.int_source_dscp" : "node_94",
+ "NoAction" : "node_94"
},
"default_entry" : {
- "action_id" : 75,
+ "action_id" : 78,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13492,7 +13663,7 @@
},
{
"name" : "FabricEgress.process_int_transit.tb_int_insert",
- "id" : 55,
+ "id" : 58,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 227,
@@ -13506,7 +13677,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [86, 76],
+ "action_ids" : [89, 79],
"actions" : ["FabricEgress.process_int_transit.int_transit", "NoAction"],
"base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0003",
"next_tables" : {
@@ -13514,7 +13685,7 @@
"NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0003"
},
"default_entry" : {
- "action_id" : 76,
+ "action_id" : 79,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13522,7 +13693,7 @@
},
{
"name" : "FabricEgress.process_int_transit.tb_int_inst_0003",
- "id" : 56,
+ "id" : 59,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 237,
@@ -13543,7 +13714,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 77],
+ "action_ids" : [90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 80],
"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" : {
@@ -13566,7 +13737,7 @@
"NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 77,
+ "action_id" : 80,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13574,7 +13745,7 @@
},
{
"name" : "FabricEgress.process_int_transit.tb_int_inst_0407",
- "id" : 57,
+ "id" : 60,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 264,
@@ -13595,7 +13766,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 78],
+ "action_ids" : [106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 81],
"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" : {
@@ -13618,7 +13789,7 @@
"NoAction" : "tbl_process_int_transit_int_update_total_hop_cnt"
},
"default_entry" : {
- "action_id" : 78,
+ "action_id" : 81,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13626,75 +13797,6 @@
},
{
"name" : "tbl_process_int_transit_int_update_total_hop_cnt",
- "id" : 58,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [85],
- "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
- "base_default_next" : "node_95",
- "next_tables" : {
- "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_95"
- },
- "default_entry" : {
- "action_id" : 85,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_process_int_outer_encap_int_update_ipv4",
- "id" : 59,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [119],
- "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
- "base_default_next" : "node_97",
- "next_tables" : {
- "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_97"
- },
- "default_entry" : {
- "action_id" : 119,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_process_int_outer_encap_int_update_udp",
- "id" : 60,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [120],
- "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
- "base_default_next" : "node_99",
- "next_tables" : {
- "FabricEgress.process_int_outer_encap.int_update_udp" : "node_99"
- },
- "default_entry" : {
- "action_id" : 120,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_process_int_outer_encap_int_update_shim",
"id" : 61,
"key" : [],
"match_type" : "exact",
@@ -13703,14 +13805,83 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [121],
- "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
- "base_default_next" : "node_101",
+ "action_ids" : [88],
+ "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
+ "base_default_next" : "node_99",
"next_tables" : {
- "FabricEgress.process_int_outer_encap.int_update_shim" : "node_101"
+ "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_99"
},
"default_entry" : {
- "action_id" : 121,
+ "action_id" : 88,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_process_int_outer_encap_int_update_ipv4",
+ "id" : 62,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [122],
+ "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
+ "base_default_next" : "node_101",
+ "next_tables" : {
+ "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_101"
+ },
+ "default_entry" : {
+ "action_id" : 122,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_process_int_outer_encap_int_update_udp",
+ "id" : 63,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [123],
+ "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
+ "base_default_next" : "node_103",
+ "next_tables" : {
+ "FabricEgress.process_int_outer_encap.int_update_udp" : "node_103"
+ },
+ "default_entry" : {
+ "action_id" : 123,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_process_int_outer_encap_int_update_shim",
+ "id" : 64,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [124],
+ "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
+ "base_default_next" : "node_105",
+ "next_tables" : {
+ "FabricEgress.process_int_outer_encap.int_update_shim" : "node_105"
+ },
+ "default_entry" : {
+ "action_id" : 124,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13718,7 +13889,7 @@
},
{
"name" : "FabricEgress.process_int_report.tb_generate_report",
- "id" : 62,
+ "id" : 65,
"source_info" : {
"filename" : "include/int_report.p4",
"line" : 87,
@@ -13732,15 +13903,15 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [122, 79],
+ "action_ids" : [125, 82],
"actions" : ["FabricEgress.process_int_report.do_report_encapsulation", "NoAction"],
- "base_default_next" : "node_103",
+ "base_default_next" : "node_107",
"next_tables" : {
- "FabricEgress.process_int_report.do_report_encapsulation" : "node_103",
- "NoAction" : "node_103"
+ "FabricEgress.process_int_report.do_report_encapsulation" : "node_107",
+ "NoAction" : "node_107"
},
"default_entry" : {
- "action_id" : 79,
+ "action_id" : 82,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13748,7 +13919,7 @@
},
{
"name" : "tbl_process_int_sink_restore_header",
- "id" : 63,
+ "id" : 66,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13756,14 +13927,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [123],
+ "action_ids" : [126],
"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" : 123,
+ "action_id" : 126,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13771,7 +13942,7 @@
},
{
"name" : "tbl_process_int_sink_int_sink",
- "id" : 64,
+ "id" : 67,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13779,14 +13950,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [124],
+ "action_ids" : [127],
"actions" : ["FabricEgress.process_int_sink.int_sink"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.process_int_sink.int_sink" : null
},
"default_entry" : {
- "action_id" : 124,
+ "action_id" : 127,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13796,8 +13967,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_76",
- "id" : 24,
+ "name" : "node_80",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 272,
@@ -13849,8 +14020,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_79",
- "id" : 25,
+ "name" : "node_83",
+ "id" : 26,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 42,
@@ -13871,12 +14042,12 @@
}
}
},
- "true_next" : "node_80",
- "false_next" : "node_85"
+ "true_next" : "node_84",
+ "false_next" : "node_89"
},
{
- "name" : "node_80",
- "id" : 26,
+ "name" : "node_84",
+ "id" : 27,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -13922,11 +14093,11 @@
}
},
"true_next" : "tbl_pkt_io_egress_pop_vlan",
- "false_next" : "node_82"
+ "false_next" : "node_86"
},
{
- "name" : "node_82",
- "id" : 27,
+ "name" : "node_86",
+ "id" : 28,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 46,
@@ -13982,11 +14153,11 @@
}
},
"true_next" : "tbl_drop_now_1",
- "false_next" : "tbl_act_28"
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_85",
- "id" : 28,
+ "name" : "node_89",
+ "id" : 29,
"source_info" : {
"filename" : "include/spgw.p4",
"line" : 221,
@@ -14008,11 +14179,11 @@
}
},
"true_next" : "tbl_spgw_egress_gtpu_encap",
- "false_next" : "node_87"
+ "false_next" : "node_91"
},
{
- "name" : "node_87",
- "id" : 29,
+ "name" : "node_91",
+ "id" : 30,
"source_info" : {
"filename" : "fabric.p4",
"line" : 94,
@@ -14088,11 +14259,11 @@
}
},
"false_next" : null,
- "true_next" : "node_88"
+ "true_next" : "node_92"
},
{
- "name" : "node_88",
- "id" : 30,
+ "name" : "node_92",
+ "id" : 31,
"source_info" : {
"filename" : "fabric.p4",
"line" : 97,
@@ -14114,11 +14285,11 @@
}
},
"true_next" : "FabricEgress.process_int_source.tb_int_source",
- "false_next" : "node_90"
+ "false_next" : "node_94"
},
{
- "name" : "node_90",
- "id" : 31,
+ "name" : "node_94",
+ "id" : 32,
"source_info" : {
"filename" : "fabric.p4",
"line" : 100,
@@ -14140,8 +14311,8 @@
"true_next" : "FabricEgress.process_int_transit.tb_int_insert"
},
{
- "name" : "node_95",
- "id" : 32,
+ "name" : "node_99",
+ "id" : 33,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 314,
@@ -14160,11 +14331,11 @@
}
},
"true_next" : "tbl_process_int_outer_encap_int_update_ipv4",
- "false_next" : "node_97"
+ "false_next" : "node_101"
},
{
- "name" : "node_97",
- "id" : 33,
+ "name" : "node_101",
+ "id" : 34,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 317,
@@ -14183,11 +14354,11 @@
}
},
"true_next" : "tbl_process_int_outer_encap_int_update_udp",
- "false_next" : "node_99"
+ "false_next" : "node_103"
},
{
- "name" : "node_99",
- "id" : 34,
+ "name" : "node_103",
+ "id" : 35,
"source_info" : {
"filename" : "include/int_transit.p4",
"line" : 320,
@@ -14206,11 +14377,11 @@
}
},
"true_next" : "tbl_process_int_outer_encap_int_update_shim",
- "false_next" : "node_101"
+ "false_next" : "node_105"
},
{
- "name" : "node_101",
- "id" : 35,
+ "name" : "node_105",
+ "id" : 36,
"source_info" : {
"filename" : "fabric.p4",
"line" : 104,
@@ -14232,11 +14403,11 @@
}
},
"true_next" : "FabricEgress.process_int_report.tb_generate_report",
- "false_next" : "node_103"
+ "false_next" : "node_107"
},
{
- "name" : "node_103",
- "id" : 36,
+ "name" : "node_107",
+ "id" : 37,
"source_info" : {
"filename" : "fabric.p4",
"line" : 108,
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 75d039a..c3f101c 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -116,13 +116,12 @@
id: 16793253
}
action_refs {
- id: 16819938
- annotations: "@defaultonly()"
- }
- action_refs {
id: 16798734
}
- const_default_action_id: 16819938
+ action_refs {
+ id: 16833700
+ }
+ const_default_action_id: 16835546
direct_resource_ids: 318815501
size: 1024
idle_timeout_behavior: NO_TIMEOUT
@@ -863,6 +862,13 @@
}
actions {
preamble {
+ id: 16833700
+ name: "FabricIngress.filtering.nop_ingress_port_vlan"
+ alias: "nop_ingress_port_vlan"
+ }
+}
+actions {
+ preamble {
id: 16840921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"
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,
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 1a74a23..53a3653 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -75,13 +75,12 @@
id: 16793253
}
action_refs {
- id: 16819938
- annotations: "@defaultonly()"
- }
- action_refs {
id: 16798734
}
- const_default_action_id: 16819938
+ action_refs {
+ id: 16833700
+ }
+ const_default_action_id: 16835546
direct_resource_ids: 318815501
size: 1024
idle_timeout_behavior: NO_TIMEOUT
@@ -705,6 +704,13 @@
}
actions {
preamble {
+ id: 16833700
+ name: "FabricIngress.filtering.nop_ingress_port_vlan"
+ alias: "nop_ingress_port_vlan"
+ }
+}
+actions {
+ preamble {
id: 16840921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 285ac8c..af8acf0 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -10,6 +10,7 @@
["tmp_2", 32, false],
["spgw_ingress_tmp_1", 1, false],
["spgw_ingress_tmp_2", 1, false],
+ ["filtering_tmp_0", 1, false],
["next_tmp_2", 1, false],
["next_tmp_3", 1, false],
["next_tmp_4", 1, false],
@@ -24,7 +25,7 @@
["fabric_metadata_t.ip_proto", 8, false],
["fabric_metadata_t.l4_src_port", 16, false],
["fabric_metadata_t.l4_dst_port", 16, false],
- ["_padding_1", 6, false]
+ ["_padding_1", 5, false]
]
},
{
@@ -1277,14 +1278,8 @@
"primitives" : []
},
{
- "name" : "nop",
- "id" : 9,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "drop_now",
- "id" : 10,
+ "id" : 9,
"runtime_data" : [],
"primitives" : [
{
@@ -1311,7 +1306,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.gtpu_decap",
- "id" : 11,
+ "id" : 10,
"runtime_data" : [],
"primitives" : [
{
@@ -1363,7 +1358,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 12,
+ "id" : 11,
"runtime_data" : [
{
"name" : "teid",
@@ -1440,7 +1435,7 @@
},
{
"name" : "FabricIngress.filtering.drop",
- "id" : 13,
+ "id" : 12,
"runtime_data" : [],
"primitives" : [
{
@@ -1457,7 +1452,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 14,
+ "id" : 13,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1488,7 +1483,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 15,
+ "id" : 14,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1638,6 +1633,12 @@
]
},
{
+ "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
+ "id" : 15,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
"name" : "FabricIngress.filtering.set_forwarding_type",
"id" : 16,
"runtime_data" : [
@@ -1661,7 +1662,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 94,
+ "line" : 99,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -2279,7 +2280,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -2470,7 +2471,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -2838,7 +2839,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3029,7 +3030,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3424,7 +3425,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 116,
+ "line" : 119,
"column" : 36,
"source_fragment" : "2w1; ..."
}
@@ -3510,7 +3511,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 117,
+ "line" : 120,
"column" : 38,
"source_fragment" : "2w2; ..."
}
@@ -3536,7 +3537,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 115,
+ "line" : 118,
"column" : 37,
"source_fragment" : "2w0; ..."
}
@@ -3638,19 +3639,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; ..."
- }
+ ]
}
]
},
@@ -3664,7 +3669,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_hasReturned_0"]
+ "value" : ["scalars", "filtering_tmp_0"]
},
{
"type" : "expression",
@@ -3694,23 +3699,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; ..."
+ }
}
]
},
@@ -3724,23 +3725,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; ..."
+ }
}
]
},
@@ -3754,7 +3751,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_tmp_3"]
+ "value" : ["scalars", "next_hasReturned_0"]
},
{
"type" : "expression",
@@ -3765,7 +3762,7 @@
"left" : null,
"right" : {
"type" : "bool",
- "value" : true
+ "value" : false
}
}
}
@@ -3784,6 +3781,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_20",
+ "id" : 57,
+ "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_21",
+ "id" : 58,
+ "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_22",
+ "id" : 59,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "next_tmp_3"]
},
{
@@ -3805,8 +3892,8 @@
]
},
{
- "name" : "act_20",
- "id" : 57,
+ "name" : "act_23",
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -3835,8 +3922,8 @@
]
},
{
- "name" : "act_21",
- "id" : 58,
+ "name" : "act_24",
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -3865,8 +3952,8 @@
]
},
{
- "name" : "act_22",
- "id" : 59,
+ "name" : "act_25",
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -3901,8 +3988,8 @@
]
},
{
- "name" : "act_23",
- "id" : 60,
+ "name" : "act_26",
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -3950,8 +4037,8 @@
]
},
{
- "name" : "act_24",
- "id" : 61,
+ "name" : "act_27",
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -4008,8 +4095,8 @@
]
},
{
- "name" : "act_25",
- "id" : 62,
+ "name" : "act_28",
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -4067,13 +4154,13 @@
},
{
"name" : "nop",
- "id" : 63,
+ "id" : 66,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "drop_now",
- "id" : 64,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -4100,7 +4187,7 @@
},
{
"name" : "drop_now",
- "id" : 65,
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -4127,7 +4214,7 @@
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 66,
+ "id" : 69,
"runtime_data" : [],
"primitives" : [
{
@@ -4334,7 +4421,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -4719,7 +4806,7 @@
},
{
"name" : "FabricEgress.pkt_io_egress.pop_vlan",
- "id" : 67,
+ "id" : 70,
"runtime_data" : [],
"primitives" : [
{
@@ -4760,7 +4847,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 68,
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -4800,8 +4887,8 @@
]
},
{
- "name" : "act_26",
- "id" : 69,
+ "name" : "act_29",
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -5107,14 +5194,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10],
+ "action_ids" : [9],
"actions" : ["drop_now"],
"base_default_next" : "tbl_act_8",
"next_tables" : {
"drop_now" : "tbl_act_8"
},
"default_entry" : {
- "action_id" : 10,
+ "action_id" : 9,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5153,14 +5240,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11],
+ "action_ids" : [10],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_27",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
},
"default_entry" : {
- "action_id" : 11,
+ "action_id" : 10,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5189,7 +5276,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 0],
+ "action_ids" : [11, 0],
"actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
"base_default_next" : null,
"next_tables" : {
@@ -5323,7 +5410,7 @@
"id" : 19,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 61,
+ "line" : 66,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -5353,17 +5440,61 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 14, 8, 13],
- "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
- "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+ "action_ids" : [14, 13, 12, 15],
+ "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_14",
+ "__MISS__" : "tbl_act_15"
},
"default_entry" : {
- "action_id" : 8,
+ "action_id" : 14,
+ "action_const" : true,
+ "action_data" : ["0xffe"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_14",
+ "id" : 20,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [51],
+ "actions" : ["act_14"],
+ "base_default_next" : "node_32",
+ "next_tables" : {
+ "act_14" : "node_32"
+ },
+ "default_entry" : {
+ "action_id" : 51,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_15",
+ "id" : 21,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [52],
+ "actions" : ["act_15"],
+ "base_default_next" : "node_32",
+ "next_tables" : {
+ "act_15" : "node_32"
+ },
+ "default_entry" : {
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5371,10 +5502,10 @@
},
{
"name" : "FabricIngress.filtering.fwd_classifier",
- "id" : 20,
+ "id" : 22,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 98,
+ "line" : 103,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -5406,9 +5537,9 @@
"direct_meters" : null,
"action_ids" : [16],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
- "base_default_next" : "node_31",
+ "base_default_next" : "node_35",
"next_tables" : {
- "FabricIngress.filtering.set_forwarding_type" : "node_31"
+ "FabricIngress.filtering.set_forwarding_type" : "node_35"
},
"default_entry" : {
"action_id" : 16,
@@ -5418,8 +5549,31 @@
}
},
{
+ "name" : "tbl_act_16",
+ "id" : 23,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [53],
+ "actions" : ["act_16"],
+ "base_default_next" : "node_35",
+ "next_tables" : {
+ "act_16" : "node_35"
+ },
+ "default_entry" : {
+ "action_id" : 53,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
"name" : "FabricIngress.forwarding.bridging",
- "id" : 21,
+ "id" : 24,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 41,
@@ -5462,7 +5616,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 22,
+ "id" : 25,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 65,
@@ -5485,10 +5639,10 @@
"direct_meters" : null,
"action_ids" : [18, 3],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
- "base_default_next" : "tbl_act_14",
+ "base_default_next" : "tbl_act_17",
"next_tables" : {
- "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_14",
- "NoAction" : "tbl_act_14"
+ "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
+ "NoAction" : "tbl_act_17"
},
"default_entry" : {
"action_id" : 3,
@@ -5498,8 +5652,8 @@
}
},
{
- "name" : "tbl_act_14",
- "id" : 23,
+ "name" : "tbl_act_17",
+ "id" : 26,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5507,14 +5661,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51],
- "actions" : ["act_14"],
+ "action_ids" : [54],
+ "actions" : ["act_17"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "act_14" : "FabricIngress.forwarding.acl"
+ "act_17" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 51,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5522,7 +5676,7 @@
},
{
"name" : "FabricIngress.forwarding.unicast_v4",
- "id" : 24,
+ "id" : 27,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 87,
@@ -5559,7 +5713,7 @@
},
{
"name" : "FabricIngress.forwarding.acl",
- "id" : 25,
+ "id" : 28,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 131,
@@ -5648,13 +5802,13 @@
"direct_meters" : null,
"action_ids" : [20, 21, 22, 23, 24],
"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_15",
+ "base_default_next" : "tbl_act_18",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_15",
- "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_15",
- "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_15",
- "FabricIngress.forwarding.drop" : "tbl_act_15",
- "FabricIngress.forwarding.nop_acl" : "tbl_act_15"
+ "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
+ "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
+ "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
+ "FabricIngress.forwarding.drop" : "tbl_act_18",
+ "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
},
"default_entry" : {
"action_id" : 24,
@@ -5664,8 +5818,8 @@
}
},
{
- "name" : "tbl_act_15",
- "id" : 26,
+ "name" : "tbl_act_18",
+ "id" : 29,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5673,14 +5827,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
- "actions" : ["act_15"],
+ "action_ids" : [55],
+ "actions" : ["act_18"],
"base_default_next" : "FabricIngress.next.vlan_meta",
"next_tables" : {
- "act_15" : "FabricIngress.next.vlan_meta"
+ "act_18" : "FabricIngress.next.vlan_meta"
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5688,7 +5842,7 @@
},
{
"name" : "FabricIngress.next.vlan_meta",
- "id" : 27,
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 65,
@@ -5709,7 +5863,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [25, 9],
+ "action_ids" : [25, 8],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -5717,7 +5871,7 @@
"nop" : "FabricIngress.next.simple"
},
"default_entry" : {
- "action_id" : 9,
+ "action_id" : 8,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -5725,7 +5879,7 @@
},
{
"name" : "FabricIngress.next.simple",
- "id" : 28,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 122,
@@ -5750,8 +5904,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_16",
- "__MISS__" : "tbl_act_17"
+ "__HIT__" : "tbl_act_19",
+ "__MISS__" : "tbl_act_20"
},
"default_entry" : {
"action_id" : 5,
@@ -5761,8 +5915,8 @@
}
},
{
- "name" : "tbl_act_16",
- "id" : 29,
+ "name" : "tbl_act_19",
+ "id" : 32,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5770,22 +5924,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [53],
- "actions" : ["act_16"],
- "base_default_next" : "node_44",
+ "action_ids" : [56],
+ "actions" : ["act_19"],
+ "base_default_next" : "node_48",
"next_tables" : {
- "act_16" : "node_44"
+ "act_19" : "node_48"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 56,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_17",
- "id" : 30,
+ "name" : "tbl_act_20",
+ "id" : 33,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5793,14 +5947,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54],
- "actions" : ["act_17"],
- "base_default_next" : "node_44",
+ "action_ids" : [57],
+ "actions" : ["act_20"],
+ "base_default_next" : "node_48",
"next_tables" : {
- "act_17" : "node_44"
+ "act_20" : "node_48"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 57,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5808,7 +5962,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 31,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 175,
@@ -5834,13 +5988,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_18",
- "__MISS__" : "tbl_act_19"
+ "__HIT__" : "tbl_act_21",
+ "__MISS__" : "tbl_act_22"
}
},
{
- "name" : "tbl_act_18",
- "id" : 32,
+ "name" : "tbl_act_21",
+ "id" : 35,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5848,22 +6002,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
- "actions" : ["act_18"],
- "base_default_next" : "node_48",
+ "action_ids" : [58],
+ "actions" : ["act_21"],
+ "base_default_next" : "node_52",
"next_tables" : {
- "act_18" : "node_48"
+ "act_21" : "node_52"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 58,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_19",
- "id" : 33,
+ "name" : "tbl_act_22",
+ "id" : 36,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -5871,14 +6025,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56],
- "actions" : ["act_19"],
- "base_default_next" : "node_48",
+ "action_ids" : [59],
+ "actions" : ["act_22"],
+ "base_default_next" : "node_52",
"next_tables" : {
- "act_19" : "node_48"
+ "act_22" : "node_52"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 59,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5886,7 +6040,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 34,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 207,
@@ -5911,8 +6065,8 @@
"actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_20",
- "__MISS__" : "tbl_act_21"
+ "__HIT__" : "tbl_act_23",
+ "__MISS__" : "tbl_act_24"
},
"default_entry" : {
"action_id" : 7,
@@ -5922,75 +6076,6 @@
}
},
{
- "name" : "tbl_act_20",
- "id" : 35,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [57],
- "actions" : ["act_20"],
- "base_default_next" : "node_52",
- "next_tables" : {
- "act_20" : "node_52"
- },
- "default_entry" : {
- "action_id" : 57,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_21",
- "id" : 36,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [58],
- "actions" : ["act_21"],
- "base_default_next" : "node_52",
- "next_tables" : {
- "act_21" : "node_52"
- },
- "default_entry" : {
- "action_id" : 58,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_22",
- "id" : 37,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [59],
- "actions" : ["act_22"],
- "base_default_next" : "node_54",
- "next_tables" : {
- "act_22" : "node_54"
- },
- "default_entry" : {
- "action_id" : 59,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
"name" : "tbl_act_23",
"id" : 38,
"key" : [],
@@ -6002,9 +6087,9 @@
"direct_meters" : null,
"action_ids" : [60],
"actions" : ["act_23"],
- "base_default_next" : "node_58",
+ "base_default_next" : "node_56",
"next_tables" : {
- "act_23" : "node_58"
+ "act_23" : "node_56"
},
"default_entry" : {
"action_id" : 60,
@@ -6025,9 +6110,9 @@
"direct_meters" : null,
"action_ids" : [61],
"actions" : ["act_24"],
- "base_default_next" : "node_60",
+ "base_default_next" : "node_56",
"next_tables" : {
- "act_24" : "node_60"
+ "act_24" : "node_56"
},
"default_entry" : {
"action_id" : 61,
@@ -6048,9 +6133,9 @@
"direct_meters" : null,
"action_ids" : [62],
"actions" : ["act_25"],
- "base_default_next" : null,
+ "base_default_next" : "node_58",
"next_tables" : {
- "act_25" : null
+ "act_25" : "node_58"
},
"default_entry" : {
"action_id" : 62,
@@ -6058,6 +6143,75 @@
"action_data" : [],
"action_entry_const" : true
}
+ },
+ {
+ "name" : "tbl_act_26",
+ "id" : 41,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [63],
+ "actions" : ["act_26"],
+ "base_default_next" : "node_62",
+ "next_tables" : {
+ "act_26" : "node_62"
+ },
+ "default_entry" : {
+ "action_id" : 63,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_27",
+ "id" : 42,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [64],
+ "actions" : ["act_27"],
+ "base_default_next" : "node_64",
+ "next_tables" : {
+ "act_27" : "node_64"
+ },
+ "default_entry" : {
+ "action_id" : 64,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_28",
+ "id" : 43,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [65],
+ "actions" : ["act_28"],
+ "base_default_next" : null,
+ "next_tables" : {
+ "act_28" : null
+ },
+ "default_entry" : {
+ "action_id" : 65,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
}
],
"action_profiles" : [
@@ -6288,8 +6442,25 @@
"false_next" : "FabricIngress.filtering.ingress_port_vlan"
},
{
- "name" : "node_31",
+ "name" : "node_32",
"id" : 8,
+ "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_16"
+ },
+ {
+ "name" : "node_35",
+ "id" : 9,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 235,
@@ -6311,11 +6482,11 @@
}
},
"true_next" : "FabricIngress.forwarding.bridging",
- "false_next" : "node_33"
+ "false_next" : "node_37"
},
{
- "name" : "node_33",
- "id" : 9,
+ "name" : "node_37",
+ "id" : 10,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 236,
@@ -6337,11 +6508,11 @@
}
},
"true_next" : "FabricIngress.forwarding.mpls",
- "false_next" : "node_36"
+ "false_next" : "node_40"
},
{
- "name" : "node_36",
- "id" : 10,
+ "name" : "node_40",
+ "id" : 11,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 250,
@@ -6366,8 +6537,8 @@
"false_next" : "FabricIngress.forwarding.acl"
},
{
- "name" : "node_44",
- "id" : 11,
+ "name" : "node_48",
+ "id" : 12,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 219,
@@ -6393,11 +6564,11 @@
}
},
"true_next" : "FabricIngress.next.hashed",
- "false_next" : "node_54"
+ "false_next" : "node_58"
},
{
- "name" : "node_48",
- "id" : 12,
+ "name" : "node_52",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 220,
@@ -6423,11 +6594,11 @@
}
},
"true_next" : "FabricIngress.next.multicast",
- "false_next" : "node_54"
+ "false_next" : "node_58"
},
{
- "name" : "node_52",
- "id" : 13,
+ "name" : "node_56",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 221,
@@ -6452,12 +6623,12 @@
}
}
},
- "true_next" : "tbl_act_22",
- "false_next" : "node_54"
+ "true_next" : "tbl_act_25",
+ "false_next" : "node_58"
},
{
- "name" : "node_54",
- "id" : 14,
+ "name" : "node_58",
+ "id" : 15,
"expression" : {
"type" : "expression",
"value" : {
@@ -6476,12 +6647,12 @@
}
}
},
- "true_next" : "node_55",
- "false_next" : "node_58"
+ "true_next" : "node_59",
+ "false_next" : "node_62"
},
{
- "name" : "node_55",
- "id" : 15,
+ "name" : "node_59",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 228,
@@ -6506,12 +6677,12 @@
}
}
},
- "true_next" : "node_56",
- "false_next" : "node_58"
+ "true_next" : "node_60",
+ "false_next" : "node_62"
},
{
- "name" : "node_56",
- "id" : 16,
+ "name" : "node_60",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 229,
@@ -6529,12 +6700,12 @@
}
}
},
- "true_next" : "tbl_act_23",
- "false_next" : "node_58"
+ "true_next" : "tbl_act_26",
+ "false_next" : "node_62"
},
{
- "name" : "node_58",
- "id" : 17,
+ "name" : "node_62",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 27,
@@ -6555,12 +6726,12 @@
}
}
},
- "true_next" : "tbl_act_24",
- "false_next" : "node_60"
+ "true_next" : "tbl_act_27",
+ "false_next" : "node_64"
},
{
- "name" : "node_60",
- "id" : 18,
+ "name" : "node_64",
+ "id" : 19,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -6582,7 +6753,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_25"
+ "true_next" : "tbl_act_28"
}
]
},
@@ -6595,11 +6766,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_64",
+ "init_table" : "node_68",
"tables" : [
{
"name" : "tbl_drop_now_0",
- "id" : 41,
+ "id" : 44,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -6607,14 +6778,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
+ "action_ids" : [67],
"actions" : ["drop_now"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"drop_now" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6622,7 +6793,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 42,
+ "id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 258,
@@ -6649,15 +6820,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [68, 63],
+ "action_ids" : [71, 66],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
- "base_default_next" : "node_67",
+ "base_default_next" : "node_71",
"next_tables" : {
- "FabricEgress.egress_next.pop_vlan" : "node_67",
- "nop" : "node_67"
+ "FabricEgress.egress_next.pop_vlan" : "node_71",
+ "nop" : "node_71"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 66,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -6665,75 +6836,6 @@
},
{
"name" : "tbl_pkt_io_egress_pop_vlan",
- "id" : 43,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [67],
- "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
- "base_default_next" : "node_70",
- "next_tables" : {
- "FabricEgress.pkt_io_egress.pop_vlan" : "node_70"
- },
- "default_entry" : {
- "action_id" : 67,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_drop_now_1",
- "id" : 44,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [65],
- "actions" : ["drop_now"],
- "base_default_next" : "tbl_act_26",
- "next_tables" : {
- "drop_now" : "tbl_act_26"
- },
- "default_entry" : {
- "action_id" : 65,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_26",
- "id" : 45,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [69],
- "actions" : ["act_26"],
- "base_default_next" : "node_73",
- "next_tables" : {
- "act_26" : "node_73"
- },
- "default_entry" : {
- "action_id" : 69,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_spgw_egress_gtpu_encap",
"id" : 46,
"key" : [],
"match_type" : "exact",
@@ -6742,14 +6844,83 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [66],
+ "action_ids" : [70],
+ "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
+ "base_default_next" : "node_74",
+ "next_tables" : {
+ "FabricEgress.pkt_io_egress.pop_vlan" : "node_74"
+ },
+ "default_entry" : {
+ "action_id" : 70,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_drop_now_1",
+ "id" : 47,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [68],
+ "actions" : ["drop_now"],
+ "base_default_next" : "tbl_act_29",
+ "next_tables" : {
+ "drop_now" : "tbl_act_29"
+ },
+ "default_entry" : {
+ "action_id" : 68,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_29",
+ "id" : 48,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [72],
+ "actions" : ["act_29"],
+ "base_default_next" : "node_77",
+ "next_tables" : {
+ "act_29" : "node_77"
+ },
+ "default_entry" : {
+ "action_id" : 72,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_spgw_egress_gtpu_encap",
+ "id" : 49,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [69],
"actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.spgw_egress.gtpu_encap" : null
},
"default_entry" : {
- "action_id" : 66,
+ "action_id" : 69,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6759,8 +6930,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_64",
- "id" : 19,
+ "name" : "node_68",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 272,
@@ -6812,8 +6983,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_67",
- "id" : 20,
+ "name" : "node_71",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 42,
@@ -6834,12 +7005,12 @@
}
}
},
- "true_next" : "node_68",
- "false_next" : "node_73"
+ "true_next" : "node_72",
+ "false_next" : "node_77"
},
{
- "name" : "node_68",
- "id" : 21,
+ "name" : "node_72",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -6885,11 +7056,11 @@
}
},
"true_next" : "tbl_pkt_io_egress_pop_vlan",
- "false_next" : "node_70"
+ "false_next" : "node_74"
},
{
- "name" : "node_70",
- "id" : 22,
+ "name" : "node_74",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 46,
@@ -6945,11 +7116,11 @@
}
},
"true_next" : "tbl_drop_now_1",
- "false_next" : "tbl_act_26"
+ "false_next" : "tbl_act_29"
},
{
- "name" : "node_73",
- "id" : 23,
+ "name" : "node_77",
+ "id" : 24,
"source_info" : {
"filename" : "include/spgw.p4",
"line" : 221,
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 7568bc8..ca66919 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -70,13 +70,12 @@
id: 16793253
}
action_refs {
- id: 16819938
- annotations: "@defaultonly()"
- }
- action_refs {
id: 16798734
}
- const_default_action_id: 16819938
+ action_refs {
+ id: 16833700
+ }
+ const_default_action_id: 16835546
direct_resource_ids: 318815501
size: 1024
idle_timeout_behavior: NO_TIMEOUT
@@ -512,6 +511,13 @@
}
actions {
preamble {
+ id: 16833700
+ name: "FabricIngress.filtering.nop_ingress_port_vlan"
+ alias: "nop_ingress_port_vlan"
+ }
+}
+actions {
+ preamble {
id: 16840921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 8a6b8bb..cd54f59 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -7,6 +7,7 @@
["tmp", 4, false],
["tmp_0", 32, false],
["tmp_1", 32, false],
+ ["filtering_tmp_0", 1, false],
["next_tmp_2", 1, false],
["next_tmp_3", 1, false],
["next_tmp_4", 1, false],
@@ -19,7 +20,7 @@
["fabric_metadata_t.ip_proto", 8, false],
["fabric_metadata_t.l4_src_port", 16, false],
["fabric_metadata_t.l4_dst_port", 16, false],
- ["_padding_0", 2, false]
+ ["_padding_0", 1, false]
]
},
{
@@ -896,13 +897,13 @@
"learn_lists" : [],
"actions" : [
{
- "name" : "nop",
+ "name" : "NoAction",
"id" : 0,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "nop",
+ "name" : "NoAction",
"id" : 1,
"runtime_data" : [],
"primitives" : []
@@ -932,20 +933,14 @@
"primitives" : []
},
{
- "name" : "NoAction",
+ "name" : "nop",
"id" : 6,
"runtime_data" : [],
"primitives" : []
},
{
- "name" : "NoAction",
- "id" : 7,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "FabricIngress.filtering.drop",
- "id" : 8,
+ "id" : 7,
"runtime_data" : [],
"primitives" : [
{
@@ -962,7 +957,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 9,
+ "id" : 8,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -993,7 +988,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 10,
+ "id" : 9,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1143,6 +1138,12 @@
]
},
{
+ "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
+ "id" : 10,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
"name" : "FabricIngress.filtering.set_forwarding_type",
"id" : 11,
"runtime_data" : [
@@ -1166,7 +1167,7 @@
],
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 94,
+ "line" : 99,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -1784,7 +1785,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -1975,7 +1976,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -2343,7 +2344,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -2534,7 +2535,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 110,
+ "line" : 113,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -2652,19 +2653,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; ..."
- }
+ ]
}
]
},
@@ -2678,7 +2683,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_hasReturned_0"]
+ "value" : ["scalars", "filtering_tmp_0"]
},
{
"type" : "expression",
@@ -2708,23 +2713,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; ..."
+ }
}
]
},
@@ -2738,23 +2739,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; ..."
+ }
}
]
},
@@ -2768,7 +2765,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "next_tmp_3"]
+ "value" : ["scalars", "next_hasReturned_0"]
},
{
"type" : "expression",
@@ -2779,7 +2776,7 @@
"left" : null,
"right" : {
"type" : "bool",
- "value" : true
+ "value" : false
}
}
}
@@ -2798,6 +2795,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" : 38,
+ "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" : 39,
+ "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" : 40,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "next_tmp_3"]
},
{
@@ -2819,8 +2906,8 @@
]
},
{
- "name" : "act_6",
- "id" : 38,
+ "name" : "act_9",
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -2849,8 +2936,8 @@
]
},
{
- "name" : "act_7",
- "id" : 39,
+ "name" : "act_10",
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -2879,8 +2966,8 @@
]
},
{
- "name" : "act_8",
- "id" : 40,
+ "name" : "act_11",
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -2915,8 +3002,8 @@
]
},
{
- "name" : "act_9",
- "id" : 41,
+ "name" : "act_12",
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -2964,8 +3051,8 @@
]
},
{
- "name" : "act_10",
- "id" : 42,
+ "name" : "act_13",
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3022,8 +3109,8 @@
]
},
{
- "name" : "act_11",
- "id" : 43,
+ "name" : "act_14",
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -3081,13 +3168,13 @@
},
{
"name" : "nop",
- "id" : 44,
+ "id" : 47,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "drop_now",
- "id" : 45,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -3114,7 +3201,7 @@
},
{
"name" : "drop_now",
- "id" : 46,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3141,7 +3228,7 @@
},
{
"name" : "FabricEgress.pkt_io_egress.pop_vlan",
- "id" : 47,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -3182,7 +3269,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 48,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -3222,8 +3309,8 @@
]
},
{
- "name" : "act_12",
- "id" : 49,
+ "name" : "act_15",
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -3303,7 +3390,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/filtering.p4",
- "line" : 61,
+ "line" : 66,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -3333,17 +3420,61 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10, 9, 0, 8],
- "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
- "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+ "action_ids" : [9, 8, 7, 10],
+ "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" : 0,
+ "action_id" : 9,
+ "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" : [32],
+ "actions" : ["act_0"],
+ "base_default_next" : "node_7",
+ "next_tables" : {
+ "act_0" : "node_7"
+ },
+ "default_entry" : {
+ "action_id" : 32,
+ "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" : [33],
+ "actions" : ["act_1"],
+ "base_default_next" : "node_7",
+ "next_tables" : {
+ "act_1" : "node_7"
+ },
+ "default_entry" : {
+ "action_id" : 33,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3351,10 +3482,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"
},
@@ -3386,9 +3517,9 @@
"direct_meters" : null,
"action_ids" : [11],
"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" : 11,
@@ -3398,8 +3529,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" : [34],
+ "actions" : ["act_2"],
+ "base_default_next" : "node_10",
+ "next_tables" : {
+ "act_2" : "node_10"
+ },
+ "default_entry" : {
+ "action_id" : 34,
+ "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,
@@ -3426,7 +3580,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 2],
+ "action_ids" : [12, 0],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -3434,7 +3588,7 @@
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 2,
+ "action_id" : 0,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -3442,7 +3596,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 4,
+ "id" : 7,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 65,
@@ -3463,23 +3617,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [13, 3],
+ "action_ids" : [13, 1],
"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,
+ "action_id" : 1,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
}
},
{
- "name" : "tbl_act_0",
- "id" : 5,
+ "name" : "tbl_act_3",
+ "id" : 8,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3487,14 +3641,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32],
- "actions" : ["act_0"],
+ "action_ids" : [35],
+ "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" : 32,
+ "action_id" : 35,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3502,7 +3656,7 @@
},
{
"name" : "FabricIngress.forwarding.unicast_v4",
- "id" : 6,
+ "id" : 9,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 87,
@@ -3523,7 +3677,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [14, 4],
+ "action_ids" : [14, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -3531,7 +3685,7 @@
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 4,
+ "action_id" : 2,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -3539,7 +3693,7 @@
},
{
"name" : "FabricIngress.forwarding.acl",
- "id" : 7,
+ "id" : 10,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 131,
@@ -3628,13 +3782,13 @@
"direct_meters" : null,
"action_ids" : [15, 16, 17, 18, 19],
"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" : 19,
@@ -3644,8 +3798,8 @@
}
},
{
- "name" : "tbl_act_1",
- "id" : 8,
+ "name" : "tbl_act_4",
+ "id" : 11,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3653,14 +3807,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
- "actions" : ["act_1"],
+ "action_ids" : [36],
+ "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" : 33,
+ "action_id" : 36,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3668,7 +3822,7 @@
},
{
"name" : "FabricIngress.next.vlan_meta",
- "id" : 9,
+ "id" : 12,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 65,
@@ -3689,7 +3843,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 1],
+ "action_ids" : [20, 6],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -3697,7 +3851,7 @@
"nop" : "FabricIngress.next.simple"
},
"default_entry" : {
- "action_id" : 1,
+ "action_id" : 6,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -3705,7 +3859,7 @@
},
{
"name" : "FabricIngress.next.simple",
- "id" : 10,
+ "id" : 13,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 122,
@@ -3726,124 +3880,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [21, 22, 23, 24, 25, 26, 5],
+ "action_ids" : [21, 22, 23, 24, 25, 26, 3],
"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,
+ "action_id" : 3,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
}
},
{
- "name" : "tbl_act_2",
- "id" : 11,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [34],
- "actions" : ["act_2"],
- "base_default_next" : "node_19",
- "next_tables" : {
- "act_2" : "node_19"
- },
- "default_entry" : {
- "action_id" : 34,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_3",
- "id" : 12,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [35],
- "actions" : ["act_3"],
- "base_default_next" : "node_19",
- "next_tables" : {
- "act_3" : "node_19"
- },
- "default_entry" : {
- "action_id" : 35,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "FabricIngress.next.hashed",
- "id" : 13,
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 175,
- "column" : 10,
- "source_fragment" : "hashed"
- },
- "key" : [
- {
- "match_type" : "exact",
- "name" : "fabric_metadata.next_id",
- "target" : ["scalars", "fabric_metadata_t.next_id"],
- "mask" : null
- }
- ],
- "match_type" : "exact",
- "type" : "indirect_ws",
- "action_profile" : "FabricIngress.next.ecmp_selector",
- "max_size" : 1024,
- "with_counters" : true,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [27, 28, 29, 6],
- "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"
- }
- },
- {
- "name" : "tbl_act_4",
- "id" : 14,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [36],
- "actions" : ["act_4"],
- "base_default_next" : "node_23",
- "next_tables" : {
- "act_4" : "node_23"
- },
- "default_entry" : {
- "action_id" : 36,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
"name" : "tbl_act_5",
- "id" : 15,
+ "id" : 14,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3865,13 +3918,36 @@
}
},
{
- "name" : "FabricIngress.next.multicast",
+ "name" : "tbl_act_6",
+ "id" : 15,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [38],
+ "actions" : ["act_6"],
+ "base_default_next" : "node_23",
+ "next_tables" : {
+ "act_6" : "node_23"
+ },
+ "default_entry" : {
+ "action_id" : 38,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.next.hashed",
"id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 207,
+ "line" : 175,
"column" : 10,
- "source_fragment" : "multicast"
+ "source_fragment" : "hashed"
},
"key" : [
{
@@ -3882,51 +3958,23 @@
}
],
"match_type" : "exact",
- "type" : "simple",
+ "type" : "indirect_ws",
+ "action_profile" : "FabricIngress.next.ecmp_selector",
"max_size" : 1024,
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30, 7],
- "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
+ "action_ids" : [27, 28, 29, 4],
+ "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_6",
- "__MISS__" : "tbl_act_7"
- },
- "default_entry" : {
- "action_id" : 7,
- "action_const" : false,
- "action_data" : [],
- "action_entry_const" : false
- }
- },
- {
- "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" : [38],
- "actions" : ["act_6"],
- "base_default_next" : "node_27",
- "next_tables" : {
- "act_6" : "node_27"
- },
- "default_entry" : {
- "action_id" : 38,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
+ "__HIT__" : "tbl_act_7",
+ "__MISS__" : "tbl_act_8"
}
},
{
"name" : "tbl_act_7",
- "id" : 18,
+ "id" : 17,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3949,7 +3997,7 @@
},
{
"name" : "tbl_act_8",
- "id" : 19,
+ "id" : 18,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3959,9 +4007,9 @@
"direct_meters" : null,
"action_ids" : [40],
"actions" : ["act_8"],
- "base_default_next" : "node_29",
+ "base_default_next" : "node_27",
"next_tables" : {
- "act_8" : "node_29"
+ "act_8" : "node_27"
},
"default_entry" : {
"action_id" : 40,
@@ -3971,6 +4019,43 @@
}
},
{
+ "name" : "FabricIngress.next.multicast",
+ "id" : 19,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 207,
+ "column" : 10,
+ "source_fragment" : "multicast"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "fabric_metadata.next_id",
+ "target" : ["scalars", "fabric_metadata_t.next_id"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [30, 5],
+ "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
+ "base_default_next" : null,
+ "next_tables" : {
+ "__HIT__" : "tbl_act_9",
+ "__MISS__" : "tbl_act_10"
+ },
+ "default_entry" : {
+ "action_id" : 5,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
"name" : "tbl_act_9",
"id" : 20,
"key" : [],
@@ -3982,9 +4067,9 @@
"direct_meters" : null,
"action_ids" : [41],
"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" : 41,
@@ -4005,9 +4090,9 @@
"direct_meters" : null,
"action_ids" : [42],
"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" : 42,
@@ -4028,9 +4113,9 @@
"direct_meters" : null,
"action_ids" : [43],
"actions" : ["act_11"],
- "base_default_next" : null,
+ "base_default_next" : "node_33",
"next_tables" : {
- "act_11" : null
+ "act_11" : "node_33"
},
"default_entry" : {
"action_id" : 43,
@@ -4038,6 +4123,75 @@
"action_data" : [],
"action_entry_const" : true
}
+ },
+ {
+ "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" : [44],
+ "actions" : ["act_12"],
+ "base_default_next" : "node_37",
+ "next_tables" : {
+ "act_12" : "node_37"
+ },
+ "default_entry" : {
+ "action_id" : 44,
+ "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" : [45],
+ "actions" : ["act_13"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "act_13" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 45,
+ "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" : [46],
+ "actions" : ["act_14"],
+ "base_default_next" : null,
+ "next_tables" : {
+ "act_14" : null
+ },
+ "default_entry" : {
+ "action_id" : 46,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
}
],
"action_profiles" : [
@@ -4097,8 +4251,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,
@@ -4120,11 +4291,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,
@@ -4146,11 +4317,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,
@@ -4175,8 +4346,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,
@@ -4202,11 +4373,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,
@@ -4232,11 +4403,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,
@@ -4261,12 +4432,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" : {
@@ -4285,12 +4456,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,
@@ -4315,12 +4486,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,
@@ -4338,12 +4509,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,
@@ -4364,12 +4535,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,
@@ -4391,7 +4562,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_11"
+ "true_next" : "tbl_act_14"
}
]
},
@@ -4404,11 +4575,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_39",
+ "init_table" : "node_43",
"tables" : [
{
"name" : "tbl_drop_now",
- "id" : 23,
+ "id" : 26,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -4416,14 +4587,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [48],
"actions" : ["drop_now"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"drop_now" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4431,7 +4602,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 24,
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 258,
@@ -4458,15 +4629,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48, 44],
+ "action_ids" : [51, 47],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
- "base_default_next" : "node_42",
+ "base_default_next" : "node_46",
"next_tables" : {
- "FabricEgress.egress_next.pop_vlan" : "node_42",
- "nop" : "node_42"
+ "FabricEgress.egress_next.pop_vlan" : "node_46",
+ "nop" : "node_46"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 47,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -4474,7 +4645,7 @@
},
{
"name" : "tbl_pkt_io_egress_pop_vlan",
- "id" : 25,
+ "id" : 28,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -4482,14 +4653,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [50],
"actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
- "base_default_next" : "node_45",
+ "base_default_next" : "node_49",
"next_tables" : {
- "FabricEgress.pkt_io_egress.pop_vlan" : "node_45"
+ "FabricEgress.pkt_io_egress.pop_vlan" : "node_49"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4497,30 +4668,7 @@
},
{
"name" : "tbl_drop_now_0",
- "id" : 26,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [46],
- "actions" : ["drop_now"],
- "base_default_next" : "tbl_act_12",
- "next_tables" : {
- "drop_now" : "tbl_act_12"
- },
- "default_entry" : {
- "action_id" : 46,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_12",
- "id" : 27,
+ "id" : 29,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -4529,10 +4677,10 @@
"support_timeout" : false,
"direct_meters" : null,
"action_ids" : [49],
- "actions" : ["act_12"],
- "base_default_next" : null,
+ "actions" : ["drop_now"],
+ "base_default_next" : "tbl_act_15",
"next_tables" : {
- "act_12" : null
+ "drop_now" : "tbl_act_15"
},
"default_entry" : {
"action_id" : 49,
@@ -4540,13 +4688,36 @@
"action_data" : [],
"action_entry_const" : true
}
+ },
+ {
+ "name" : "tbl_act_15",
+ "id" : 30,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [52],
+ "actions" : ["act_15"],
+ "base_default_next" : null,
+ "next_tables" : {
+ "act_15" : null
+ },
+ "default_entry" : {
+ "action_id" : 52,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
}
],
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_39",
- "id" : 12,
+ "name" : "node_43",
+ "id" : 13,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 272,
@@ -4598,8 +4769,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_42",
- "id" : 13,
+ "name" : "node_46",
+ "id" : 14,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 42,
@@ -4621,11 +4792,11 @@
}
},
"false_next" : null,
- "true_next" : "node_43"
+ "true_next" : "node_47"
},
{
- "name" : "node_43",
- "id" : 14,
+ "name" : "node_47",
+ "id" : 15,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -4671,11 +4842,11 @@
}
},
"true_next" : "tbl_pkt_io_egress_pop_vlan",
- "false_next" : "node_45"
+ "false_next" : "node_49"
},
{
- "name" : "node_45",
- "id" : 15,
+ "name" : "node_49",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 46,
@@ -4731,7 +4902,7 @@
}
},
"true_next" : "tbl_drop_now_0",
- "false_next" : "tbl_act_12"
+ "false_next" : "tbl_act_15"
}
]
}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 0768913..2787013 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -29,13 +29,12 @@
id: 16793253
}
action_refs {
- id: 16819938
- annotations: "@defaultonly()"
- }
- action_refs {
id: 16798734
}
- const_default_action_id: 16819938
+ action_refs {
+ id: 16833700
+ }
+ const_default_action_id: 16835546
direct_resource_ids: 318815501
size: 1024
idle_timeout_behavior: NO_TIMEOUT
@@ -390,16 +389,16 @@
}
actions {
preamble {
- id: 16819938
- name: "nop"
- alias: "nop"
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
}
}
actions {
preamble {
- id: 16800567
- name: "NoAction"
- alias: "NoAction"
+ id: 16819938
+ name: "nop"
+ alias: "nop"
}
}
actions {
@@ -435,6 +434,13 @@
}
actions {
preamble {
+ id: 16833700
+ name: "FabricIngress.filtering.nop_ingress_port_vlan"
+ alias: "nop_ingress_port_vlan"
+ }
+}
+actions {
+ preamble {
id: 16840921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index 11f22e7..7601ca7 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -100,7 +100,7 @@
PiAction mappedAction = interpreter.mapTreatment(treatment,
FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.NOP)
+ .withId(FabricConstants.FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN)
.build();
assertEquals(expectedAction, mappedAction);