Rewrite the SPGW P4 pipeline.
This commit makes two changes to the fabric.p4 source files:
1. Routing is now done on a metadata field instead of the ipv4 header.
Routing on the ipv4 header is incorrect if the packet is encapsulated
with an outer IPV4 header. The metadata field is updated each time the
ipv4 destination changes, or an outer header is added or removed. These
changes require no control plane modifications due to @name annotations.
2. The spgw control blocks have been rewritten to support the logical UP4
pipeline. Its location in the pipeline is unchanged, and its
interactions with other control blocks is unchanged.
These changes compile for both bmv2 and tofino, and There is currently a
PR for the fabric-p4test repo which updates the SPGW PTF tests to
account for these changes.
Change-Id: I80ccf30e136a2bb24a83029e22413af351e6eed6
(cherry picked from commit bec6b6a7b0f33812c6f6904d9f9b629539446e79)
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java
index 952df6f..97da065 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java
@@ -53,41 +53,51 @@
PiMatchFieldId.of("ipv6_src");
public static final PiMatchFieldId HDR_ETH_SRC =
PiMatchFieldId.of("eth_src");
- public static final PiMatchFieldId HDR_S_TAG = PiMatchFieldId.of("s_tag");
+ public static final PiMatchFieldId HDR_FAR_ID = PiMatchFieldId.of("far_id");
public static final PiMatchFieldId HDR_VLAN_ID =
PiMatchFieldId.of("vlan_id");
+ public static final PiMatchFieldId HDR_ICMP_CODE =
+ PiMatchFieldId.of("icmp_code");
public static final PiMatchFieldId HDR_ETH_DST =
PiMatchFieldId.of("eth_dst");
- public static final PiMatchFieldId HDR_ICMP_TYPE =
- PiMatchFieldId.of("icmp_type");
+ public static final PiMatchFieldId HDR_S_TAG = PiMatchFieldId.of("s_tag");
public static final PiMatchFieldId HDR_IPV4_DST =
PiMatchFieldId.of("ipv4_dst");
public static final PiMatchFieldId HDR_IPV6_TRAFFIC_CLASS =
PiMatchFieldId.of("ipv6_traffic_class");
+ public static final PiMatchFieldId HDR_IPV4_PREFIX =
+ PiMatchFieldId.of("ipv4_prefix");
public static final PiMatchFieldId HDR_ETH_TYPE =
PiMatchFieldId.of("eth_type");
- public static final PiMatchFieldId HDR_NEXT_ID =
- PiMatchFieldId.of("next_id");
+ public static final PiMatchFieldId HDR_PPPOE_SESSION_ID =
+ PiMatchFieldId.of("pppoe_session_id");
public static final PiMatchFieldId HDR_IP_ETH_TYPE =
PiMatchFieldId.of("ip_eth_type");
public static final PiMatchFieldId HDR_L4_SPORT =
PiMatchFieldId.of("l4_sport");
- public static final PiMatchFieldId HDR_ICMP_CODE =
- PiMatchFieldId.of("icmp_code");
+ public static final PiMatchFieldId HDR_ICMP_TYPE =
+ PiMatchFieldId.of("icmp_type");
public static final PiMatchFieldId HDR_INNER_VLAN_ID =
PiMatchFieldId.of("inner_vlan_id");
public static final PiMatchFieldId HDR_IPV4_ECN =
PiMatchFieldId.of("ipv4_ecn");
- public static final PiMatchFieldId HDR_PPPOE_SESSION_ID =
- PiMatchFieldId.of("pppoe_session_id");
+ public static final PiMatchFieldId HDR_TUNNEL_IPV4_DST =
+ PiMatchFieldId.of("tunnel_ipv4_dst");
public static final PiMatchFieldId HDR_EG_SPEC =
PiMatchFieldId.of("eg_spec");
public static final PiMatchFieldId HDR_LINE_ID =
PiMatchFieldId.of("line_id");
+ public static final PiMatchFieldId HDR_SPGW_DIRECTION =
+ PiMatchFieldId.of("spgw_direction");
public static final PiMatchFieldId HDR_IPV4_DSCP =
PiMatchFieldId.of("ipv4_dscp");
+ public static final PiMatchFieldId HDR_NEXT_ID =
+ PiMatchFieldId.of("next_id");
public static final PiMatchFieldId HDR_EG_PORT =
PiMatchFieldId.of("eg_port");
+ public static final PiMatchFieldId HDR_UE_ADDR =
+ PiMatchFieldId.of("ue_addr");
+ public static final PiMatchFieldId HDR_TEID = PiMatchFieldId.of("teid");
public static final PiMatchFieldId HDR_GTP_IPV4_DST =
PiMatchFieldId.of("gtp_ipv4_dst");
public static final PiMatchFieldId HDR_INT_IS_VALID =
@@ -103,6 +113,8 @@
PiTableId.of("FabricIngress.next.hashed");
public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_T_LINE_MAP =
PiTableId.of("FabricIngress.bng_ingress.t_line_map");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_FAR_LOOKUP =
+ PiTableId.of("FabricIngress.spgw_ingress.far_lookup");
public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT =
PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_insert");
public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
@@ -111,10 +123,14 @@
PiTableId.of("FabricIngress.next.xconnect");
public static final PiTableId FABRIC_INGRESS_NEXT_NEXT_VLAN =
PiTableId.of("FabricIngress.next.next_vlan");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DOWNLINK_PDR_LOOKUP =
+ PiTableId.of("FabricIngress.spgw_ingress.downlink_pdr_lookup");
public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
PiTableId.of("FabricIngress.next.simple");
public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
PiTableId.of("FabricIngress.next.multicast");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UPLINK_PDR_LOOKUP =
+ PiTableId.of("FabricIngress.spgw_ingress.uplink_pdr_lookup");
public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE =
PiTableId.of("FabricEgress.process_int_main.process_int_source.tb_int_source");
public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V6 =
@@ -131,12 +147,14 @@
PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_cp");
public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V4 =
PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v4");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
- PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
- public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
- PiTableId.of("FabricIngress.forwarding.bridging");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
- PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
+ public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V6 =
+ PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v6");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DOWNLINK_FILTER_TABLE =
+ PiTableId.of("FabricIngress.spgw_ingress.downlink_filter_table");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_FLEXIBLE_PDR_LOOKUP =
+ PiTableId.of("FabricIngress.spgw_ingress.flexible_pdr_lookup");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UPLINK_FILTER_TABLE =
+ PiTableId.of("FabricIngress.spgw_ingress.uplink_filter_table");
public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_LINE_SESSION_MAP =
PiTableId.of("FabricIngress.bng_ingress.downstream.t_line_session_map");
public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
@@ -151,11 +169,15 @@
PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v6");
public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_QOS_V4 =
PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v4");
- public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V6 =
- PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v6");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
+ PiTableId.of("FabricIngress.forwarding.bridging");
// Indirect Counter IDs
+ public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_PDR_COUNTER =
+ PiCounterId.of("FabricIngress.spgw_ingress.pdr_counter");
public static final PiCounterId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_C_LINE_TX =
PiCounterId.of("FabricEgress.bng_egress.downstream.c_line_tx");
+ public static final PiCounterId FABRIC_EGRESS_SPGW_EGRESS_PDR_COUNTER =
+ PiCounterId.of("FabricEgress.spgw_egress.pdr_counter");
public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_DROPPED =
@@ -183,8 +205,6 @@
PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_source");
public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_COUNTER_INT_SOURCE =
PiCounterId.of("FabricEgress.process_int_main.process_int_source.counter_int_source");
- public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_UE_COUNTER =
- PiCounterId.of("FabricIngress.spgw_ingress.ue_counter");
public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
@@ -220,18 +240,22 @@
PiActionId.of("FabricIngress.next.set_double_vlan");
public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INIT_METADATA =
PiActionId.of("FabricEgress.process_int_main.process_int_transit.init_metadata");
- public static final PiActionId FABRIC_INGRESS_ACL_DROP =
- PiActionId.of("FabricIngress.acl.drop");
+ public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_LOAD_TUNNEL_FAR_ATTRIBUTES =
+ PiActionId.of("FabricIngress.spgw_ingress.load_tunnel_far_attributes");
public static final PiActionId FABRIC_INGRESS_ACL_SET_CLONE_SESSION_ID =
PiActionId.of("FabricIngress.acl.set_clone_session_id");
public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_PUNT_TO_CPU =
PiActionId.of("FabricIngress.bng_ingress.upstream.punt_to_cpu");
public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_DROP =
PiActionId.of("FabricIngress.bng_ingress.downstream.drop");
+ public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_PDR_ATTRIBUTES =
+ PiActionId.of("FabricIngress.spgw_ingress.set_pdr_attributes");
public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
PiActionId.of("FabricIngress.next.set_vlan");
public static final PiActionId FABRIC_INGRESS_ACL_NOP_ACL =
PiActionId.of("FabricIngress.acl.nop_acl");
+ public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_LOAD_NORMAL_FAR_ATTRIBUTES =
+ PiActionId.of("FabricIngress.spgw_ingress.load_normal_far_attributes");
public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_SET_LINE =
PiActionId.of("FabricIngress.bng_ingress.set_line");
public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_DISABLED =
@@ -246,8 +270,6 @@
PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v6");
public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_SIMPLE =
PiActionId.of("FabricIngress.next.routing_simple");
- public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_DL_SESS_INFO =
- PiActionId.of("FabricIngress.spgw_ingress.set_dl_sess_info");
public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V4 =
PiActionId.of("FabricEgress.bng_egress.downstream.encap_v4");
public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_HASHED =
@@ -290,18 +312,26 @@
public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_XCONNECT =
PiActionId.of("FabricIngress.next.output_xconnect");
+ public static final PiActionId FABRIC_INGRESS_ACL_DROP =
+ PiActionId.of("FabricIngress.acl.drop");
// Action Param IDs
public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
public static final PiActionParamId MON_PORT =
PiActionParamId.of("mon_port");
- public static final PiActionParamId S1U_SGW_ADDR =
- PiActionParamId.of("s1u_sgw_addr");
+ public static final PiActionParamId NOTIFY_CP =
+ PiActionParamId.of("notify_cp");
+ public static final PiActionParamId SWITCH_ID =
+ PiActionParamId.of("switch_id");
public static final PiActionParamId SMAC = PiActionParamId.of("smac");
public static final PiActionParamId CLONE_ID =
PiActionParamId.of("clone_id");
+ public static final PiActionParamId FAR_ID = PiActionParamId.of("far_id");
public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
+ public static final PiActionParamId TUNNEL_SRC_ADDR =
+ PiActionParamId.of("tunnel_src_addr");
public static final PiActionParamId LABEL = PiActionParamId.of("label");
public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
+ public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
@@ -309,10 +339,8 @@
PiActionParamId.of("inner_vlan_id");
public static final PiActionParamId PPPOE_SESSION_ID =
PiActionParamId.of("pppoe_session_id");
- public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
+ public static final PiActionParamId CTR_ID = PiActionParamId.of("ctr_id");
public static final PiActionParamId MON_IP = PiActionParamId.of("mon_ip");
- public static final PiActionParamId SWITCH_ID =
- PiActionParamId.of("switch_id");
public static final PiActionParamId INS_MASK0003 =
PiActionParamId.of("ins_mask0003");
public static final PiActionParamId LINE_ID = PiActionParamId.of("line_id");
@@ -323,10 +351,11 @@
public static final PiActionParamId INS_MASK0407 =
PiActionParamId.of("ins_mask0407");
public static final PiActionParamId TEID = PiActionParamId.of("teid");
- public static final PiActionParamId S1U_ENB_ADDR =
- PiActionParamId.of("s1u_enb_addr");
+ public static final PiActionParamId DROP = PiActionParamId.of("drop");
public static final PiActionParamId PORT_NUM =
PiActionParamId.of("port_num");
+ public static final PiActionParamId TUNNEL_DST_ADDR =
+ PiActionParamId.of("tunnel_dst_addr");
public static final PiActionParamId GROUP_ID =
PiActionParamId.of("group_id");
public static final PiActionParamId MAX_HOP = PiActionParamId.of("max_hop");
diff --git a/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4 b/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
index 9b1e523..1a4e3f2 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
@@ -107,7 +107,7 @@
#endif
table routing_v4 {
key = {
- hdr.ipv4.dst_addr: lpm @name("ipv4_dst");
+ fabric_metadata.ipv4_dst_addr: lpm @name("ipv4_dst");
}
actions = {
set_next_id_routing_v4;
diff --git a/pipelines/fabric/impl/src/main/resources/include/control/next.p4 b/pipelines/fabric/impl/src/main/resources/include/control/next.p4
index 577307e..58b97b1 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/next.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/next.p4
@@ -202,8 +202,8 @@
table hashed {
key = {
fabric_metadata.next_id: exact @name("next_id");
- hdr.ipv4.dst_addr: selector;
- hdr.ipv4.src_addr: selector;
+ fabric_metadata.ipv4_src_addr: selector;
+ fabric_metadata.ipv4_dst_addr: selector;
fabric_metadata.ip_proto: selector;
fabric_metadata.l4_sport: selector;
fabric_metadata.l4_dport: selector;
diff --git a/pipelines/fabric/impl/src/main/resources/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index 92aa182..8501516 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -100,6 +100,9 @@
typedef bit pcc_gate_status_t;
typedef bit<32> sdf_rule_id_t;
typedef bit<32> pcc_rule_id_t;
+typedef bit<32> far_id_t;
+typedef bit<32> ctr_id_t;
+typedef bit<32> teid_t;
// spgw.p4 expects uplink packets with IP dst on this subnet
// 140.0.0.0/8
diff --git a/pipelines/fabric/impl/src/main/resources/include/header.p4 b/pipelines/fabric/impl/src/main/resources/include/header.p4
index bea9619..decad94 100644
--- a/pipelines/fabric/impl/src/main/resources/include/header.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/header.p4
@@ -135,22 +135,21 @@
bit<1> npdu_flag; /* n-pdn number present ? */
bit<8> msgtype; /* message type */
bit<16> msglen; /* message length */
- bit<32> teid; /* tunnel endpoint id */
+ teid_t teid; /* tunnel endpoint id */
}
struct spgw_meta_t {
direction_t direction;
bit<16> ipv4_len;
- bit<32> teid;
- bit<32> s1u_enb_addr;
- bit<32> s1u_sgw_addr;
-#ifdef WITH_SPGW_PCC_GATING
- bit<16> l4_sport;
- bit<16> l4_dport;
- pcc_gate_status_t pcc_gate_status;
- sdf_rule_id_t sdf_rule_id;
- pcc_rule_id_t pcc_rule_id;
-#endif // WITH_SPGW_PCC_GATING
+ teid_t teid;
+ bit<32> tunnel_src_addr;
+ bit<32> tunnel_dst_addr;
+ ctr_id_t ctr_id;
+ far_id_t far_id;
+ _BOOL pdr_hit;
+ _BOOL far_dropped;
+ _BOOL notify_cp;
+ _BOOL outer_header_creation;
}
#endif // WITH_SPGW
@@ -194,6 +193,8 @@
bit<8> ip_proto;
bit<16> l4_sport;
bit<16> l4_dport;
+ bit<32> ipv4_src_addr;
+ bit<32> ipv4_dst_addr;
#ifdef WITH_SPGW
spgw_meta_t spgw;
#endif // WITH_SPGW
diff --git a/pipelines/fabric/impl/src/main/resources/include/parser.p4 b/pipelines/fabric/impl/src/main/resources/include/parser.p4
index aa79179..efbb74a 100644
--- a/pipelines/fabric/impl/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/parser.p4
@@ -125,6 +125,8 @@
packet.extract(hdr.ipv4);
fabric_metadata.ip_proto = hdr.ipv4.protocol;
fabric_metadata.ip_eth_type = ETHERTYPE_IPV4;
+ fabric_metadata.ipv4_src_addr = hdr.ipv4.src_addr;
+ fabric_metadata.ipv4_dst_addr = hdr.ipv4.dst_addr;
last_ipv4_dscp = hdr.ipv4.dscp;
//Need header verification?
transition select(hdr.ipv4.protocol) {
@@ -316,4 +318,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/pipelines/fabric/impl/src/main/resources/include/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/spgw.p4
index 6eb4c40..0aa78c0 100644
--- a/pipelines/fabric/impl/src/main/resources/include/spgw.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/spgw.p4
@@ -17,6 +17,10 @@
#ifndef __SPGW__
#define __SPGW__
+#define MAX_PDR_COUNTERS 1024
+#define DEFAULT_PDR_CTR_ID 0
+#define DEFAULT_FAR_ID 0
+
control spgw_normalizer(
in bool is_gtpu_encapped,
out ipv4_t gtpu_ipv4,
@@ -49,38 +53,35 @@
inout standard_metadata_t standard_metadata
) {
- direct_counter(CounterType.packets_and_bytes) ue_counter;
+ counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
@hidden
action gtpu_decap() {
+ // grab information from the tunnel that we'll need later
+ fabric_meta.spgw.teid = gtpu.teid;
+ fabric_meta.spgw.tunnel_dst_addr = gtpu_ipv4.dst_addr;
+ // update metadata src and dst addresses with the inner packet
+ fabric_meta.ipv4_src_addr = ipv4.src_addr;
+ fabric_meta.ipv4_dst_addr = ipv4.dst_addr;
+ // decap
gtpu_ipv4.setInvalid();
gtpu_udp.setInvalid();
gtpu.setInvalid();
+
}
- action set_dl_sess_info(bit<32> teid,
- bit<32> s1u_enb_addr,
- bit<32> s1u_sgw_addr) {
- fabric_meta.spgw.teid = teid;
- fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr;
- fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr;
- ue_counter.count();
- }
-
- table dl_sess_lookup {
+ table downlink_filter_table {
key = {
- // UE addr for downlink
- ipv4.dst_addr : exact @name("ipv4_dst");
+ // UE addr pool for downlink
+ ipv4.dst_addr : lpm @name("ipv4_prefix");
}
actions = {
- set_dl_sess_info();
- @defaultonly nop();
+ nop();
}
const default_action = nop();
- counters = ue_counter;
}
- table s1u_filter_table {
+ table uplink_filter_table {
key = {
// IP addresses of the S1U interfaces of this SPGW-U instance (when uplink)
gtpu_ipv4.dst_addr : exact @name("gtp_ipv4_dst");
@@ -91,66 +92,103 @@
const default_action = nop();
}
-#ifdef WITH_SPGW_PCC_GATING
- action set_sdf_rule_id(sdf_rule_id_t id) {
- fabric_meta.spgw.sdf_rule_id = id;
+ action set_pdr_attributes(ctr_id_t ctr_id,
+ far_id_t far_id) {
+ fabric_meta.spgw.pdr_hit = _TRUE;
+ fabric_meta.spgw.ctr_id = ctr_id;
+ fabric_meta.spgw.far_id = far_id;
}
- action set_pcc_rule_id(pcc_rule_id_t id) {
- fabric_meta.spgw.pcc_rule_id = id;
- }
-
- action set_pcc_info(pcc_gate_status_t gate_status) {
- fabric_meta.spgw.pcc_gate_status = gate_status;
- }
-
- table sdf_rule_lookup {
+ // These two tables scale well and cover the average case PDR
+ table downlink_pdr_lookup {
key = {
- fabric_meta.spgw.direction : exact @name("spgw_direction");
- ipv4.src_addr : ternary @name("ipv4_src");
- ipv4.dst_addr : ternary @name("ipv4_dst");
- ipv4.protocol : ternary @name("ip_proto");
- fabric_meta.l4_sport : ternary @name("l4_sport");
- fabric_meta.l4_dport : ternary @name("l4_dport");
+ ipv4.dst_addr : exact @name("ue_addr");
}
actions = {
- set_sdf_rule_id();
+ set_pdr_attributes;
}
- const default_action = set_sdf_rule_id(DEFAULT_SDF_RULE_ID);
}
-
- table pcc_rule_lookup {
+ table uplink_pdr_lookup {
key = {
- fabric_meta.spgw.sdf_rule_id : exact @name("sdf_rule_id");
+ // tunnel_dst_addr will be static for Q2 target. Can remove if need more scaling
+ fabric_meta.spgw.tunnel_dst_addr : exact @name("tunnel_ipv4_dst");
+ fabric_meta.spgw.teid : exact @name("teid");
+ ipv4.src_addr : exact @name("ue_addr");
}
actions = {
- set_pcc_rule_id();
+ set_pdr_attributes;
}
- const default_action = set_pcc_rule_id(DEFAULT_PCC_RULE_ID);
}
-
- table pcc_info_lookup {
+ // This table scales poorly and covers uncommon PDRs
+ table flexible_pdr_lookup {
key = {
- fabric_meta.spgw.pcc_rule_id : exact @name("pcc_rule_id");
+ // Direction. Eventually change to interface
+ fabric_meta.spgw.direction : ternary @name("spgw_direction");
+ // F-TEID
+ fabric_meta.spgw.tunnel_dst_addr : ternary @name("tunnel_ipv4_dst");
+ fabric_meta.spgw.teid : ternary @name("teid");
+ // SDF (5-tuple)
+ ipv4.src_addr : ternary @name("ipv4_src");
+ ipv4.dst_addr : ternary @name("ipv4_dst");
+ ipv4.protocol : ternary @name("ip_proto");
+ fabric_meta.l4_sport : ternary @name("l4_sport");
+ fabric_meta.l4_dport : ternary @name("l4_dport");
}
actions = {
- set_pcc_info();
+ set_pdr_attributes;
}
- const default_action = set_pcc_info(PCC_GATE_OPEN);
+ const default_action = set_pdr_attributes(DEFAULT_PDR_CTR_ID, DEFAULT_FAR_ID);
}
-#endif // WITH_SPGW_PCC_GATING
+
+ action load_normal_far_attributes(bit<1> drop,
+ bit<1> notify_cp) {
+ // general far attributes
+ fabric_meta.spgw.far_dropped = (_BOOL)drop;
+ fabric_meta.spgw.notify_cp = (_BOOL)notify_cp;
+ }
+ action load_tunnel_far_attributes(bit<1> drop,
+ bit<1> notify_cp,
+ ipv4_addr_t tunnel_src_addr,
+ ipv4_addr_t tunnel_dst_addr,
+ teid_t teid) {
+ // general far attributes
+ fabric_meta.spgw.far_dropped = (_BOOL)drop;
+ fabric_meta.spgw.notify_cp = (_BOOL)notify_cp;
+ // GTP tunnel attributes
+ fabric_meta.spgw.outer_header_creation = _TRUE;
+ fabric_meta.spgw.teid = teid;
+ fabric_meta.spgw.tunnel_src_addr = tunnel_src_addr;
+ fabric_meta.spgw.tunnel_dst_addr = tunnel_dst_addr;
+ // update metadata IP addresses for correct routing/hashing
+ fabric_meta.ipv4_src_addr = tunnel_src_addr;
+ fabric_meta.ipv4_dst_addr = tunnel_dst_addr;
+ }
+
+
+ table far_lookup {
+ key = {
+ fabric_meta.spgw.far_id : exact @name("far_id");
+ }
+ actions = {
+ load_normal_far_attributes;
+ load_tunnel_far_attributes;
+ }
+ // default is drop and don't notify CP
+ const default_action = load_normal_far_attributes(1w1, 1w0);
+ }
apply {
if (gtpu.isValid()) {
// If here, pkt has outer IP dst on
// S1U_SGW_PREFIX/S1U_SGW_PREFIX_LEN subnet.
// TODO: check also that gtpu.msgtype == GTP_GPDU
- if (!s1u_filter_table.apply().hit) {
+ if (!uplink_filter_table.apply().hit) {
+ // Should this be changed to a forwarding/next skip instead of a drop?
mark_to_drop(standard_metadata);
}
fabric_meta.spgw.direction = SPGW_DIR_UPLINK;
gtpu_decap();
- } else if (dl_sess_lookup.apply().hit) {
+ } else if (downlink_filter_table.apply().hit) {
fabric_meta.spgw.direction = SPGW_DIR_DOWNLINK;
} else {
fabric_meta.spgw.direction = SPGW_DIR_UNKNOWN;
@@ -158,20 +196,39 @@
return;
}
-#ifdef WITH_SPGW_PCC_GATING
- // Allow all traffic by default.
- fabric_meta.spgw.pcc_gate_status = PCC_GATE_OPEN;
-
- sdf_rule_lookup.apply();
- pcc_rule_lookup.apply();
- pcc_info_lookup.apply();
-
- if (fabric_meta.spgw.pcc_gate_status == PCC_GATE_CLOSED) {
- mark_to_drop(standard_metadata);
+ // Try the efficient PDR tables first (This PDR partitioning only works
+ // if the PDRs do not overlap. Will need fixing later.)
+ if (fabric_meta.spgw.direction == SPGW_DIR_UPLINK) {
+ uplink_pdr_lookup.apply();
+ } else if (fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK) {
+ downlink_pdr_lookup.apply();
+ } else { // SPGW_DIR_UNKNOWN
+ return;
}
-#endif // WITH_SPGW_PCC_GATING
+ // If those fail to find a match, use the wildcard tables
+ if (fabric_meta.spgw.pdr_hit == _FALSE) {
+ flexible_pdr_lookup.apply();
+ }
- // Don't ask why... we'll need this later.
+ pdr_counter.count(fabric_meta.spgw.ctr_id);
+ // Load FAR info
+ far_lookup.apply();
+
+ if (fabric_meta.spgw.notify_cp == _TRUE) {
+ // TODO: cpu clone session here
+ }
+ if (fabric_meta.spgw.far_dropped == _TRUE) {
+ // Do dropping in the same way as fabric's filtering.p4, so we can traverse
+ // the ACL table, which is good for cases like DHCP.
+ fabric_meta.skip_forwarding = _TRUE;
+ fabric_meta.skip_next = _TRUE;
+ }
+
+ // Nothing to be done immediately for forwarding or encapsulation.
+ // Forwarding is done by other parts of fabric.p4, and
+ // encapsulation is done in the egress
+
+ // Needed for correct GTPU encapsulation in egress
fabric_meta.spgw.ipv4_len = ipv4.total_len;
}
}
@@ -186,6 +243,9 @@
in standard_metadata_t std_meta
) {
+ counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
+
+
@hidden
action gtpu_encap() {
gtpu_ipv4.setValid();
@@ -195,21 +255,22 @@
gtpu_ipv4.ecn = 0;
gtpu_ipv4.total_len = ipv4.total_len
+ (IPV4_HDR_SIZE + UDP_HDR_SIZE + GTP_HDR_SIZE);
- gtpu_ipv4.identification = 0x1513; /* From NGIC */
+ gtpu_ipv4.identification = 0x1513; /* From NGIC. TODO: Needs to be dynamic */
gtpu_ipv4.flags = 0;
gtpu_ipv4.frag_offset = 0;
gtpu_ipv4.ttl = DEFAULT_IPV4_TTL;
gtpu_ipv4.protocol = PROTO_UDP;
- gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr;
- gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr;
+ gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr;
+ gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr;
gtpu_ipv4.hdr_checksum = 0; // Updated later
gtpu_udp.setValid();
- gtpu_udp.sport = UDP_PORT_GTPU;
+ gtpu_udp.sport = UDP_PORT_GTPU; // TODO: make this dynamic per 3GPP specs
gtpu_udp.dport = UDP_PORT_GTPU;
gtpu_udp.len = fabric_meta.spgw.ipv4_len
+ (UDP_HDR_SIZE + GTP_HDR_SIZE);
- gtpu_udp.checksum = 0; // Updated later
+ gtpu_udp.checksum = 0; // Updated later, if WITH_SPGW_UDP_CSUM_UPDATE
+
gtpu.setValid();
gtpu.version = GTPU_VERSION;
@@ -224,7 +285,9 @@
}
apply {
- if (fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK) {
+ pdr_counter.count(fabric_meta.spgw.ctr_id);
+
+ if (fabric_meta.spgw.outer_header_creation == _TRUE) {
gtpu_encap();
}
}
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 7620adc..c8e585a 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -32,12 +32,14 @@
["fabric_metadata_t._ip_proto16", 8, false],
["fabric_metadata_t._l4_sport17", 16, false],
["fabric_metadata_t._l4_dport18", 16, false],
- ["fabric_metadata_t._bng_type19", 2, false],
- ["fabric_metadata_t._bng_line_id20", 32, false],
- ["fabric_metadata_t._bng_pppoe_session_id21", 16, false],
- ["fabric_metadata_t._bng_ds_meter_result22", 32, false],
- ["fabric_metadata_t._bng_s_tag23", 12, false],
- ["fabric_metadata_t._bng_c_tag24", 12, false],
+ ["fabric_metadata_t._ipv4_src_addr19", 32, false],
+ ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
+ ["fabric_metadata_t._bng_type21", 2, false],
+ ["fabric_metadata_t._bng_line_id22", 32, false],
+ ["fabric_metadata_t._bng_pppoe_session_id23", 16, false],
+ ["fabric_metadata_t._bng_ds_meter_result24", 32, false],
+ ["fabric_metadata_t._bng_s_tag25", 12, false],
+ ["fabric_metadata_t._bng_c_tag26", 12, false],
["_padding_0", 2, false]
]
},
@@ -333,34 +335,7 @@
{
"name" : "start",
"id" : 0,
- "parser_ops" : [
- {
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag23"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0000"
- }
- ],
- "op" : "set"
- },
- {
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag24"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0000"
- }
- ],
- "op" : "set"
- }
- ],
+ "parser_ops" : [],
"transitions" : [
{
"type" : "hexstr",
@@ -493,7 +468,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag23"]
+ "value" : ["scalars", "fabric_metadata_t._bng_s_tag25"]
},
{
"type" : "field",
@@ -553,7 +528,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_c_tag26"]
},
{
"type" : "field",
@@ -775,6 +750,32 @@
}
],
"op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
}
],
"transitions" : [
@@ -945,7 +946,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1403,7 +1404,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -1425,7 +1426,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type19"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type21"]
},
{
"type" : "hexstr",
@@ -1434,7 +1435,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 160,
+ "line" : 159,
"column" : 36,
"source_fragment" : "2w0x0; ..."
}
@@ -1475,7 +1476,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 114,
+ "line" : 117,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -1504,7 +1505,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -1531,7 +1532,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type19"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type21"]
},
{
"type" : "hexstr",
@@ -1540,7 +1541,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 162,
+ "line" : 161,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -1550,7 +1551,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id21"]
+ "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id23"]
},
{
"type" : "runtime_data",
@@ -1573,7 +1574,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -1595,7 +1596,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type19"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type21"]
},
{
"type" : "hexstr",
@@ -1604,7 +1605,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 162,
+ "line" : 161,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -1618,7 +1619,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -1672,7 +1673,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
},
{
"type" : "runtime_data",
@@ -2230,7 +2231,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag23"]
+ "value" : ["scalars", "fabric_metadata_t._bng_s_tag25"]
},
{
"type" : "runtime_data",
@@ -2249,7 +2250,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_c_tag26"]
},
{
"type" : "runtime_data",
@@ -2953,7 +2954,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type19"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type21"]
},
{
"type" : "hexstr",
@@ -2962,7 +2963,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 161,
+ "line" : 160,
"column" : 37,
"source_fragment" : "2w0x1; ..."
}
@@ -3042,7 +3043,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -3128,11 +3129,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result22"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
}
],
"source_info" : {
@@ -3158,11 +3159,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result22"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
}
],
"source_info" : {
@@ -3199,7 +3200,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 118,
+ "line" : 121,
"column" : 33,
"source_fragment" : "0x8864; ..."
}
@@ -3285,7 +3286,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id21"]
+ "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id23"]
}
],
"source_info" : {
@@ -3304,7 +3305,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id20"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
}
],
"source_info" : {
@@ -3370,7 +3371,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 120,
+ "line" : 123,
"column" : 35,
"source_fragment" : "0x0021; ..."
}
@@ -3528,7 +3529,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -3607,7 +3608,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3705,7 +3706,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3822,7 +3823,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3841,7 +3842,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -4516,7 +4517,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"],
"mask" : null
}
],
@@ -4827,13 +4828,13 @@
{
"match_type" : "exact",
"name" : "s_tag",
- "target" : ["scalars", "fabric_metadata_t._bng_s_tag23"],
+ "target" : ["scalars", "fabric_metadata_t._bng_s_tag25"],
"mask" : null
},
{
"match_type" : "exact",
"name" : "c_tag",
- "target" : ["scalars", "fabric_metadata_t._bng_c_tag24"],
+ "target" : ["scalars", "fabric_metadata_t._bng_c_tag26"],
"mask" : null
}
],
@@ -5016,7 +5017,7 @@
{
"match_type" : "exact",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id20"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
"mask" : null
},
{
@@ -5094,7 +5095,7 @@
{
"match_type" : "exact",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id20"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
"mask" : null
}
],
@@ -5177,7 +5178,7 @@
{
"match_type" : "ternary",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id20"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
"mask" : null
},
{
@@ -5294,11 +5295,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
},
{
"type" : "field",
@@ -6613,7 +6614,7 @@
"op" : "==",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type19"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type21"]
},
"right" : {
"type" : "hexstr",
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 4295526..b79ed6d 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -41,26 +41,34 @@
["fabric_metadata_t._ip_proto16", 8, false],
["fabric_metadata_t._l4_sport17", 16, false],
["fabric_metadata_t._l4_dport18", 16, false],
- ["fabric_metadata_t._spgw_direction19", 2, false],
- ["fabric_metadata_t._spgw_ipv4_len20", 16, false],
- ["fabric_metadata_t._spgw_teid21", 32, false],
- ["fabric_metadata_t._spgw_s1u_enb_addr22", 32, false],
- ["fabric_metadata_t._spgw_s1u_sgw_addr23", 32, false],
- ["fabric_metadata_t._bng_type24", 2, false],
- ["fabric_metadata_t._bng_line_id25", 32, false],
- ["fabric_metadata_t._bng_pppoe_session_id26", 16, false],
- ["fabric_metadata_t._bng_ds_meter_result27", 32, false],
- ["fabric_metadata_t._bng_s_tag28", 12, false],
- ["fabric_metadata_t._bng_c_tag29", 12, false],
- ["fabric_metadata_t._int_meta_source30", 1, false],
- ["fabric_metadata_t._int_meta_transit31", 1, false],
- ["fabric_metadata_t._int_meta_sink32", 1, false],
- ["fabric_metadata_t._int_meta_switch_id33", 32, false],
- ["fabric_metadata_t._int_meta_new_words34", 8, false],
- ["fabric_metadata_t._int_meta_new_bytes35", 16, false],
- ["fabric_metadata_t._int_meta_ig_tstamp36", 32, false],
- ["fabric_metadata_t._int_meta_eg_tstamp37", 32, false],
- ["_padding_0", 2, false]
+ ["fabric_metadata_t._ipv4_src_addr19", 32, false],
+ ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
+ ["fabric_metadata_t._spgw_direction21", 2, false],
+ ["fabric_metadata_t._spgw_ipv4_len22", 16, false],
+ ["fabric_metadata_t._spgw_teid23", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_src_addr24", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_dst_addr25", 32, false],
+ ["fabric_metadata_t._spgw_ctr_id26", 32, false],
+ ["fabric_metadata_t._spgw_far_id27", 32, false],
+ ["fabric_metadata_t._spgw_pdr_hit28", 1, false],
+ ["fabric_metadata_t._spgw_far_dropped29", 1, false],
+ ["fabric_metadata_t._spgw_notify_cp30", 1, false],
+ ["fabric_metadata_t._spgw_outer_header_creation31", 1, false],
+ ["fabric_metadata_t._bng_type32", 2, false],
+ ["fabric_metadata_t._bng_line_id33", 32, false],
+ ["fabric_metadata_t._bng_pppoe_session_id34", 16, false],
+ ["fabric_metadata_t._bng_ds_meter_result35", 32, false],
+ ["fabric_metadata_t._bng_s_tag36", 12, false],
+ ["fabric_metadata_t._bng_c_tag37", 12, false],
+ ["fabric_metadata_t._int_meta_source38", 1, false],
+ ["fabric_metadata_t._int_meta_transit39", 1, false],
+ ["fabric_metadata_t._int_meta_sink40", 1, false],
+ ["fabric_metadata_t._int_meta_switch_id41", 32, false],
+ ["fabric_metadata_t._int_meta_new_words42", 8, false],
+ ["fabric_metadata_t._int_meta_new_bytes43", 16, false],
+ ["fabric_metadata_t._int_meta_ig_tstamp44", 32, false],
+ ["fabric_metadata_t._int_meta_eg_tstamp45", 32, false],
+ ["_padding_0", 6, false]
]
},
{
@@ -684,32 +692,6 @@
}
],
"op" : "set"
- },
- {
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag28"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0000"
- }
- ],
- "op" : "set"
- },
- {
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag29"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0000"
- }
- ],
- "op" : "set"
}
],
"transitions" : [
@@ -844,7 +826,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag28"]
+ "value" : ["scalars", "fabric_metadata_t._bng_s_tag36"]
},
{
"type" : "field",
@@ -904,7 +886,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag29"]
+ "value" : ["scalars", "fabric_metadata_t._bng_c_tag37"]
},
{
"type" : "field",
@@ -1149,6 +1131,32 @@
"parameters" : [
{
"type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "last_ipv4_dscp_0"]
},
{
@@ -1779,7 +1787,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1818,16 +1826,16 @@
],
"counter_arrays" : [
{
- "name" : "FabricIngress.spgw_ingress.ue_counter",
+ "name" : "FabricIngress.spgw_ingress.pdr_counter",
"id" : 0,
- "is_direct" : true,
- "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup",
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 52,
- "column" : 50,
- "source_fragment" : "ue_counter"
- }
+ "line" : 56,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
},
{
"name" : "FabricIngress.process_set_source_sink.counter_set_source",
@@ -2058,9 +2066,21 @@
"is_direct" : false
},
{
- "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
+ "name" : "FabricEgress.spgw_egress.pdr_counter",
"id" : 20,
"source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 246,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
+ },
+ {
+ "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
+ "id" : 21,
+ "source_info" : {
"filename" : "include/bng.p4",
"line" : 267,
"column" : 37,
@@ -2071,7 +2091,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
- "id" : 21,
+ "id" : 22,
"is_direct" : true,
"binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
"source_info" : {
@@ -2083,7 +2103,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan_counter",
- "id" : 22,
+ "id" : 23,
"is_direct" : true,
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
@@ -2162,7 +2182,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
@@ -2373,11 +2393,99 @@
"primitives" : []
},
{
- "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "name" : "NoAction",
"id" : 15,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 16,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "id" : 17,
+ "runtime_data" : [],
"primitives" : [
{
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu", "teid"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 61,
+ "column" : 30,
+ "source_fragment" : "= gtpu.teid; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 62,
+ "column" : 41,
+ "source_fragment" : "= gtpu_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 64,
+ "column" : 34,
+ "source_fragment" : "= ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 65,
+ "column" : 34,
+ "source_fragment" : "= ipv4.dst_addr; ..."
+ }
+ },
+ {
"op" : "remove_header",
"parameters" : [
{
@@ -2387,7 +2495,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 56,
+ "line" : 67,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setInvalid()"
}
@@ -2402,7 +2510,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 57,
+ "line" : 68,
"column" : 8,
"source_fragment" : "gtpu_udp.setInvalid()"
}
@@ -2417,7 +2525,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 58,
+ "line" : 69,
"column" : 8,
"source_fragment" : "gtpu.setInvalid()"
}
@@ -2425,19 +2533,15 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 16,
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 18,
"runtime_data" : [
{
- "name" : "teid",
+ "name" : "ctr_id",
"bitwidth" : 32
},
{
- "name" : "s1u_enb_addr",
- "bitwidth" : 32
- },
- {
- "name" : "s1u_sgw_addr",
+ "name" : "far_id",
"bitwidth" : 32
}
],
@@ -2447,7 +2551,36 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
},
{
"type" : "runtime_data",
@@ -2456,7 +2589,440 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 64,
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 19,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 20,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+ "id" : 21,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped29"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 146,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp30"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 147,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+ "id" : 22,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "tunnel_src_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "tunnel_dst_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "teid",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped29"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 155,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp30"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 156,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation31"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 158,
+ "column" : 47,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 4
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 159,
"column" : 30,
"source_fragment" : "= teid; ..."
}
@@ -2466,26 +3032,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr22"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 65,
- "column" : 38,
- "source_fragment" : "= s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr23"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr24"]
},
{
"type" : "runtime_data",
@@ -2494,16 +3041,73 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 66,
- "column" : 38,
- "source_fragment" : "= s1u_sgw_addr; ..."
+ "line" : 160,
+ "column" : 41,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 161,
+ "column" : 41,
+ "source_fragment" : "= tunnel_dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 163,
+ "column" : 34,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 164,
+ "column" : 34,
+ "source_fragment" : "= tunnel_dst_addr; ..."
}
}
]
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_source",
- "id" : 17,
+ "id" : 23,
"runtime_data" : [],
"primitives" : [
{
@@ -2511,7 +3115,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source30"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source38"]
},
{
"type" : "expression",
@@ -2539,7 +3143,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_sink",
- "id" : 18,
+ "id" : 24,
"runtime_data" : [],
"primitives" : [
{
@@ -2547,7 +3151,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_sink32"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_sink40"]
},
{
"type" : "expression",
@@ -2575,7 +3179,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
- "id" : 19,
+ "id" : 25,
"runtime_data" : [],
"primitives" : [
{
@@ -2625,7 +3229,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -2639,7 +3243,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_disabled",
- "id" : 20,
+ "id" : 26,
"runtime_data" : [],
"primitives" : [
{
@@ -2647,7 +3251,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
{
"type" : "hexstr",
@@ -2656,7 +3260,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 160,
+ "line" : 159,
"column" : 36,
"source_fragment" : "2w0x0; ..."
}
@@ -2680,7 +3284,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_disabled",
- "id" : 21,
+ "id" : 27,
"runtime_data" : [],
"primitives" : [
{
@@ -2688,7 +3292,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
{
"type" : "hexstr",
@@ -2697,7 +3301,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 160,
+ "line" : 159,
"column" : 36,
"source_fragment" : "2w0x0; ..."
}
@@ -2721,7 +3325,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
- "id" : 22,
+ "id" : 28,
"runtime_data" : [],
"primitives" : [
{
@@ -2738,7 +3342,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 114,
+ "line" : 117,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -2767,7 +3371,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -2781,7 +3385,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
- "id" : 23,
+ "id" : 29,
"runtime_data" : [],
"primitives" : [
{
@@ -2798,7 +3402,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 115,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x86dd; ..."
}
@@ -2827,7 +3431,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -2841,7 +3445,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.set_session",
- "id" : 24,
+ "id" : 30,
"runtime_data" : [
{
"name" : "pppoe_session_id",
@@ -2854,7 +3458,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
{
"type" : "hexstr",
@@ -2863,7 +3467,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 162,
+ "line" : 161,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -2873,7 +3477,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
+ "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
},
{
"type" : "runtime_data",
@@ -2896,7 +3500,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -2910,7 +3514,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.drop",
- "id" : 25,
+ "id" : 31,
"runtime_data" : [],
"primitives" : [
{
@@ -2918,7 +3522,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
{
"type" : "hexstr",
@@ -2927,7 +3531,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 162,
+ "line" : 161,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -2941,7 +3545,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -2970,31 +3574,31 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.qos_prio",
- "id" : 26,
+ "id" : 32,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.bng_ingress.downstream.qos_prio",
- "id" : 27,
+ "id" : 33,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
- "id" : 28,
+ "id" : 34,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
- "id" : 29,
+ "id" : 35,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.bng_ingress.set_line",
- "id" : 30,
+ "id" : 36,
"runtime_data" : [
{
"name" : "line_id",
@@ -3007,7 +3611,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
},
{
"type" : "runtime_data",
@@ -3025,7 +3629,7 @@
},
{
"name" : "FabricIngress.filtering.deny",
- "id" : 31,
+ "id" : 37,
"runtime_data" : [],
"primitives" : [
{
@@ -3090,13 +3694,13 @@
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 32,
+ "id" : 38,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 33,
+ "id" : 39,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -3127,7 +3731,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 34,
+ "id" : 40,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -3158,7 +3762,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 35,
+ "id" : 41,
"runtime_data" : [
{
"name" : "next_id",
@@ -3189,7 +3793,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 36,
+ "id" : 42,
"runtime_data" : [
{
"name" : "next_id",
@@ -3239,7 +3843,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 37,
+ "id" : 43,
"runtime_data" : [
{
"name" : "next_id",
@@ -3270,13 +3874,13 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 38,
+ "id" : 44,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v6",
- "id" : 39,
+ "id" : 45,
"runtime_data" : [
{
"name" : "next_id",
@@ -3307,7 +3911,7 @@
},
{
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 40,
+ "id" : 46,
"runtime_data" : [
{
"name" : "next_id",
@@ -3338,7 +3942,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 41,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -3393,7 +3997,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 42,
+ "id" : 48,
"runtime_data" : [
{
"name" : "clone_id",
@@ -3424,7 +4028,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 43,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3475,13 +4079,13 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 44,
+ "id" : 50,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.next.set_vlan",
- "id" : 45,
+ "id" : 51,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -3512,7 +4116,7 @@
},
{
"name" : "FabricIngress.next.set_double_vlan",
- "id" : 46,
+ "id" : 52,
"runtime_data" : [
{
"name" : "outer_vlan_id",
@@ -3596,7 +4200,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_s_tag28"]
+ "value" : ["scalars", "fabric_metadata_t._bng_s_tag36"]
},
{
"type" : "runtime_data",
@@ -3615,7 +4219,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_c_tag29"]
+ "value" : ["scalars", "fabric_metadata_t._bng_c_tag37"]
},
{
"type" : "runtime_data",
@@ -3633,7 +4237,7 @@
},
{
"name" : "FabricIngress.next.output_xconnect",
- "id" : 47,
+ "id" : 53,
"runtime_data" : [
{
"name" : "port_num",
@@ -3664,7 +4268,7 @@
},
{
"name" : "FabricIngress.next.set_next_id_xconnect",
- "id" : 48,
+ "id" : 54,
"runtime_data" : [
{
"name" : "next_id",
@@ -3695,7 +4299,7 @@
},
{
"name" : "FabricIngress.next.output_simple",
- "id" : 49,
+ "id" : 55,
"runtime_data" : [
{
"name" : "port_num",
@@ -3726,7 +4330,7 @@
},
{
"name" : "FabricIngress.next.routing_simple",
- "id" : 50,
+ "id" : 56,
"runtime_data" : [
{
"name" : "port_num",
@@ -3803,7 +4407,7 @@
},
{
"name" : "FabricIngress.next.mpls_routing_simple",
- "id" : 51,
+ "id" : 57,
"runtime_data" : [
{
"name" : "port_num",
@@ -3903,7 +4507,7 @@
},
{
"name" : "FabricIngress.next.output_hashed",
- "id" : 52,
+ "id" : 58,
"runtime_data" : [
{
"name" : "port_num",
@@ -3934,7 +4538,7 @@
},
{
"name" : "FabricIngress.next.routing_hashed",
- "id" : 53,
+ "id" : 59,
"runtime_data" : [
{
"name" : "port_num",
@@ -4011,7 +4615,7 @@
},
{
"name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 54,
+ "id" : 60,
"runtime_data" : [
{
"name" : "port_num",
@@ -4111,7 +4715,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 55,
+ "id" : 61,
"runtime_data" : [
{
"name" : "group_id",
@@ -4171,7 +4775,7 @@
},
{
"name" : "act",
- "id" : 56,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -4198,7 +4802,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
}
@@ -4207,7 +4811,7 @@
},
{
"name" : "act_0",
- "id" : 57,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -4267,7 +4871,7 @@
},
{
"name" : "act_1",
- "id" : 58,
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -4284,7 +4888,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "= inner_udp; ..."
}
@@ -4293,7 +4897,7 @@
},
{
"name" : "act_2",
- "id" : 59,
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -4306,7 +4910,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
}
@@ -4315,7 +4919,7 @@
},
{
"name" : "act_3",
- "id" : 60,
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -4332,7 +4936,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
}
@@ -4351,7 +4955,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 32,
+ "line" : 36,
"column" : 13,
"source_fragment" : "= inner_ipv4; ..."
}
@@ -4370,7 +4974,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 33,
+ "line" : 37,
"column" : 17,
"source_fragment" : "= udp; ..."
}
@@ -4379,7 +4983,7 @@
},
{
"name" : "act_4",
- "id" : 61,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -4459,7 +5063,7 @@
},
{
"name" : "act_5",
- "id" : 62,
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -4523,7 +5127,7 @@
},
{
"name" : "act_6",
- "id" : 63,
+ "id" : 69,
"runtime_data" : [],
"primitives" : [
{
@@ -4587,7 +5191,7 @@
},
{
"name" : "act_7",
- "id" : 64,
+ "id" : 70,
"runtime_data" : [],
"primitives" : [
{
@@ -4613,7 +5217,7 @@
},
{
"name" : "act_8",
- "id" : 65,
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -4643,7 +5247,7 @@
},
{
"name" : "act_9",
- "id" : 66,
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -4673,7 +5277,7 @@
},
{
"name" : "act_10",
- "id" : 67,
+ "id" : 73,
"runtime_data" : [],
"primitives" : [
{
@@ -4686,7 +5290,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -4695,7 +5299,7 @@
},
{
"name" : "act_11",
- "id" : 68,
+ "id" : 74,
"runtime_data" : [],
"primitives" : [
{
@@ -4703,7 +5307,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
},
{
"type" : "hexstr",
@@ -4712,7 +5316,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 147,
+ "line" : 150,
"column" : 36,
"source_fragment" : "2w1; ..."
}
@@ -4721,7 +5325,7 @@
},
{
"name" : "act_12",
- "id" : 69,
+ "id" : 75,
"runtime_data" : [],
"primitives" : [
{
@@ -4751,7 +5355,7 @@
},
{
"name" : "act_13",
- "id" : 70,
+ "id" : 76,
"runtime_data" : [],
"primitives" : [
{
@@ -4781,7 +5385,7 @@
},
{
"name" : "act_14",
- "id" : 71,
+ "id" : 77,
"runtime_data" : [],
"primitives" : [
{
@@ -4789,7 +5393,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
},
{
"type" : "hexstr",
@@ -4798,7 +5402,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 148,
+ "line" : 151,
"column" : 38,
"source_fragment" : "2w2; ..."
}
@@ -4807,7 +5411,7 @@
},
{
"name" : "act_15",
- "id" : 72,
+ "id" : 78,
"runtime_data" : [],
"primitives" : [
{
@@ -4815,7 +5419,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
},
{
"type" : "hexstr",
@@ -4824,7 +5428,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 146,
+ "line" : 149,
"column" : 37,
"source_fragment" : "2w0; ..."
}
@@ -4853,7 +5457,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 158,
+ "line" : 196,
"column" : 12,
"source_fragment" : "return"
}
@@ -4862,7 +5466,7 @@
},
{
"name" : "act_16",
- "id" : 73,
+ "id" : 79,
"runtime_data" : [],
"primitives" : [
{
@@ -4892,7 +5496,7 @@
},
{
"name" : "act_17",
- "id" : 74,
+ "id" : 80,
"runtime_data" : [],
"primitives" : [
{
@@ -4900,7 +5504,134 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_18",
+ "id" : 81,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricIngress.spgw_ingress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_19",
+ "id" : 82,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 224,
+ "column" : 34,
+ "source_fragment" : "= true; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_20",
+ "id" : 83,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
},
{
"type" : "field",
@@ -4909,7 +5640,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 232,
"column" : 34,
"source_fragment" : "= ipv4.total_len; ..."
}
@@ -4917,8 +5648,8 @@
]
},
{
- "name" : "act_18",
- "id" : 75,
+ "name" : "act_21",
+ "id" : 84,
"runtime_data" : [],
"primitives" : [
{
@@ -4975,8 +5706,8 @@
]
},
{
- "name" : "act_19",
- "id" : 76,
+ "name" : "act_22",
+ "id" : 85,
"runtime_data" : [],
"primitives" : [
{
@@ -5033,8 +5764,8 @@
]
},
{
- "name" : "act_20",
- "id" : 77,
+ "name" : "act_23",
+ "id" : 86,
"runtime_data" : [],
"primitives" : [
{
@@ -5059,8 +5790,8 @@
]
},
{
- "name" : "act_21",
- "id" : 78,
+ "name" : "act_24",
+ "id" : 87,
"runtime_data" : [],
"primitives" : [
{
@@ -5089,8 +5820,8 @@
]
},
{
- "name" : "act_22",
- "id" : 79,
+ "name" : "act_25",
+ "id" : 88,
"runtime_data" : [],
"primitives" : [
{
@@ -5119,8 +5850,8 @@
]
},
{
- "name" : "act_23",
- "id" : 80,
+ "name" : "act_26",
+ "id" : 89,
"runtime_data" : [],
"primitives" : [
{
@@ -5128,7 +5859,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
{
"type" : "hexstr",
@@ -5137,7 +5868,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 161,
+ "line" : 160,
"column" : 37,
"source_fragment" : "2w0x1; ..."
}
@@ -5168,8 +5899,8 @@
]
},
{
- "name" : "act_24",
- "id" : 81,
+ "name" : "act_27",
+ "id" : 90,
"runtime_data" : [],
"primitives" : [
{
@@ -5204,8 +5935,8 @@
]
},
{
- "name" : "act_25",
- "id" : 82,
+ "name" : "act_28",
+ "id" : 91,
"runtime_data" : [],
"primitives" : [
{
@@ -5217,7 +5948,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -5230,8 +5961,8 @@
]
},
{
- "name" : "act_26",
- "id" : 83,
+ "name" : "act_29",
+ "id" : 92,
"runtime_data" : [],
"primitives" : [
{
@@ -5243,7 +5974,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -5256,8 +5987,8 @@
]
},
{
- "name" : "act_27",
- "id" : 84,
+ "name" : "act_30",
+ "id" : 93,
"runtime_data" : [],
"primitives" : [
{
@@ -5315,8 +6046,8 @@
]
},
{
- "name" : "act_28",
- "id" : 85,
+ "name" : "act_31",
+ "id" : 94,
"runtime_data" : [],
"primitives" : [
{
@@ -5345,8 +6076,8 @@
]
},
{
- "name" : "act_29",
- "id" : 86,
+ "name" : "act_32",
+ "id" : 95,
"runtime_data" : [],
"primitives" : [
{
@@ -5375,8 +6106,8 @@
]
},
{
- "name" : "act_30",
- "id" : 87,
+ "name" : "act_33",
+ "id" : 96,
"runtime_data" : [],
"primitives" : [
{
@@ -5388,11 +6119,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
}
],
"source_info" : {
@@ -5405,8 +6136,8 @@
]
},
{
- "name" : "act_31",
- "id" : 88,
+ "name" : "act_34",
+ "id" : 97,
"runtime_data" : [],
"primitives" : [
{
@@ -5418,11 +6149,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
}
],
"source_info" : {
@@ -5435,8 +6166,8 @@
]
},
{
- "name" : "act_32",
- "id" : 89,
+ "name" : "act_35",
+ "id" : 98,
"runtime_data" : [],
"primitives" : [
{
@@ -5448,11 +6179,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
}
],
"source_info" : {
@@ -5465,8 +6196,8 @@
]
},
{
- "name" : "act_33",
- "id" : 90,
+ "name" : "act_36",
+ "id" : 99,
"runtime_data" : [],
"primitives" : [
{
@@ -5478,11 +6209,11 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
+ "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
}
],
"source_info" : {
@@ -5496,43 +6227,43 @@
},
{
"name" : "nop",
- "id" : 91,
+ "id" : 100,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "nop",
- "id" : 92,
+ "id" : 101,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "nop",
- "id" : 93,
+ "id" : 102,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "nop",
- "id" : 94,
+ "id" : 103,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "NoAction",
- "id" : 95,
+ "id" : 104,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "NoAction",
- "id" : 96,
+ "id" : 105,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 97,
+ "id" : 106,
"runtime_data" : [],
"primitives" : [
{
@@ -5545,7 +6276,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 191,
+ "line" : 251,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setValid()"
}
@@ -5564,7 +6295,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 192,
+ "line" : 252,
"column" : 8,
"source_fragment" : "gtpu_ipv4.version = 4"
}
@@ -5583,7 +6314,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 132,
"column" : 28,
"source_fragment" : "5; ..."
}
@@ -5602,7 +6333,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 194,
+ "line" : 254,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dscp = 0"
}
@@ -5621,7 +6352,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 195,
+ "line" : 255,
"column" : 8,
"source_fragment" : "gtpu_ipv4.ecn = 0"
}
@@ -5663,7 +6394,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 196,
+ "line" : 256,
"column" : 8,
"source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
}
@@ -5682,7 +6413,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 198,
+ "line" : 258,
"column" : 8,
"source_fragment" : "gtpu_ipv4.identification = 0x1513"
}
@@ -5701,7 +6432,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 199,
+ "line" : 259,
"column" : 8,
"source_fragment" : "gtpu_ipv4.flags = 0"
}
@@ -5720,7 +6451,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 200,
+ "line" : 260,
"column" : 8,
"source_fragment" : "gtpu_ipv4.frag_offset = 0"
}
@@ -5739,7 +6470,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 142,
+ "line" : 145,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -5758,7 +6489,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 129,
"column" : 25,
"source_fragment" : "17; ..."
}
@@ -5768,37 +6499,37 @@
"parameters" : [
{
"type" : "field",
- "value" : ["gtpu_ipv4", "dst_addr"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr22"]
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 203,
- "column" : 8,
- "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
"value" : ["gtpu_ipv4", "src_addr"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr23"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr24"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 204,
+ "line" : 263,
"column" : 8,
- "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
+ "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 264,
+ "column" : 8,
+ "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr; ..."
}
},
{
@@ -5815,7 +6546,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 205,
+ "line" : 265,
"column" : 8,
"source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
}
@@ -5830,7 +6561,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 207,
+ "line" : 267,
"column" : 8,
"source_fragment" : "gtpu_udp.setValid()"
}
@@ -5849,7 +6580,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 208,
+ "line" : 268,
"column" : 8,
"source_fragment" : "gtpu_udp.sport = 2152"
}
@@ -5868,7 +6599,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 209,
+ "line" : 269,
"column" : 8,
"source_fragment" : "gtpu_udp.dport = 2152"
}
@@ -5892,7 +6623,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
},
"right" : {
"type" : "hexstr",
@@ -5910,7 +6641,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 210,
+ "line" : 270,
"column" : 8,
"source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
}
@@ -5929,7 +6660,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 212,
+ "line" : 272,
"column" : 8,
"source_fragment" : "gtpu_udp.checksum = 0"
}
@@ -5944,7 +6675,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 214,
+ "line" : 275,
"column" : 8,
"source_fragment" : "gtpu.setValid()"
}
@@ -5963,7 +6694,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 215,
+ "line" : 276,
"column" : 8,
"source_fragment" : "gtpu.version = 0x01"
}
@@ -5982,7 +6713,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 216,
+ "line" : 277,
"column" : 8,
"source_fragment" : "gtpu.pt = 0x01"
}
@@ -6001,7 +6732,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 217,
+ "line" : 278,
"column" : 8,
"source_fragment" : "gtpu.spare = 0"
}
@@ -6020,7 +6751,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 218,
+ "line" : 279,
"column" : 8,
"source_fragment" : "gtpu.ex_flag = 0"
}
@@ -6039,7 +6770,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 219,
+ "line" : 280,
"column" : 8,
"source_fragment" : "gtpu.seq_flag = 0"
}
@@ -6058,7 +6789,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 220,
+ "line" : 281,
"column" : 8,
"source_fragment" : "gtpu.npdu_flag = 0"
}
@@ -6077,7 +6808,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 221,
+ "line" : 282,
"column" : 8,
"source_fragment" : "gtpu.msgtype = 0xff"
}
@@ -6091,12 +6822,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 222,
+ "line" : 283,
"column" : 8,
"source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
}
@@ -6110,12 +6841,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 223,
+ "line" : 284,
"column" : 8,
"source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
}
@@ -6124,7 +6855,7 @@
},
{
"name" : "FabricEgress.bng_egress.downstream.encap_v4",
- "id" : 98,
+ "id" : 107,
"runtime_data" : [],
"primitives" : [
{
@@ -6141,7 +6872,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 118,
+ "line" : 121,
"column" : 33,
"source_fragment" : "0x8864; ..."
}
@@ -6227,7 +6958,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
+ "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
}
],
"source_info" : {
@@ -6246,7 +6977,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -6312,7 +7043,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 120,
+ "line" : 123,
"column" : 35,
"source_fragment" : "0x0021; ..."
}
@@ -6321,7 +7052,7 @@
},
{
"name" : "FabricEgress.bng_egress.downstream.encap_v6",
- "id" : 99,
+ "id" : 108,
"runtime_data" : [],
"primitives" : [
{
@@ -6338,7 +7069,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 118,
+ "line" : 121,
"column" : 33,
"source_fragment" : "0x8864; ..."
}
@@ -6424,7 +7155,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
+ "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
}
],
"source_info" : {
@@ -6443,7 +7174,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
+ "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
}
],
"source_info" : {
@@ -6509,7 +7240,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 121,
+ "line" : 124,
"column" : 35,
"source_fragment" : "0x0057; ..."
}
@@ -6518,7 +7249,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
- "id" : 100,
+ "id" : 109,
"runtime_data" : [
{
"name" : "max_hop",
@@ -6586,7 +7317,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 157,
+ "line" : 160,
"column" : 36,
"source_fragment" : "4; ..."
}
@@ -7004,7 +7735,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 153,
+ "line" : 156,
"column" : 24,
"source_fragment" : "0x1; ..."
}
@@ -7013,7 +7744,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
- "id" : 101,
+ "id" : 110,
"runtime_data" : [
{
"name" : "switch_id",
@@ -7026,7 +7757,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit31"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit39"]
},
{
"type" : "expression",
@@ -7055,7 +7786,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
},
{
"type" : "runtime_data",
@@ -7073,13 +7804,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
- "id" : 102,
+ "id" : 111,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
- "id" : 103,
+ "id" : 112,
"runtime_data" : [],
"primitives" : [
{
@@ -7153,7 +7884,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -7167,7 +7898,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -7195,7 +7926,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -7209,7 +7940,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -7236,7 +7967,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
- "id" : 104,
+ "id" : 113,
"runtime_data" : [],
"primitives" : [
{
@@ -7278,7 +8009,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -7292,7 +8023,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -7320,7 +8051,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -7334,7 +8065,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -7361,7 +8092,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
- "id" : 105,
+ "id" : 114,
"runtime_data" : [],
"primitives" : [
{
@@ -7469,7 +8200,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -7483,7 +8214,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -7511,7 +8242,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -7525,7 +8256,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -7552,7 +8283,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
- "id" : 106,
+ "id" : 115,
"runtime_data" : [],
"primitives" : [
{
@@ -7639,7 +8370,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -7653,7 +8384,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -7681,7 +8412,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -7695,7 +8426,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -7722,7 +8453,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
- "id" : 107,
+ "id" : 116,
"runtime_data" : [],
"primitives" : [
{
@@ -7875,7 +8606,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -7889,7 +8620,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -7917,7 +8648,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -7931,7 +8662,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -7958,7 +8689,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
- "id" : 108,
+ "id" : 117,
"runtime_data" : [],
"primitives" : [
{
@@ -8079,7 +8810,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -8093,7 +8824,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -8121,7 +8852,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -8135,7 +8866,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -8162,7 +8893,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
- "id" : 109,
+ "id" : 118,
"runtime_data" : [],
"primitives" : [
{
@@ -8349,7 +9080,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -8363,7 +9094,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -8391,7 +9122,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -8405,7 +9136,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -8432,7 +9163,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
- "id" : 110,
+ "id" : 119,
"runtime_data" : [],
"primitives" : [
{
@@ -8459,7 +9190,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -8474,7 +9205,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -8488,7 +9219,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -8516,7 +9247,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -8530,7 +9261,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -8557,7 +9288,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
- "id" : 111,
+ "id" : 120,
"runtime_data" : [],
"primitives" : [
{
@@ -8650,7 +9381,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -8665,7 +9396,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -8679,7 +9410,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -8707,7 +9438,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -8721,7 +9452,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -8748,7 +9479,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
- "id" : 112,
+ "id" : 121,
"runtime_data" : [],
"primitives" : [
{
@@ -8809,7 +9540,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -8824,7 +9555,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -8838,7 +9569,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -8866,7 +9597,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -8880,7 +9611,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -8907,7 +9638,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
- "id" : 113,
+ "id" : 122,
"runtime_data" : [],
"primitives" : [
{
@@ -9034,7 +9765,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -9049,7 +9780,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -9063,7 +9794,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -9091,7 +9822,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -9105,7 +9836,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -9132,7 +9863,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
- "id" : 114,
+ "id" : 123,
"runtime_data" : [],
"primitives" : [
{
@@ -9238,7 +9969,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -9253,7 +9984,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -9267,7 +9998,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -9295,7 +10026,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -9309,7 +10040,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -9336,7 +10067,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
- "id" : 115,
+ "id" : 124,
"runtime_data" : [],
"primitives" : [
{
@@ -9508,7 +10239,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -9523,7 +10254,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -9537,7 +10268,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -9565,7 +10296,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -9579,7 +10310,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -9606,7 +10337,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
- "id" : 116,
+ "id" : 125,
"runtime_data" : [],
"primitives" : [
{
@@ -9746,7 +10477,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -9761,7 +10492,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -9775,7 +10506,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -9803,7 +10534,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -9817,7 +10548,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -9844,7 +10575,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
- "id" : 117,
+ "id" : 126,
"runtime_data" : [],
"primitives" : [
{
@@ -10050,7 +10781,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id33"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
}
],
"source_info" : {
@@ -10065,7 +10796,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10079,7 +10810,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10107,7 +10838,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10121,7 +10852,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10148,13 +10879,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
- "id" : 118,
+ "id" : 127,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
- "id" : 119,
+ "id" : 128,
"runtime_data" : [],
"primitives" : [
{
@@ -10196,7 +10927,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10210,7 +10941,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10238,7 +10969,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10252,7 +10983,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10279,7 +11010,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
- "id" : 120,
+ "id" : 129,
"runtime_data" : [],
"primitives" : [
{
@@ -10340,7 +11071,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10354,7 +11085,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10382,7 +11113,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10396,7 +11127,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10423,7 +11154,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
- "id" : 121,
+ "id" : 130,
"runtime_data" : [],
"primitives" : [
{
@@ -10518,7 +11249,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10532,7 +11263,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10560,7 +11291,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10574,7 +11305,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10601,7 +11332,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
- "id" : 122,
+ "id" : 131,
"runtime_data" : [],
"primitives" : [
{
@@ -10666,7 +11397,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10680,7 +11411,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10708,7 +11439,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10722,7 +11453,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10749,7 +11480,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
- "id" : 123,
+ "id" : 132,
"runtime_data" : [],
"primitives" : [
{
@@ -10848,7 +11579,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -10862,7 +11593,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -10890,7 +11621,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -10904,7 +11635,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -10931,7 +11662,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
- "id" : 124,
+ "id" : 133,
"runtime_data" : [],
"primitives" : [
{
@@ -11049,7 +11780,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11063,7 +11794,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -11091,7 +11822,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -11105,7 +11836,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -11132,7 +11863,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
- "id" : 125,
+ "id" : 134,
"runtime_data" : [],
"primitives" : [
{
@@ -11284,7 +12015,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11298,7 +12029,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -11326,7 +12057,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -11340,7 +12071,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -11367,7 +12098,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
- "id" : 126,
+ "id" : 135,
"runtime_data" : [],
"primitives" : [
{
@@ -11409,7 +12140,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11423,7 +12154,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -11451,7 +12182,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -11465,7 +12196,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -11492,7 +12223,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
- "id" : 127,
+ "id" : 136,
"runtime_data" : [],
"primitives" : [
{
@@ -11568,7 +12299,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11582,7 +12313,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -11610,7 +12341,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -11624,7 +12355,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -11651,7 +12382,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
- "id" : 128,
+ "id" : 137,
"runtime_data" : [],
"primitives" : [
{
@@ -11746,7 +12477,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11760,7 +12491,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -11788,7 +12519,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -11802,7 +12533,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -11829,7 +12560,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
- "id" : 129,
+ "id" : 138,
"runtime_data" : [],
"primitives" : [
{
@@ -11958,7 +12689,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -11972,7 +12703,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -12000,7 +12731,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -12014,7 +12745,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -12041,7 +12772,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
- "id" : 130,
+ "id" : 139,
"runtime_data" : [],
"primitives" : [
{
@@ -12140,7 +12871,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -12154,7 +12885,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -12182,7 +12913,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -12196,7 +12927,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -12223,7 +12954,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
- "id" : 131,
+ "id" : 140,
"runtime_data" : [],
"primitives" : [
{
@@ -12356,7 +13087,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -12370,7 +13101,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -12398,7 +13129,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -12412,7 +13143,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -12439,7 +13170,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
- "id" : 132,
+ "id" : 141,
"runtime_data" : [],
"primitives" : [
{
@@ -12591,7 +13322,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -12605,7 +13336,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -12633,7 +13364,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -12647,7 +13378,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -12674,7 +13405,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
- "id" : 133,
+ "id" : 142,
"runtime_data" : [],
"primitives" : [
{
@@ -12860,7 +13591,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
{
"type" : "expression",
@@ -12874,7 +13605,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
},
"right" : {
"type" : "hexstr",
@@ -12902,7 +13633,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
{
"type" : "expression",
@@ -12916,7 +13647,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
},
"right" : {
"type" : "hexstr",
@@ -12943,7 +13674,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
- "id" : 134,
+ "id" : 143,
"runtime_data" : [
{
"name" : "src_mac",
@@ -13034,7 +13765,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 114,
+ "line" : 117,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -13262,7 +13993,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 129,
"column" : 25,
"source_fragment" : "17; ..."
}
@@ -13448,7 +14179,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 163,
+ "line" : 166,
"column" : 31,
"source_fragment" : "0; ..."
}
@@ -13543,7 +14274,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 167,
+ "line" : 170,
"column" : 21,
"source_fragment" : "1; ..."
}
@@ -13590,7 +14321,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
- "id" : 135,
+ "id" : 144,
"runtime_data" : [],
"primitives" : [
{
@@ -13635,7 +14366,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
- "id" : 136,
+ "id" : 145,
"runtime_data" : [],
"primitives" : [
{
@@ -13966,7 +14697,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 137,
+ "id" : 146,
"runtime_data" : [],
"primitives" : [
{
@@ -14007,7 +14738,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 138,
+ "id" : 147,
"runtime_data" : [],
"primitives" : [
{
@@ -14115,7 +14846,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -14124,7 +14855,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 139,
+ "id" : 148,
"runtime_data" : [],
"primitives" : [
{
@@ -14194,7 +14925,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -14222,7 +14953,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 140,
+ "id" : 149,
"runtime_data" : [],
"primitives" : [
{
@@ -14292,7 +15023,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -14320,7 +15051,7 @@
},
{
"name" : "FabricEgress.egress_next.push_inner_vlan",
- "id" : 141,
+ "id" : 150,
"runtime_data" : [],
"primitives" : [
{
@@ -14409,7 +15140,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -14428,7 +15159,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -14437,7 +15168,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 142,
+ "id" : 151,
"runtime_data" : [],
"primitives" : [
{
@@ -14458,8 +15189,8 @@
]
},
{
- "name" : "act_34",
- "id" : 143,
+ "name" : "act_37",
+ "id" : 152,
"runtime_data" : [],
"primitives" : [
{
@@ -14475,8 +15206,8 @@
]
},
{
- "name" : "act_35",
- "id" : 144,
+ "name" : "act_38",
+ "id" : 153,
"runtime_data" : [],
"primitives" : [
{
@@ -14526,8 +15257,8 @@
]
},
{
- "name" : "act_36",
- "id" : 145,
+ "name" : "act_39",
+ "id" : 154,
"runtime_data" : [],
"primitives" : [
{
@@ -14548,8 +15279,8 @@
]
},
{
- "name" : "act_37",
- "id" : 146,
+ "name" : "act_40",
+ "id" : 155,
"runtime_data" : [],
"primitives" : [
{
@@ -14578,8 +15309,8 @@
]
},
{
- "name" : "act_38",
- "id" : 147,
+ "name" : "act_41",
+ "id" : 156,
"runtime_data" : [],
"primitives" : [
{
@@ -14608,8 +15339,8 @@
]
},
{
- "name" : "act_39",
- "id" : 148,
+ "name" : "act_42",
+ "id" : 157,
"runtime_data" : [],
"primitives" : [
{
@@ -14630,8 +15361,8 @@
]
},
{
- "name" : "act_40",
- "id" : 149,
+ "name" : "act_43",
+ "id" : 158,
"runtime_data" : [],
"primitives" : [
{
@@ -14652,8 +15383,8 @@
]
},
{
- "name" : "act_41",
- "id" : 150,
+ "name" : "act_44",
+ "id" : 159,
"runtime_data" : [],
"primitives" : [
{
@@ -14701,8 +15432,8 @@
]
},
{
- "name" : "act_42",
- "id" : 151,
+ "name" : "act_45",
+ "id" : 160,
"runtime_data" : [],
"primitives" : [
{
@@ -14723,8 +15454,8 @@
]
},
{
- "name" : "act_43",
- "id" : 152,
+ "name" : "act_46",
+ "id" : 161,
"runtime_data" : [],
"primitives" : [
{
@@ -14772,8 +15503,8 @@
]
},
{
- "name" : "act_44",
- "id" : 153,
+ "name" : "act_47",
+ "id" : 162,
"runtime_data" : [],
"primitives" : [
{
@@ -14794,8 +15525,8 @@
]
},
{
- "name" : "act_45",
- "id" : 154,
+ "name" : "act_48",
+ "id" : 163,
"runtime_data" : [],
"primitives" : [
{
@@ -14843,8 +15574,34 @@
]
},
{
- "name" : "act_46",
- "id" : 155,
+ "name" : "act_49",
+ "id" : 164,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricEgress.spgw_egress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_50",
+ "id" : 165,
"runtime_data" : [],
"primitives" : [
{
@@ -14873,8 +15630,8 @@
]
},
{
- "name" : "act_47",
- "id" : 156,
+ "name" : "act_51",
+ "id" : 166,
"runtime_data" : [],
"primitives" : [
{
@@ -14909,8 +15666,8 @@
]
},
{
- "name" : "act_48",
- "id" : 157,
+ "name" : "act_52",
+ "id" : 167,
"runtime_data" : [],
"primitives" : [
{
@@ -14936,7 +15693,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
}
}
},
@@ -14958,8 +15715,8 @@
]
},
{
- "name" : "act_49",
- "id" : 158,
+ "name" : "act_53",
+ "id" : 168,
"runtime_data" : [],
"primitives" : [
{
@@ -15007,8 +15764,8 @@
]
},
{
- "name" : "act_50",
- "id" : 159,
+ "name" : "act_54",
+ "id" : 169,
"runtime_data" : [],
"primitives" : [
{
@@ -15034,7 +15791,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes35"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
}
}
},
@@ -15056,8 +15813,8 @@
]
},
{
- "name" : "act_51",
- "id" : 160,
+ "name" : "act_55",
+ "id" : 170,
"runtime_data" : [],
"primitives" : [
{
@@ -15083,7 +15840,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words34"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
}
}
},
@@ -15133,14 +15890,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
+ "action_ids" : [63],
"actions" : ["act_0"],
"base_default_next" : "node_3",
"next_tables" : {
"act_0" : "node_3"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15151,7 +15908,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
},
@@ -15162,14 +15919,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56],
+ "action_ids" : [62],
"actions" : ["act"],
"base_default_next" : "node_5",
"next_tables" : {
"act" : "node_5"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15180,7 +15937,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
},
@@ -15191,14 +15948,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [60],
+ "action_ids" : [66],
"actions" : ["act_3"],
"base_default_next" : "node_7",
"next_tables" : {
"act_3" : "node_7"
},
"default_entry" : {
- "action_id" : 60,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15209,7 +15966,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "="
},
@@ -15220,14 +15977,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
+ "action_ids" : [64],
"actions" : ["act_1"],
"base_default_next" : "node_10",
"next_tables" : {
"act_1" : "node_10"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15238,7 +15995,7 @@
"id" : 4,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
},
@@ -15249,14 +16006,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59],
+ "action_ids" : [65],
"actions" : ["act_2"],
"base_default_next" : "node_10",
"next_tables" : {
"act_2" : "node_10"
},
"default_entry" : {
- "action_id" : 59,
+ "action_id" : 65,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15278,14 +16035,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
+ "action_ids" : [67],
"actions" : ["act_4"],
"base_default_next" : "node_12",
"next_tables" : {
"act_4" : "node_12"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15307,14 +16064,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [62],
+ "action_ids" : [68],
"actions" : ["act_5"],
"base_default_next" : "node_14",
"next_tables" : {
"act_5" : "node_14"
},
"default_entry" : {
- "action_id" : 62,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15336,14 +16093,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [63],
+ "action_ids" : [69],
"actions" : ["act_6"],
"base_default_next" : "node_16",
"next_tables" : {
"act_6" : "node_16"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 69,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15365,14 +16122,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
+ "action_ids" : [70],
"actions" : ["act_7"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
"act_7" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 70,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15419,7 +16176,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31, 32, 33],
+ "action_ids" : [37, 38, 39],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -15428,7 +16185,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 31,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15475,14 +16232,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34],
+ "action_ids" : [40],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "tbl_act_8",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "tbl_act_8"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 40,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -15498,27 +16255,27 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [73],
+ "action_ids" : [79],
"actions" : ["act_16"],
"base_default_next" : "node_21",
"next_tables" : {
"act_16" : "node_21"
},
"default_entry" : {
- "action_id" : 73,
+ "action_id" : 79,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
+ "name" : "FabricIngress.spgw_ingress.uplink_filter_table",
"id" : 12,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 83,
+ "line" : 84,
"column" : 10,
- "source_fragment" : "s1u_filter_table"
+ "source_fragment" : "uplink_filter_table"
},
"key" : [
{
@@ -15558,14 +16315,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [65],
+ "action_ids" : [71],
"actions" : ["act_8"],
"base_default_next" : "node_25",
"next_tables" : {
"act_8" : "node_25"
},
"default_entry" : {
- "action_id" : 65,
+ "action_id" : 71,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15581,14 +16338,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [66],
+ "action_ids" : [72],
"actions" : ["act_9"],
"base_default_next" : "node_25",
"next_tables" : {
"act_9" : "node_25"
},
"default_entry" : {
- "action_id" : 66,
+ "action_id" : 72,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15599,7 +16356,7 @@
"id" : 15,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -15610,14 +16367,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [67],
+ "action_ids" : [73],
"actions" : ["act_10"],
"base_default_next" : "tbl_act_12",
"next_tables" : {
"act_10" : "tbl_act_12"
},
"default_entry" : {
- "action_id" : 67,
+ "action_id" : 73,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15628,7 +16385,7 @@
"id" : 16,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 151,
+ "line" : 189,
"column" : 39,
"source_fragment" : "="
},
@@ -15639,14 +16396,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [68],
+ "action_ids" : [74],
"actions" : ["act_11"],
"base_default_next" : "tbl_spgw_ingress_gtpu_decap",
"next_tables" : {
"act_11" : "tbl_spgw_ingress_gtpu_decap"
},
"default_entry" : {
- "action_id" : 68,
+ "action_id" : 74,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15657,7 +16414,7 @@
"id" : 17,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 152,
+ "line" : 190,
"column" : 12,
"source_fragment" : "gtpu_decap()"
},
@@ -15668,44 +16425,44 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15],
+ "action_ids" : [17],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_35",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_35"
},
"default_entry" : {
- "action_id" : 15,
+ "action_id" : 17,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
+ "name" : "FabricIngress.spgw_ingress.downlink_filter_table",
"id" : 18,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 70,
+ "line" : 73,
"column" : 10,
- "source_fragment" : "dl_sess_lookup"
+ "source_fragment" : "downlink_filter_table"
},
"key" : [
{
- "match_type" : "exact",
- "name" : "ipv4_dst",
+ "match_type" : "lpm",
+ "name" : "ipv4_prefix",
"target" : ["ipv4", "dst_addr"],
"mask" : null
}
],
- "match_type" : "exact",
+ "match_type" : "lpm",
"type" : "simple",
"max_size" : 1024,
- "with_counters" : true,
+ "with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16, 0],
- "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
+ "action_ids" : [0],
+ "actions" : ["nop"],
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_act_13",
@@ -15728,14 +16485,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [69],
+ "action_ids" : [75],
"actions" : ["act_12"],
"base_default_next" : "node_32",
"next_tables" : {
"act_12" : "node_32"
},
"default_entry" : {
- "action_id" : 69,
+ "action_id" : 75,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15751,14 +16508,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [70],
+ "action_ids" : [76],
"actions" : ["act_13"],
"base_default_next" : "node_32",
"next_tables" : {
"act_13" : "node_32"
},
"default_entry" : {
- "action_id" : 70,
+ "action_id" : 76,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15769,7 +16526,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 154,
+ "line" : 192,
"column" : 39,
"source_fragment" : "="
},
@@ -15780,14 +16537,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [71],
+ "action_ids" : [77],
"actions" : ["act_14"],
"base_default_next" : "node_35",
"next_tables" : {
"act_14" : "node_35"
},
"default_entry" : {
- "action_id" : 71,
+ "action_id" : 77,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15798,7 +16555,7 @@
"id" : 22,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 156,
+ "line" : 194,
"column" : 39,
"source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
},
@@ -15809,25 +16566,313 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [72],
+ "action_ids" : [78],
"actions" : ["act_15"],
"base_default_next" : "node_35",
"next_tables" : {
"act_15" : "node_35"
},
"default_entry" : {
- "action_id" : 72,
+ "action_id" : 78,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_17",
+ "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
"id" : 23,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 111,
+ "column" : 10,
+ "source_fragment" : "uplink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid23"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [19, 16],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_41",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_41",
+ "NoAction" : "node_41"
+ },
+ "default_entry" : {
+ "action_id" : 16,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "id" : 24,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 103,
+ "column" : 10,
+ "source_fragment" : "downlink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [18, 15],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_41",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_41",
+ "NoAction" : "node_41"
+ },
+ "default_entry" : {
+ "action_id" : 15,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "tbl_act_17",
+ "id" : 25,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [80],
+ "actions" : ["act_17"],
+ "base_default_next" : "node_41",
+ "next_tables" : {
+ "act_17" : "node_41"
+ },
+ "default_entry" : {
+ "action_id" : 80,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "id" : 26,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 123,
+ "column" : 10,
+ "source_fragment" : "flexible_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "ternary",
+ "name" : "spgw_direction",
+ "target" : ["scalars", "fabric_metadata_t._spgw_direction21"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid23"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_src",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_dst",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ip_proto",
+ "target" : ["ipv4", "protocol"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_sport",
+ "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_dport",
+ "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "ternary",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [20],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+ "base_default_next" : "tbl_act_18",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_18"
+ },
+ "default_entry" : {
+ "action_id" : 20,
+ "action_const" : true,
+ "action_data" : ["0x0", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_18",
+ "id" : 27,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [81],
+ "actions" : ["act_18"],
+ "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+ "next_tables" : {
+ "act_18" : "FabricIngress.spgw_ingress.far_lookup"
+ },
+ "default_entry" : {
+ "action_id" : 81,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.far_lookup",
+ "id" : 28,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 168,
+ "column" : 10,
+ "source_fragment" : "far_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "far_id",
+ "target" : ["scalars", "fabric_metadata_t._spgw_far_id27"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [21, 22],
+ "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
+ "base_default_next" : "node_46",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_46",
+ "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_46"
+ },
+ "default_entry" : {
+ "action_id" : 21,
+ "action_const" : true,
+ "action_data" : ["0x1", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_19",
+ "id" : 29,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [82],
+ "actions" : ["act_19"],
+ "base_default_next" : "tbl_act_20",
+ "next_tables" : {
+ "act_19" : "tbl_act_20"
+ },
+ "default_entry" : {
+ "action_id" : 82,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_20",
+ "id" : 30,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 232,
"column" : 34,
"source_fragment" : "="
},
@@ -15838,14 +16883,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [74],
- "actions" : ["act_17"],
- "base_default_next" : "node_37",
+ "action_ids" : [83],
+ "actions" : ["act_20"],
+ "base_default_next" : "node_49",
"next_tables" : {
- "act_17" : "node_37"
+ "act_20" : "node_49"
},
"default_entry" : {
- "action_id" : 74,
+ "action_id" : 83,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -15853,7 +16898,7 @@
},
{
"name" : "FabricIngress.forwarding.bridging",
- "id" : 24,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 46,
@@ -15880,7 +16925,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35, 6],
+ "action_ids" : [41, 6],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -15896,7 +16941,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 25,
+ "id" : 32,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 71,
@@ -15917,7 +16962,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36, 7],
+ "action_ids" : [42, 7],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -15933,7 +16978,7 @@
},
{
"name" : "FabricIngress.forwarding.routing_v4",
- "id" : 26,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 108,
@@ -15944,7 +16989,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"],
"mask" : null
}
],
@@ -15954,7 +16999,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37, 38, 8],
+ "action_ids" : [43, 44, 8],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -15971,7 +17016,7 @@
},
{
"name" : "FabricIngress.forwarding.routing_v6",
- "id" : 27,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 135,
@@ -15992,7 +17037,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39, 9],
+ "action_ids" : [45, 9],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -16008,7 +17053,7 @@
},
{
"name" : "FabricIngress.acl.acl",
- "id" : 28,
+ "id" : 35,
"source_info" : {
"filename" : "include/control/acl.p4",
"line" : 60,
@@ -16095,18 +17140,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40, 41, 42, 43, 44],
+ "action_ids" : [46, 47, 48, 49, 50],
"actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
- "base_default_next" : "node_47",
+ "base_default_next" : "node_59",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_47",
- "FabricIngress.acl.punt_to_cpu" : "node_47",
- "FabricIngress.acl.set_clone_session_id" : "node_47",
- "FabricIngress.acl.drop" : "node_47",
- "FabricIngress.acl.nop_acl" : "node_47"
+ "FabricIngress.acl.set_next_id_acl" : "node_59",
+ "FabricIngress.acl.punt_to_cpu" : "node_59",
+ "FabricIngress.acl.set_clone_session_id" : "node_59",
+ "FabricIngress.acl.drop" : "node_59",
+ "FabricIngress.acl.nop_acl" : "node_59"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16114,7 +17159,7 @@
},
{
"name" : "FabricIngress.next.xconnect",
- "id" : 29,
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 119,
@@ -16141,7 +17186,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47, 48, 11],
+ "action_ids" : [53, 54, 11],
"actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -16158,7 +17203,7 @@
},
{
"name" : "FabricIngress.next.simple",
- "id" : 30,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 158,
@@ -16179,7 +17224,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49, 50, 51, 12],
+ "action_ids" : [55, 56, 57, 12],
"actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
@@ -16197,7 +17242,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 31,
+ "id" : 38,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 202,
@@ -16219,7 +17264,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52, 53, 54, 13],
+ "action_ids" : [58, 59, 60, 13],
"actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
@@ -16231,7 +17276,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 32,
+ "id" : 39,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 236,
@@ -16252,7 +17297,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55, 14],
+ "action_ids" : [61, 14],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
"base_default_next" : "FabricIngress.next.next_vlan",
"next_tables" : {
@@ -16268,7 +17313,7 @@
},
{
"name" : "FabricIngress.next.next_vlan",
- "id" : 33,
+ "id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 86,
@@ -16289,13 +17334,13 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45, 46, 10],
+ "action_ids" : [51, 52, 10],
"actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
- "base_default_next" : "node_53",
+ "base_default_next" : "node_65",
"next_tables" : {
- "FabricIngress.next.set_vlan" : "node_53",
- "FabricIngress.next.set_double_vlan" : "node_53",
- "nop" : "node_53"
+ "FabricIngress.next.set_vlan" : "node_65",
+ "FabricIngress.next.set_double_vlan" : "node_65",
+ "nop" : "node_65"
},
"default_entry" : {
"action_id" : 10,
@@ -16305,8 +17350,8 @@
}
},
{
- "name" : "tbl_act_18",
- "id" : 34,
+ "name" : "tbl_act_21",
+ "id" : 41,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -16320,22 +17365,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [75],
- "actions" : ["act_18"],
- "base_default_next" : "node_55",
+ "action_ids" : [84],
+ "actions" : ["act_21"],
+ "base_default_next" : "node_67",
"next_tables" : {
- "act_18" : "node_55"
+ "act_21" : "node_67"
},
"default_entry" : {
- "action_id" : 75,
+ "action_id" : 84,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_19",
- "id" : 35,
+ "name" : "tbl_act_22",
+ "id" : 42,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -16349,14 +17394,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [76],
- "actions" : ["act_19"],
+ "action_ids" : [85],
+ "actions" : ["act_22"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
"next_tables" : {
- "act_19" : "FabricIngress.process_set_source_sink.tb_set_source"
+ "act_22" : "FabricIngress.process_set_source_sink.tb_set_source"
},
"default_entry" : {
- "action_id" : 76,
+ "action_id" : 85,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16364,7 +17409,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.tb_set_source",
- "id" : 36,
+ "id" : 43,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 46,
@@ -16385,7 +17430,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17, 2],
+ "action_ids" : [23, 2],
"actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
"next_tables" : {
@@ -16401,7 +17446,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.tb_set_sink",
- "id" : 37,
+ "id" : 44,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 67,
@@ -16422,12 +17467,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [18, 3],
+ "action_ids" : [24, 3],
"actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
- "base_default_next" : "node_59",
+ "base_default_next" : "node_71",
"next_tables" : {
- "FabricIngress.process_set_source_sink.int_set_sink" : "node_59",
- "nop" : "node_59"
+ "FabricIngress.process_set_source_sink.int_set_sink" : "node_71",
+ "nop" : "node_71"
},
"default_entry" : {
"action_id" : 3,
@@ -16437,8 +17482,8 @@
}
},
{
- "name" : "tbl_act_20",
- "id" : 38,
+ "name" : "tbl_act_23",
+ "id" : 45,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 89,
@@ -16452,14 +17497,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [77],
- "actions" : ["act_20"],
+ "action_ids" : [86],
+ "actions" : ["act_23"],
"base_default_next" : "FabricIngress.bng_ingress.t_line_map",
"next_tables" : {
- "act_20" : "FabricIngress.bng_ingress.t_line_map"
+ "act_23" : "FabricIngress.bng_ingress.t_line_map"
},
"default_entry" : {
- "action_id" : 77,
+ "action_id" : 86,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16467,7 +17512,7 @@
},
{
"name" : "FabricIngress.bng_ingress.t_line_map",
- "id" : 39,
+ "id" : 46,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 323,
@@ -16478,13 +17523,13 @@
{
"match_type" : "exact",
"name" : "s_tag",
- "target" : ["scalars", "fabric_metadata_t._bng_s_tag28"],
+ "target" : ["scalars", "fabric_metadata_t._bng_s_tag36"],
"mask" : null
},
{
"match_type" : "exact",
"name" : "c_tag",
- "target" : ["scalars", "fabric_metadata_t._bng_c_tag29"],
+ "target" : ["scalars", "fabric_metadata_t._bng_c_tag37"],
"mask" : null
}
],
@@ -16494,22 +17539,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30],
+ "action_ids" : [36],
"actions" : ["FabricIngress.bng_ingress.set_line"],
- "base_default_next" : "node_62",
+ "base_default_next" : "node_74",
"next_tables" : {
- "FabricIngress.bng_ingress.set_line" : "node_62"
+ "FabricIngress.bng_ingress.set_line" : "node_74"
},
"default_entry" : {
- "action_id" : 30,
+ "action_id" : 36,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_21",
- "id" : 40,
+ "name" : "tbl_act_24",
+ "id" : 47,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 342,
@@ -16523,14 +17568,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [80],
- "actions" : ["act_23"],
+ "action_ids" : [89],
+ "actions" : ["act_26"],
"base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
"next_tables" : {
- "act_23" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+ "act_26" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
},
"default_entry" : {
- "action_id" : 80,
+ "action_id" : 89,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16538,7 +17583,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
- "id" : 41,
+ "id" : 48,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 51,
@@ -16565,12 +17610,12 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 4],
+ "action_ids" : [25, 4],
"actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_22",
- "__MISS__" : "tbl_act_23"
+ "__HIT__" : "tbl_act_25",
+ "__MISS__" : "tbl_act_26"
},
"default_entry" : {
"action_id" : 4,
@@ -16580,8 +17625,8 @@
}
},
{
- "name" : "tbl_act_22",
- "id" : 42,
+ "name" : "tbl_act_25",
+ "id" : 49,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -16589,22 +17634,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [78],
- "actions" : ["act_21"],
- "base_default_next" : "node_67",
+ "action_ids" : [87],
+ "actions" : ["act_24"],
+ "base_default_next" : "node_79",
"next_tables" : {
- "act_21" : "node_67"
+ "act_24" : "node_79"
},
"default_entry" : {
- "action_id" : 78,
+ "action_id" : 87,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_23",
- "id" : 43,
+ "name" : "tbl_act_26",
+ "id" : 50,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -16612,22 +17657,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [79],
- "actions" : ["act_22"],
- "base_default_next" : "node_67",
+ "action_ids" : [88],
+ "actions" : ["act_25"],
+ "base_default_next" : "node_79",
"next_tables" : {
- "act_22" : "node_67"
+ "act_25" : "node_79"
},
"default_entry" : {
- "action_id" : 79,
+ "action_id" : 88,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_24",
- "id" : 44,
+ "name" : "tbl_act_27",
+ "id" : 51,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 126,
@@ -16641,14 +17686,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [81],
- "actions" : ["act_24"],
- "base_default_next" : "node_69",
+ "action_ids" : [90],
+ "actions" : ["act_27"],
+ "base_default_next" : "node_81",
"next_tables" : {
- "act_24" : "node_69"
+ "act_27" : "node_81"
},
"default_entry" : {
- "action_id" : 81,
+ "action_id" : 90,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16656,7 +17701,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
- "id" : 45,
+ "id" : 52,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 87,
@@ -16667,7 +17712,7 @@
{
"match_type" : "exact",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
"mask" : null
},
{
@@ -16689,23 +17734,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [22, 20],
+ "action_ids" : [28, 26],
"actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
"base_default_next" : null,
"next_tables" : {
- "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_25",
+ "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_28",
"FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
},
"default_entry" : {
- "action_id" : 20,
+ "action_id" : 26,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_25",
- "id" : 46,
+ "name" : "tbl_act_28",
+ "id" : 53,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 131,
@@ -16719,22 +17764,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [82],
- "actions" : ["act_25"],
+ "action_ids" : [91],
+ "actions" : ["act_28"],
"base_default_next" : null,
"next_tables" : {
- "act_25" : null
+ "act_28" : null
},
"default_entry" : {
- "action_id" : 82,
+ "action_id" : 91,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_26",
- "id" : 47,
+ "name" : "tbl_act_29",
+ "id" : 54,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 112,
@@ -16748,14 +17793,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [84],
- "actions" : ["act_27"],
+ "action_ids" : [93],
+ "actions" : ["act_30"],
"base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
"next_tables" : {
- "act_27" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+ "act_30" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
},
"default_entry" : {
- "action_id" : 84,
+ "action_id" : 93,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16763,7 +17808,7 @@
},
{
"name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
- "id" : 48,
+ "id" : 55,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 109,
@@ -16774,7 +17819,7 @@
{
"match_type" : "exact",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
"mask" : null
},
{
@@ -16796,23 +17841,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [23, 21],
+ "action_ids" : [29, 27],
"actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
"base_default_next" : null,
"next_tables" : {
- "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_27",
+ "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_30",
"FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
},
"default_entry" : {
- "action_id" : 21,
+ "action_id" : 27,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_27",
- "id" : 49,
+ "name" : "tbl_act_30",
+ "id" : 56,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 139,
@@ -16826,14 +17871,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [83],
- "actions" : ["act_26"],
+ "action_ids" : [92],
+ "actions" : ["act_29"],
"base_default_next" : null,
"next_tables" : {
- "act_26" : null
+ "act_29" : null
},
"default_entry" : {
- "action_id" : 83,
+ "action_id" : 92,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16841,7 +17886,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
- "id" : 50,
+ "id" : 57,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 169,
@@ -16852,7 +17897,7 @@
{
"match_type" : "exact",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
"mask" : null
}
],
@@ -16862,12 +17907,12 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [5, 24, 25],
+ "action_ids" : [5, 30, 31],
"actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_28",
- "__MISS__" : "tbl_act_29"
+ "__HIT__" : "tbl_act_31",
+ "__MISS__" : "tbl_act_32"
},
"default_entry" : {
"action_id" : 5,
@@ -16877,8 +17922,8 @@
}
},
{
- "name" : "tbl_act_28",
- "id" : 51,
+ "name" : "tbl_act_31",
+ "id" : 58,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -16886,22 +17931,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [85],
- "actions" : ["act_28"],
- "base_default_next" : "node_80",
+ "action_ids" : [94],
+ "actions" : ["act_31"],
+ "base_default_next" : "node_92",
"next_tables" : {
- "act_28" : "node_80"
+ "act_31" : "node_92"
},
"default_entry" : {
- "action_id" : 85,
+ "action_id" : 94,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_29",
- "id" : 52,
+ "name" : "tbl_act_32",
+ "id" : 59,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -16909,14 +17954,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [86],
- "actions" : ["act_29"],
- "base_default_next" : "node_80",
+ "action_ids" : [95],
+ "actions" : ["act_32"],
+ "base_default_next" : "node_92",
"next_tables" : {
- "act_29" : "node_80"
+ "act_32" : "node_92"
},
"default_entry" : {
- "action_id" : 86,
+ "action_id" : 95,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -16924,7 +17969,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
- "id" : 53,
+ "id" : 60,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 194,
@@ -16935,7 +17980,7 @@
{
"match_type" : "ternary",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
"mask" : null
},
{
@@ -16963,23 +18008,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [26, 28],
+ "action_ids" : [32, 34],
"actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
"base_default_next" : null,
"next_tables" : {
- "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_30",
- "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_31"
+ "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_33",
+ "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_34"
},
"default_entry" : {
- "action_id" : 28,
+ "action_id" : 34,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_30",
- "id" : 54,
+ "name" : "tbl_act_33",
+ "id" : 61,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 238,
@@ -16993,22 +18038,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [87],
- "actions" : ["act_30"],
+ "action_ids" : [96],
+ "actions" : ["act_33"],
"base_default_next" : null,
"next_tables" : {
- "act_30" : null
+ "act_33" : null
},
"default_entry" : {
- "action_id" : 87,
+ "action_id" : 96,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_31",
- "id" : 55,
+ "name" : "tbl_act_34",
+ "id" : 62,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 241,
@@ -17022,14 +18067,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [88],
- "actions" : ["act_31"],
+ "action_ids" : [97],
+ "actions" : ["act_34"],
"base_default_next" : null,
"next_tables" : {
- "act_31" : null
+ "act_34" : null
},
"default_entry" : {
- "action_id" : 88,
+ "action_id" : 97,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -17037,7 +18082,7 @@
},
{
"name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
- "id" : 56,
+ "id" : 63,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 210,
@@ -17048,7 +18093,7 @@
{
"match_type" : "ternary",
"name" : "line_id",
- "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
+ "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
"mask" : null
},
{
@@ -17070,23 +18115,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 29],
+ "action_ids" : [33, 35],
"actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
"base_default_next" : null,
"next_tables" : {
- "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_32",
- "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_33"
+ "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_35",
+ "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_36"
},
"default_entry" : {
- "action_id" : 29,
+ "action_id" : 35,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_32",
- "id" : 57,
+ "name" : "tbl_act_35",
+ "id" : 64,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 250,
@@ -17100,22 +18145,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [89],
- "actions" : ["act_32"],
+ "action_ids" : [98],
+ "actions" : ["act_35"],
"base_default_next" : null,
"next_tables" : {
- "act_32" : null
+ "act_35" : null
},
"default_entry" : {
- "action_id" : 89,
+ "action_id" : 98,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_33",
- "id" : 58,
+ "name" : "tbl_act_36",
+ "id" : 65,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 253,
@@ -17129,14 +18174,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [90],
- "actions" : ["act_33"],
+ "action_ids" : [99],
+ "actions" : ["act_36"],
"base_default_next" : null,
"next_tables" : {
- "act_33" : null
+ "act_36" : null
},
"default_entry" : {
- "action_id" : 90,
+ "action_id" : 99,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -17159,11 +18204,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
},
{
"type" : "field",
@@ -17187,7 +18232,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 12,
"source_fragment" : "! is_gtpu_encapped"
},
@@ -17241,7 +18286,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 34,
+ "line" : 38,
"column" : 12,
"source_fragment" : "inner_udp.isValid()"
},
@@ -17363,7 +18408,7 @@
"id" : 7,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 144,
+ "line" : 181,
"column" : 12,
"source_fragment" : "gtpu.isValid()"
},
@@ -17378,17 +18423,17 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
- "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
+ "true_next" : "FabricIngress.spgw_ingress.uplink_filter_table",
+ "false_next" : "FabricIngress.spgw_ingress.downlink_filter_table"
},
{
"name" : "node_25",
"id" : 8,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 148,
+ "line" : 185,
"column" : 16,
- "source_fragment" : "!s1u_filter_table.apply().hit"
+ "source_fragment" : "!uplink_filter_table.apply().hit"
},
"expression" : {
"type" : "expression",
@@ -17449,13 +18494,155 @@
}
}
},
- "true_next" : "tbl_act_17",
- "false_next" : "node_37"
+ "true_next" : "node_36",
+ "false_next" : "node_41"
},
{
- "name" : "node_37",
+ "name" : "node_36",
"id" : 11,
"source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 201,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_UPLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+ "false_next" : "node_38"
+ },
+ {
+ "name" : "node_38",
+ "id" : 12,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 203,
+ "column" : 19,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x02"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "false_next" : "tbl_act_17"
+ },
+ {
+ "name" : "node_41",
+ "id" : 13,
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "not",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "node_42",
+ "false_next" : "node_49"
+ },
+ {
+ "name" : "node_42",
+ "id" : 14,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 209,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.pdr_hit == false"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : false
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "false_next" : "tbl_act_18"
+ },
+ {
+ "name" : "node_46",
+ "id" : 15,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 220,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.far_dropped == true"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped29"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ },
+ "true_next" : "tbl_act_19",
+ "false_next" : "tbl_act_20"
+ },
+ {
+ "name" : "node_49",
+ "id" : 16,
+ "source_info" : {
"filename" : "fabric.p4",
"line" : 71,
"column" : 12,
@@ -17482,12 +18669,12 @@
}
}
},
- "true_next" : "node_38",
+ "true_next" : "node_50",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_38",
- "id" : 12,
+ "name" : "node_50",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 150,
@@ -17509,11 +18696,11 @@
}
},
"true_next" : "FabricIngress.forwarding.bridging",
- "false_next" : "node_40"
+ "false_next" : "node_52"
},
{
- "name" : "node_40",
- "id" : 13,
+ "name" : "node_52",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 151,
@@ -17535,11 +18722,11 @@
}
},
"true_next" : "FabricIngress.forwarding.mpls",
- "false_next" : "node_42"
+ "false_next" : "node_54"
},
{
- "name" : "node_42",
- "id" : 14,
+ "name" : "node_54",
+ "id" : 19,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 152,
@@ -17561,11 +18748,11 @@
}
},
"true_next" : "FabricIngress.forwarding.routing_v4",
- "false_next" : "node_44"
+ "false_next" : "node_56"
},
{
- "name" : "node_44",
- "id" : 15,
+ "name" : "node_56",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 154,
@@ -17590,8 +18777,8 @@
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_47",
- "id" : 16,
+ "name" : "node_59",
+ "id" : 21,
"source_info" : {
"filename" : "fabric.p4",
"line" : 75,
@@ -17623,8 +18810,8 @@
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_53",
- "id" : 17,
+ "name" : "node_65",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -17645,12 +18832,12 @@
}
}
},
- "true_next" : "tbl_act_18",
- "false_next" : "node_55"
+ "true_next" : "tbl_act_21",
+ "false_next" : "node_67"
},
{
- "name" : "node_55",
- "id" : 18,
+ "name" : "node_67",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -17671,12 +18858,12 @@
}
}
},
- "true_next" : "tbl_act_19",
+ "true_next" : "tbl_act_22",
"false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
},
{
- "name" : "node_59",
- "id" : 19,
+ "name" : "node_71",
+ "id" : 24,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 86,
@@ -17694,7 +18881,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_sink32"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_sink40"]
}
}
},
@@ -17704,12 +18891,12 @@
}
}
},
- "true_next" : "tbl_act_20",
+ "true_next" : "tbl_act_23",
"false_next" : "FabricIngress.bng_ingress.t_line_map"
},
{
- "name" : "node_62",
- "id" : 20,
+ "name" : "node_74",
+ "id" : 25,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 341,
@@ -17727,12 +18914,12 @@
}
}
},
- "true_next" : "tbl_act_21",
+ "true_next" : "tbl_act_24",
"false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
},
{
- "name" : "node_67",
- "id" : 21,
+ "name" : "node_79",
+ "id" : 26,
"expression" : {
"type" : "expression",
"value" : {
@@ -17744,12 +18931,12 @@
}
}
},
- "true_next" : "tbl_act_24",
- "false_next" : "node_69"
+ "true_next" : "tbl_act_27",
+ "false_next" : "node_81"
},
{
- "name" : "node_69",
- "id" : 22,
+ "name" : "node_81",
+ "id" : 27,
"expression" : {
"type" : "expression",
"value" : {
@@ -17769,11 +18956,11 @@
}
},
"false_next" : null,
- "true_next" : "node_70"
+ "true_next" : "node_82"
},
{
- "name" : "node_70",
- "id" : 23,
+ "name" : "node_82",
+ "id" : 28,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 128,
@@ -17792,11 +18979,11 @@
}
},
"true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
- "false_next" : "node_73"
+ "false_next" : "node_85"
},
{
- "name" : "node_73",
- "id" : 24,
+ "name" : "node_85",
+ "id" : 29,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 136,
@@ -17815,11 +19002,11 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_26"
+ "true_next" : "tbl_act_29"
},
{
- "name" : "node_80",
- "id" : 25,
+ "name" : "node_92",
+ "id" : 30,
"expression" : {
"type" : "expression",
"value" : {
@@ -17832,11 +19019,11 @@
}
},
"false_next" : null,
- "true_next" : "node_81"
+ "true_next" : "node_93"
},
{
- "name" : "node_81",
- "id" : 26,
+ "name" : "node_93",
+ "id" : 31,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 235,
@@ -17855,11 +19042,11 @@
}
},
"true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
- "false_next" : "node_85"
+ "false_next" : "node_97"
},
{
- "name" : "node_85",
- "id" : 27,
+ "name" : "node_97",
+ "id" : 32,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 247,
@@ -17891,11 +19078,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_91",
+ "init_table" : "node_103",
"tables" : [
{
- "name" : "tbl_act_34",
- "id" : 59,
+ "name" : "tbl_act_37",
+ "id" : 66,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -17909,22 +19096,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [143],
- "actions" : ["act_34"],
- "base_default_next" : "node_93",
+ "action_ids" : [152],
+ "actions" : ["act_37"],
+ "base_default_next" : "node_105",
"next_tables" : {
- "act_34" : "node_93"
+ "act_37" : "node_105"
},
"default_entry" : {
- "action_id" : 143,
+ "action_id" : 152,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_35",
- "id" : 60,
+ "name" : "tbl_act_38",
+ "id" : 67,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -17938,22 +19125,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [144],
- "actions" : ["act_35"],
- "base_default_next" : "node_95",
+ "action_ids" : [153],
+ "actions" : ["act_38"],
+ "base_default_next" : "node_107",
"next_tables" : {
- "act_35" : "node_95"
+ "act_38" : "node_107"
},
"default_entry" : {
- "action_id" : 144,
+ "action_id" : 153,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_36",
- "id" : 61,
+ "name" : "tbl_act_39",
+ "id" : 68,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 337,
@@ -17967,14 +19154,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [145],
- "actions" : ["act_36"],
- "base_default_next" : "node_97",
+ "action_ids" : [154],
+ "actions" : ["act_39"],
+ "base_default_next" : "node_109",
"next_tables" : {
- "act_36" : "node_97"
+ "act_39" : "node_109"
},
"default_entry" : {
- "action_id" : 145,
+ "action_id" : 154,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -17982,7 +19169,7 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 62,
+ "id" : 69,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -17996,14 +19183,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [137],
+ "action_ids" : [146],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
- "base_default_next" : "node_101",
+ "base_default_next" : "node_113",
"next_tables" : {
- "FabricEgress.egress_next.pop_mpls_if_present" : "node_101"
+ "FabricEgress.egress_next.pop_mpls_if_present" : "node_113"
},
"default_entry" : {
- "action_id" : 137,
+ "action_id" : 146,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18011,7 +19198,7 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 63,
+ "id" : 70,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 343,
@@ -18025,14 +19212,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [138],
+ "action_ids" : [147],
"actions" : ["FabricEgress.egress_next.set_mpls"],
- "base_default_next" : "node_101",
+ "base_default_next" : "node_113",
"next_tables" : {
- "FabricEgress.egress_next.set_mpls" : "node_101"
+ "FabricEgress.egress_next.set_mpls" : "node_113"
},
"default_entry" : {
- "action_id" : 138,
+ "action_id" : 147,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18040,7 +19227,7 @@
},
{
"name" : "tbl_egress_next_push_vlan",
- "id" : 64,
+ "id" : 71,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 349,
@@ -18054,14 +19241,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [139],
+ "action_ids" : [148],
"actions" : ["FabricEgress.egress_next.push_vlan"],
"base_default_next" : "tbl_egress_next_push_inner_vlan",
"next_tables" : {
"FabricEgress.egress_next.push_vlan" : "tbl_egress_next_push_inner_vlan"
},
"default_entry" : {
- "action_id" : 139,
+ "action_id" : 148,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18069,7 +19256,7 @@
},
{
"name" : "tbl_egress_next_push_inner_vlan",
- "id" : 65,
+ "id" : 72,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 350,
@@ -18083,22 +19270,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [141],
+ "action_ids" : [150],
"actions" : ["FabricEgress.egress_next.push_inner_vlan"],
- "base_default_next" : "node_111",
+ "base_default_next" : "node_123",
"next_tables" : {
- "FabricEgress.egress_next.push_inner_vlan" : "node_111"
+ "FabricEgress.egress_next.push_inner_vlan" : "node_123"
},
"default_entry" : {
- "action_id" : 141,
+ "action_id" : 150,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_37",
- "id" : 66,
+ "name" : "tbl_act_40",
+ "id" : 73,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 353,
@@ -18112,14 +19299,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [148],
- "actions" : ["act_39"],
+ "action_ids" : [157],
+ "actions" : ["act_42"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
- "act_39" : "FabricEgress.egress_next.egress_vlan"
+ "act_42" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 148,
+ "action_id" : 157,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18127,7 +19314,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 67,
+ "id" : 74,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 320,
@@ -18154,23 +19341,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [142, 94],
+ "action_ids" : [151, 103],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_38",
- "__MISS__" : "tbl_act_39"
+ "__HIT__" : "tbl_act_41",
+ "__MISS__" : "tbl_act_42"
},
"default_entry" : {
- "action_id" : 94,
+ "action_id" : 103,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_38",
- "id" : 68,
+ "name" : "tbl_act_41",
+ "id" : 75,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -18178,22 +19365,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [146],
- "actions" : ["act_37"],
- "base_default_next" : "node_108",
+ "action_ids" : [155],
+ "actions" : ["act_40"],
+ "base_default_next" : "node_120",
"next_tables" : {
- "act_37" : "node_108"
+ "act_40" : "node_120"
},
"default_entry" : {
- "action_id" : 146,
+ "action_id" : 155,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_39",
- "id" : 69,
+ "name" : "tbl_act_42",
+ "id" : 76,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -18201,14 +19388,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [147],
- "actions" : ["act_38"],
- "base_default_next" : "node_108",
+ "action_ids" : [156],
+ "actions" : ["act_41"],
+ "base_default_next" : "node_120",
"next_tables" : {
- "act_38" : "node_108"
+ "act_41" : "node_120"
},
"default_entry" : {
- "action_id" : 147,
+ "action_id" : 156,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18216,7 +19403,7 @@
},
{
"name" : "tbl_egress_next_push_vlan_0",
- "id" : 70,
+ "id" : 77,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 360,
@@ -18230,22 +19417,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [140],
+ "action_ids" : [149],
"actions" : ["FabricEgress.egress_next.push_vlan"],
- "base_default_next" : "node_111",
+ "base_default_next" : "node_123",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_111"
+ "FabricEgress.egress_next.push_vlan" : "node_123"
},
"default_entry" : {
- "action_id" : 140,
+ "action_id" : 149,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_40",
- "id" : 71,
+ "name" : "tbl_act_43",
+ "id" : 78,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 369,
@@ -18259,22 +19446,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [150],
- "actions" : ["act_41"],
- "base_default_next" : "node_113",
+ "action_ids" : [159],
+ "actions" : ["act_44"],
+ "base_default_next" : "node_125",
"next_tables" : {
- "act_41" : "node_113"
+ "act_44" : "node_125"
},
"default_entry" : {
- "action_id" : 150,
+ "action_id" : 159,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_41",
- "id" : 72,
+ "name" : "tbl_act_44",
+ "id" : 79,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -18288,22 +19475,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [149],
- "actions" : ["act_40"],
- "base_default_next" : "node_123",
+ "action_ids" : [158],
+ "actions" : ["act_43"],
+ "base_default_next" : "tbl_act_49",
"next_tables" : {
- "act_40" : "node_123"
+ "act_43" : "tbl_act_49"
},
"default_entry" : {
- "action_id" : 149,
+ "action_id" : 158,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_42",
- "id" : 73,
+ "name" : "tbl_act_45",
+ "id" : 80,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 373,
@@ -18317,22 +19504,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [152],
- "actions" : ["act_43"],
- "base_default_next" : "node_117",
+ "action_ids" : [161],
+ "actions" : ["act_46"],
+ "base_default_next" : "node_129",
"next_tables" : {
- "act_43" : "node_117"
+ "act_46" : "node_129"
},
"default_entry" : {
- "action_id" : 152,
+ "action_id" : 161,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_43",
- "id" : 74,
+ "name" : "tbl_act_46",
+ "id" : 81,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -18346,22 +19533,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [151],
- "actions" : ["act_42"],
- "base_default_next" : "node_123",
+ "action_ids" : [160],
+ "actions" : ["act_45"],
+ "base_default_next" : "tbl_act_49",
"next_tables" : {
- "act_42" : "node_123"
+ "act_45" : "tbl_act_49"
},
"default_entry" : {
- "action_id" : 151,
+ "action_id" : 160,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_44",
- "id" : 75,
+ "name" : "tbl_act_47",
+ "id" : 82,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 378,
@@ -18375,22 +19562,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [154],
- "actions" : ["act_45"],
- "base_default_next" : "node_121",
+ "action_ids" : [163],
+ "actions" : ["act_48"],
+ "base_default_next" : "node_133",
"next_tables" : {
- "act_45" : "node_121"
+ "act_48" : "node_133"
},
"default_entry" : {
- "action_id" : 154,
+ "action_id" : 163,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_45",
- "id" : 76,
+ "name" : "tbl_act_48",
+ "id" : 83,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 379,
@@ -18404,14 +19591,43 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [153],
- "actions" : ["act_44"],
- "base_default_next" : "node_123",
+ "action_ids" : [162],
+ "actions" : ["act_47"],
+ "base_default_next" : "tbl_act_49",
"next_tables" : {
- "act_44" : "node_123"
+ "act_47" : "tbl_act_49"
},
"default_entry" : {
- "action_id" : 153,
+ "action_id" : 162,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_49",
+ "id" : 84,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [164],
+ "actions" : ["act_49"],
+ "base_default_next" : "node_136",
+ "next_tables" : {
+ "act_49" : "node_136"
+ },
+ "default_entry" : {
+ "action_id" : 164,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18419,10 +19635,10 @@
},
{
"name" : "tbl_spgw_egress_gtpu_encap",
- "id" : 77,
+ "id" : 85,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 228,
+ "line" : 291,
"column" : 12,
"source_fragment" : "gtpu_encap()"
},
@@ -18433,14 +19649,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [97],
+ "action_ids" : [106],
"actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
- "base_default_next" : "node_125",
+ "base_default_next" : "node_138",
"next_tables" : {
- "FabricEgress.spgw_egress.gtpu_encap" : "node_125"
+ "FabricEgress.spgw_egress.gtpu_encap" : "node_138"
},
"default_entry" : {
- "action_id" : 97,
+ "action_id" : 106,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18448,7 +19664,7 @@
},
{
"name" : "tbl_bng_egress_downstream_encap_v4",
- "id" : 78,
+ "id" : 86,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 297,
@@ -18462,14 +19678,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [98],
+ "action_ids" : [107],
"actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
- "base_default_next" : "node_130",
+ "base_default_next" : "node_143",
"next_tables" : {
- "FabricEgress.bng_egress.downstream.encap_v4" : "node_130"
+ "FabricEgress.bng_egress.downstream.encap_v4" : "node_143"
},
"default_entry" : {
- "action_id" : 98,
+ "action_id" : 107,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18477,7 +19693,7 @@
},
{
"name" : "tbl_bng_egress_downstream_encap_v6",
- "id" : 79,
+ "id" : 87,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 302,
@@ -18491,14 +19707,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [99],
+ "action_ids" : [108],
"actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
- "base_default_next" : "node_130",
+ "base_default_next" : "node_143",
"next_tables" : {
- "FabricEgress.bng_egress.downstream.encap_v6" : "node_130"
+ "FabricEgress.bng_egress.downstream.encap_v6" : "node_143"
},
"default_entry" : {
- "action_id" : 99,
+ "action_id" : 108,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18506,7 +19722,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "id" : 80,
+ "id" : 88,
"source_info" : {
"filename" : "include/int/int_source.p4",
"line" : 66,
@@ -18545,23 +19761,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [100, 91],
+ "action_ids" : [109, 100],
"actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
- "base_default_next" : "node_133",
+ "base_default_next" : "node_146",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_133",
- "nop" : "node_133"
+ "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_146",
+ "nop" : "node_146"
},
"default_entry" : {
- "action_id" : 91,
+ "action_id" : 100,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_46",
- "id" : 81,
+ "name" : "tbl_act_50",
+ "id" : 89,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -18569,14 +19785,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [155],
- "actions" : ["act_46"],
+ "action_ids" : [165],
+ "actions" : ["act_50"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
"next_tables" : {
- "act_46" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+ "act_50" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
},
"default_entry" : {
- "action_id" : 155,
+ "action_id" : 165,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18584,7 +19800,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
- "id" : 82,
+ "id" : 90,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 315,
@@ -18605,23 +19821,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [101, 92],
+ "action_ids" : [110, 101],
"actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
- "base_default_next" : "node_136",
+ "base_default_next" : "node_149",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_136",
- "nop" : "node_136"
+ "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_149",
+ "nop" : "node_149"
},
"default_entry" : {
- "action_id" : 92,
+ "action_id" : 101,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_47",
- "id" : 83,
+ "name" : "tbl_act_51",
+ "id" : 91,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 420,
@@ -18635,14 +19851,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [156],
- "actions" : ["act_47"],
- "base_default_next" : "node_138",
+ "action_ids" : [166],
+ "actions" : ["act_51"],
+ "base_default_next" : "node_151",
"next_tables" : {
- "act_47" : "node_138"
+ "act_51" : "node_151"
},
"default_entry" : {
- "action_id" : 156,
+ "action_id" : 166,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -18650,7 +19866,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
- "id" : 84,
+ "id" : 92,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 331,
@@ -18671,7 +19887,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 95],
+ "action_ids" : [111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 104],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -18694,7 +19910,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 95,
+ "action_id" : 104,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -18714,7 +19930,7 @@
}
],
"action_entry" : {
- "action_id" : 102,
+ "action_id" : 111,
"action_data" : []
},
"priority" : 1
@@ -18733,7 +19949,7 @@
}
],
"action_entry" : {
- "action_id" : 103,
+ "action_id" : 112,
"action_data" : []
},
"priority" : 2
@@ -18752,7 +19968,7 @@
}
],
"action_entry" : {
- "action_id" : 104,
+ "action_id" : 113,
"action_data" : []
},
"priority" : 3
@@ -18771,7 +19987,7 @@
}
],
"action_entry" : {
- "action_id" : 105,
+ "action_id" : 114,
"action_data" : []
},
"priority" : 4
@@ -18790,7 +20006,7 @@
}
],
"action_entry" : {
- "action_id" : 106,
+ "action_id" : 115,
"action_data" : []
},
"priority" : 5
@@ -18809,7 +20025,7 @@
}
],
"action_entry" : {
- "action_id" : 107,
+ "action_id" : 116,
"action_data" : []
},
"priority" : 6
@@ -18828,7 +20044,7 @@
}
],
"action_entry" : {
- "action_id" : 108,
+ "action_id" : 117,
"action_data" : []
},
"priority" : 7
@@ -18847,7 +20063,7 @@
}
],
"action_entry" : {
- "action_id" : 109,
+ "action_id" : 118,
"action_data" : []
},
"priority" : 8
@@ -18866,7 +20082,7 @@
}
],
"action_entry" : {
- "action_id" : 110,
+ "action_id" : 119,
"action_data" : []
},
"priority" : 9
@@ -18885,7 +20101,7 @@
}
],
"action_entry" : {
- "action_id" : 111,
+ "action_id" : 120,
"action_data" : []
},
"priority" : 10
@@ -18904,7 +20120,7 @@
}
],
"action_entry" : {
- "action_id" : 112,
+ "action_id" : 121,
"action_data" : []
},
"priority" : 11
@@ -18923,7 +20139,7 @@
}
],
"action_entry" : {
- "action_id" : 113,
+ "action_id" : 122,
"action_data" : []
},
"priority" : 12
@@ -18942,7 +20158,7 @@
}
],
"action_entry" : {
- "action_id" : 114,
+ "action_id" : 123,
"action_data" : []
},
"priority" : 13
@@ -18961,7 +20177,7 @@
}
],
"action_entry" : {
- "action_id" : 115,
+ "action_id" : 124,
"action_data" : []
},
"priority" : 14
@@ -18980,7 +20196,7 @@
}
],
"action_entry" : {
- "action_id" : 116,
+ "action_id" : 125,
"action_data" : []
},
"priority" : 15
@@ -18999,7 +20215,7 @@
}
],
"action_entry" : {
- "action_id" : 117,
+ "action_id" : 126,
"action_data" : []
},
"priority" : 16
@@ -19008,7 +20224,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
- "id" : 85,
+ "id" : 93,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 375,
@@ -19029,30 +20245,30 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 96],
+ "action_ids" : [127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 105],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
- "base_default_next" : "tbl_act_48",
+ "base_default_next" : "tbl_act_52",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_48",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_48",
- "NoAction" : "tbl_act_48"
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_52",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_52",
+ "NoAction" : "tbl_act_52"
},
"default_entry" : {
- "action_id" : 96,
+ "action_id" : 105,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -19072,7 +20288,7 @@
}
],
"action_entry" : {
- "action_id" : 118,
+ "action_id" : 127,
"action_data" : []
},
"priority" : 1
@@ -19091,7 +20307,7 @@
}
],
"action_entry" : {
- "action_id" : 119,
+ "action_id" : 128,
"action_data" : []
},
"priority" : 2
@@ -19110,7 +20326,7 @@
}
],
"action_entry" : {
- "action_id" : 120,
+ "action_id" : 129,
"action_data" : []
},
"priority" : 3
@@ -19129,7 +20345,7 @@
}
],
"action_entry" : {
- "action_id" : 121,
+ "action_id" : 130,
"action_data" : []
},
"priority" : 4
@@ -19148,7 +20364,7 @@
}
],
"action_entry" : {
- "action_id" : 122,
+ "action_id" : 131,
"action_data" : []
},
"priority" : 5
@@ -19167,7 +20383,7 @@
}
],
"action_entry" : {
- "action_id" : 123,
+ "action_id" : 132,
"action_data" : []
},
"priority" : 6
@@ -19186,7 +20402,7 @@
}
],
"action_entry" : {
- "action_id" : 124,
+ "action_id" : 133,
"action_data" : []
},
"priority" : 7
@@ -19205,7 +20421,7 @@
}
],
"action_entry" : {
- "action_id" : 125,
+ "action_id" : 134,
"action_data" : []
},
"priority" : 8
@@ -19224,7 +20440,7 @@
}
],
"action_entry" : {
- "action_id" : 126,
+ "action_id" : 135,
"action_data" : []
},
"priority" : 9
@@ -19243,7 +20459,7 @@
}
],
"action_entry" : {
- "action_id" : 127,
+ "action_id" : 136,
"action_data" : []
},
"priority" : 10
@@ -19262,7 +20478,7 @@
}
],
"action_entry" : {
- "action_id" : 128,
+ "action_id" : 137,
"action_data" : []
},
"priority" : 11
@@ -19281,7 +20497,7 @@
}
],
"action_entry" : {
- "action_id" : 129,
+ "action_id" : 138,
"action_data" : []
},
"priority" : 12
@@ -19300,7 +20516,7 @@
}
],
"action_entry" : {
- "action_id" : 130,
+ "action_id" : 139,
"action_data" : []
},
"priority" : 13
@@ -19319,7 +20535,7 @@
}
],
"action_entry" : {
- "action_id" : 131,
+ "action_id" : 140,
"action_data" : []
},
"priority" : 14
@@ -19338,7 +20554,7 @@
}
],
"action_entry" : {
- "action_id" : 132,
+ "action_id" : 141,
"action_data" : []
},
"priority" : 15
@@ -19357,7 +20573,7 @@
}
],
"action_entry" : {
- "action_id" : 133,
+ "action_id" : 142,
"action_data" : []
},
"priority" : 16
@@ -19365,8 +20581,8 @@
]
},
{
- "name" : "tbl_act_48",
- "id" : 86,
+ "name" : "tbl_act_52",
+ "id" : 94,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 425,
@@ -19380,22 +20596,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [158],
- "actions" : ["act_49"],
- "base_default_next" : "node_142",
+ "action_ids" : [168],
+ "actions" : ["act_53"],
+ "base_default_next" : "node_155",
"next_tables" : {
- "act_49" : "node_142"
+ "act_53" : "node_155"
},
"default_entry" : {
- "action_id" : 158,
+ "action_id" : 168,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_49",
- "id" : 87,
+ "name" : "tbl_act_53",
+ "id" : 95,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 428,
@@ -19409,22 +20625,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [157],
- "actions" : ["act_48"],
- "base_default_next" : "node_144",
+ "action_ids" : [167],
+ "actions" : ["act_52"],
+ "base_default_next" : "node_157",
"next_tables" : {
- "act_48" : "node_144"
+ "act_52" : "node_157"
},
"default_entry" : {
- "action_id" : 157,
+ "action_id" : 167,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_50",
- "id" : 88,
+ "name" : "tbl_act_54",
+ "id" : 96,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 431,
@@ -19438,22 +20654,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [159],
- "actions" : ["act_50"],
- "base_default_next" : "node_146",
+ "action_ids" : [169],
+ "actions" : ["act_54"],
+ "base_default_next" : "node_159",
"next_tables" : {
- "act_50" : "node_146"
+ "act_54" : "node_159"
},
"default_entry" : {
- "action_id" : 159,
+ "action_id" : 169,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_51",
- "id" : 89,
+ "name" : "tbl_act_55",
+ "id" : 97,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 434,
@@ -19467,14 +20683,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [160],
- "actions" : ["act_51"],
- "base_default_next" : "node_148",
+ "action_ids" : [170],
+ "actions" : ["act_55"],
+ "base_default_next" : "node_161",
"next_tables" : {
- "act_51" : "node_148"
+ "act_55" : "node_161"
},
"default_entry" : {
- "action_id" : 160,
+ "action_id" : 170,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -19482,7 +20698,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
- "id" : 90,
+ "id" : 98,
"source_info" : {
"filename" : "include/int/int_report.p4",
"line" : 86,
@@ -19496,15 +20712,15 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [134, 93],
+ "action_ids" : [143, 102],
"actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
- "base_default_next" : "node_150",
+ "base_default_next" : "node_163",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_150",
- "nop" : "node_150"
+ "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_163",
+ "nop" : "node_163"
},
"default_entry" : {
- "action_id" : 93,
+ "action_id" : 102,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -19512,7 +20728,7 @@
},
{
"name" : "tbl_process_int_main_process_int_sink_restore_header",
- "id" : 91,
+ "id" : 99,
"source_info" : {
"filename" : "include/int/int_sink.p4",
"line" : 53,
@@ -19526,14 +20742,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [135],
+ "action_ids" : [144],
"actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
"base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
"next_tables" : {
"FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
},
"default_entry" : {
- "action_id" : 135,
+ "action_id" : 144,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -19541,7 +20757,7 @@
},
{
"name" : "tbl_process_int_main_process_int_sink_int_sink",
- "id" : 92,
+ "id" : 100,
"source_info" : {
"filename" : "include/int/int_sink.p4",
"line" : 54,
@@ -19555,14 +20771,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [136],
+ "action_ids" : [145],
"actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.process_int_main.process_int_sink.int_sink" : null
},
"default_entry" : {
- "action_id" : 136,
+ "action_id" : 145,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -19572,8 +20788,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_91",
- "id" : 28,
+ "name" : "node_103",
+ "id" : 33,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 39,
@@ -19601,12 +20817,12 @@
}
}
},
- "true_next" : "tbl_act_34",
- "false_next" : "node_93"
+ "true_next" : "tbl_act_37",
+ "false_next" : "node_105"
},
{
- "name" : "node_93",
- "id" : 29,
+ "name" : "node_105",
+ "id" : 34,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -19627,12 +20843,12 @@
}
}
},
- "true_next" : "tbl_act_35",
- "false_next" : "node_95"
+ "true_next" : "tbl_act_38",
+ "false_next" : "node_107"
},
{
- "name" : "node_95",
- "id" : 30,
+ "name" : "node_107",
+ "id" : 35,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 335,
@@ -19680,12 +20896,12 @@
}
}
},
- "true_next" : "tbl_act_36",
- "false_next" : "node_97"
+ "true_next" : "tbl_act_39",
+ "false_next" : "node_109"
},
{
- "name" : "node_97",
- "id" : 31,
+ "name" : "node_109",
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 340,
@@ -19706,12 +20922,12 @@
}
}
},
- "true_next" : "node_98",
+ "true_next" : "node_110",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_98",
- "id" : 32,
+ "name" : "node_110",
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -19730,11 +20946,11 @@
}
},
"true_next" : "tbl_egress_next_pop_mpls_if_present",
- "false_next" : "node_101"
+ "false_next" : "node_113"
},
{
- "name" : "node_101",
- "id" : 33,
+ "name" : "node_113",
+ "id" : 38,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 347,
@@ -19763,11 +20979,11 @@
}
},
"true_next" : "tbl_egress_next_push_vlan",
- "false_next" : "tbl_act_37"
+ "false_next" : "tbl_act_40"
},
{
- "name" : "node_108",
- "id" : 34,
+ "name" : "node_120",
+ "id" : 39,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 357,
@@ -19792,12 +21008,12 @@
}
}
},
- "true_next" : "node_109",
- "false_next" : "node_111"
+ "true_next" : "node_121",
+ "false_next" : "node_123"
},
{
- "name" : "node_109",
- "id" : 35,
+ "name" : "node_121",
+ "id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 359,
@@ -19819,11 +21035,11 @@
}
},
"true_next" : "tbl_egress_next_push_vlan_0",
- "false_next" : "node_111"
+ "false_next" : "node_123"
},
{
- "name" : "node_111",
- "id" : 36,
+ "name" : "node_123",
+ "id" : 41,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 368,
@@ -19841,12 +21057,12 @@
}
}
},
- "true_next" : "tbl_act_40",
- "false_next" : "node_115"
+ "true_next" : "tbl_act_43",
+ "false_next" : "node_127"
},
{
- "name" : "node_113",
- "id" : 37,
+ "name" : "node_125",
+ "id" : 42,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -19867,12 +21083,12 @@
}
}
},
- "true_next" : "tbl_act_41",
- "false_next" : "node_123"
+ "true_next" : "tbl_act_44",
+ "false_next" : "tbl_act_49"
},
{
- "name" : "node_115",
- "id" : 38,
+ "name" : "node_127",
+ "id" : 43,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 372,
@@ -19890,12 +21106,12 @@
}
}
},
- "true_next" : "tbl_act_42",
- "false_next" : "node_119"
+ "true_next" : "tbl_act_45",
+ "false_next" : "node_131"
},
{
- "name" : "node_117",
- "id" : 39,
+ "name" : "node_129",
+ "id" : 44,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -19916,12 +21132,12 @@
}
}
},
- "true_next" : "tbl_act_43",
- "false_next" : "node_123"
+ "true_next" : "tbl_act_46",
+ "false_next" : "tbl_act_49"
},
{
- "name" : "node_119",
- "id" : 40,
+ "name" : "node_131",
+ "id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 377,
@@ -19939,12 +21155,12 @@
}
}
},
- "true_next" : "tbl_act_44",
- "false_next" : "node_123"
+ "true_next" : "tbl_act_47",
+ "false_next" : "tbl_act_49"
},
{
- "name" : "node_121",
- "id" : 41,
+ "name" : "node_133",
+ "id" : 46,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 379,
@@ -19965,38 +21181,45 @@
}
}
},
- "true_next" : "tbl_act_45",
- "false_next" : "node_123"
+ "true_next" : "tbl_act_48",
+ "false_next" : "tbl_act_49"
},
{
- "name" : "node_123",
- "id" : 42,
+ "name" : "node_136",
+ "id" : 47,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 227,
+ "line" : 290,
"column" : 12,
- "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ "source_fragment" : "fabric_meta.spgw.outer_header_creation == true"
},
"expression" : {
"type" : "expression",
"value" : {
"op" : "==",
"left" : {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation31"]
+ }
+ }
},
"right" : {
- "type" : "hexstr",
- "value" : "0x02"
+ "type" : "bool",
+ "value" : true
}
}
},
"true_next" : "tbl_spgw_egress_gtpu_encap",
- "false_next" : "node_125"
+ "false_next" : "node_138"
},
{
- "name" : "node_125",
- "id" : 43,
+ "name" : "node_138",
+ "id" : 48,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 358,
@@ -20009,7 +21232,7 @@
"op" : "==",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+ "value" : ["scalars", "fabric_metadata_t._bng_type32"]
},
"right" : {
"type" : "hexstr",
@@ -20017,12 +21240,12 @@
}
}
},
- "true_next" : "node_126",
- "false_next" : "node_130"
+ "true_next" : "node_139",
+ "false_next" : "node_143"
},
{
- "name" : "node_126",
- "id" : 44,
+ "name" : "node_139",
+ "id" : 49,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 296,
@@ -20041,11 +21264,11 @@
}
},
"true_next" : "tbl_bng_egress_downstream_encap_v4",
- "false_next" : "node_128"
+ "false_next" : "node_141"
},
{
- "name" : "node_128",
- "id" : 45,
+ "name" : "node_141",
+ "id" : 50,
"source_info" : {
"filename" : "include/bng.p4",
"line" : 301,
@@ -20064,11 +21287,11 @@
}
},
"true_next" : "tbl_bng_egress_downstream_encap_v6",
- "false_next" : "node_130"
+ "false_next" : "node_143"
},
{
- "name" : "node_130",
- "id" : 46,
+ "name" : "node_143",
+ "id" : 51,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 102,
@@ -20144,11 +21367,11 @@
}
},
"false_next" : null,
- "true_next" : "node_131"
+ "true_next" : "node_144"
},
{
- "name" : "node_131",
- "id" : 47,
+ "name" : "node_144",
+ "id" : 52,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 106,
@@ -20166,7 +21389,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source30"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source38"]
}
}
},
@@ -20177,11 +21400,11 @@
}
},
"true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "false_next" : "node_133"
+ "false_next" : "node_146"
},
{
- "name" : "node_133",
- "id" : 48,
+ "name" : "node_146",
+ "id" : 53,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 110,
@@ -20200,11 +21423,11 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_46"
+ "true_next" : "tbl_act_50"
},
{
- "name" : "node_136",
- "id" : 49,
+ "name" : "node_149",
+ "id" : 54,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 419,
@@ -20222,7 +21445,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit31"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit39"]
}
}
},
@@ -20232,12 +21455,12 @@
}
}
},
- "true_next" : "tbl_act_47",
- "false_next" : "node_138"
+ "true_next" : "tbl_act_51",
+ "false_next" : "node_151"
},
{
- "name" : "node_138",
- "id" : 50,
+ "name" : "node_151",
+ "id" : 55,
"expression" : {
"type" : "expression",
"value" : {
@@ -20257,11 +21480,11 @@
}
},
"true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
- "false_next" : "node_148"
+ "false_next" : "node_161"
},
{
- "name" : "node_142",
- "id" : 51,
+ "name" : "node_155",
+ "id" : 56,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 427,
@@ -20279,12 +21502,12 @@
}
}
},
- "true_next" : "tbl_act_49",
- "false_next" : "node_144"
+ "true_next" : "tbl_act_53",
+ "false_next" : "node_157"
},
{
- "name" : "node_144",
- "id" : 52,
+ "name" : "node_157",
+ "id" : 57,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 430,
@@ -20302,12 +21525,12 @@
}
}
},
- "true_next" : "tbl_act_50",
- "false_next" : "node_146"
+ "true_next" : "tbl_act_54",
+ "false_next" : "node_159"
},
{
- "name" : "node_146",
- "id" : 53,
+ "name" : "node_159",
+ "id" : 58,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 433,
@@ -20325,12 +21548,12 @@
}
}
},
- "true_next" : "tbl_act_51",
- "false_next" : "node_148"
+ "true_next" : "tbl_act_55",
+ "false_next" : "node_161"
},
{
- "name" : "node_148",
- "id" : 54,
+ "name" : "node_161",
+ "id" : 59,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 115,
@@ -20352,11 +21575,11 @@
}
},
"true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
- "false_next" : "node_150"
+ "false_next" : "node_163"
},
{
- "name" : "node_150",
- "id" : 55,
+ "name" : "node_163",
+ "id" : 60,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 119,
@@ -20374,7 +21597,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_sink32"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_sink40"]
}
}
},
@@ -20422,7 +21645,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 43f5be1..7a83ba9 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -3,33 +3,27 @@
}
tables {
preamble {
- id: 33582731
- name: "FabricIngress.spgw_ingress.dl_sess_lookup"
- alias: "dl_sess_lookup"
+ id: 33586632
+ name: "FabricIngress.spgw_ingress.downlink_filter_table"
+ alias: "downlink_filter_table"
}
match_fields {
id: 1
- name: "ipv4_dst"
+ name: "ipv4_prefix"
bitwidth: 32
- match_type: EXACT
- }
- action_refs {
- id: 16804065
+ match_type: LPM
}
action_refs {
id: 16819938
- annotations: "@defaultonly"
- scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
- direct_resource_ids: 318781522
size: 1024
}
tables {
preamble {
- id: 33615906
- name: "FabricIngress.spgw_ingress.s1u_filter_table"
- alias: "s1u_filter_table"
+ id: 33567046
+ name: "FabricIngress.spgw_ingress.uplink_filter_table"
+ alias: "uplink_filter_table"
}
match_fields {
id: 1
@@ -45,6 +39,143 @@
}
tables {
preamble {
+ id: 33586958
+ name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+ alias: "downlink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33587070
+ name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
+ alias: "uplink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "teid"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 3
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33582573
+ name: "FabricIngress.spgw_ingress.flexible_pdr_lookup"
+ alias: "flexible_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "spgw_direction"
+ bitwidth: 2
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 2
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 3
+ name: "teid"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 4
+ name: "ipv4_src"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 5
+ name: "ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 6
+ name: "ip_proto"
+ bitwidth: 8
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 7
+ name: "l4_sport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 8
+ name: "l4_dport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ action_refs {
+ id: 16799934
+ }
+ const_default_action_id: 16799934
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33613200
+ name: "FabricIngress.spgw_ingress.far_lookup"
+ alias: "far_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "far_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16834935
+ }
+ action_refs {
+ id: 16787606
+ }
+ const_default_action_id: 16834935
+ size: 1024
+}
+tables {
+ preamble {
id: 33581620
name: "FabricIngress.process_set_source_sink.tb_set_source"
alias: "tb_set_source"
@@ -857,23 +988,74 @@
}
actions {
preamble {
- id: 16804065
- name: "FabricIngress.spgw_ingress.set_dl_sess_info"
- alias: "set_dl_sess_info"
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
+ id: 16799934
+ name: "FabricIngress.spgw_ingress.set_pdr_attributes"
+ alias: "set_pdr_attributes"
}
params {
id: 1
- name: "teid"
+ name: "ctr_id"
bitwidth: 32
}
params {
id: 2
- name: "s1u_enb_addr"
+ name: "far_id"
bitwidth: 32
}
+}
+actions {
+ preamble {
+ id: 16834935
+ name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
+ alias: "load_normal_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
+}
+actions {
+ preamble {
+ id: 16787606
+ name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
+ alias: "load_tunnel_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
params {
id: 3
- name: "s1u_sgw_addr"
+ name: "tunnel_src_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 4
+ name: "tunnel_dst_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 5
+ name: "teid"
bitwidth: 32
}
}
@@ -1291,13 +1473,6 @@
}
actions {
preamble {
- id: 16800567
- name: "NoAction"
- alias: "NoAction"
- }
-}
-actions {
- preamble {
id: 16784000
name: "FabricEgress.bng_egress.downstream.encap_v4"
alias: "encap_v4"
@@ -1401,6 +1576,17 @@
}
counters {
preamble {
+ id: 302029884
+ name: "FabricIngress.spgw_ingress.pdr_counter"
+ alias: "spgw_ingress.pdr_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ size: 1024
+}
+counters {
+ preamble {
id: 302022672
name: "FabricIngress.bng_ingress.upstream.c_terminated"
alias: "c_terminated"
@@ -1467,6 +1653,17 @@
}
counters {
preamble {
+ id: 302012289
+ name: "FabricEgress.spgw_egress.pdr_counter"
+ alias: "spgw_egress.pdr_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ size: 1024
+}
+counters {
+ preamble {
id: 302046535
name: "FabricEgress.bng_egress.downstream.c_line_tx"
alias: "c_line_tx"
@@ -1478,17 +1675,6 @@
}
direct_counters {
preamble {
- id: 318781522
- name: "FabricIngress.spgw_ingress.ue_counter"
- alias: "ue_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33582731
-}
-direct_counters {
- preamble {
id: 318787614
name: "FabricIngress.process_set_source_sink.counter_set_source"
alias: "counter_set_source"
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 8bf0be7..13aa90f 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -27,14 +27,16 @@
["fabric_metadata_t._ip_proto12", 8, false],
["fabric_metadata_t._l4_sport13", 16, false],
["fabric_metadata_t._l4_dport14", 16, false],
- ["fabric_metadata_t._int_meta_source15", 1, false],
- ["fabric_metadata_t._int_meta_transit16", 1, false],
- ["fabric_metadata_t._int_meta_sink17", 1, false],
- ["fabric_metadata_t._int_meta_switch_id18", 32, false],
- ["fabric_metadata_t._int_meta_new_words19", 8, false],
- ["fabric_metadata_t._int_meta_new_bytes20", 16, false],
- ["fabric_metadata_t._int_meta_ig_tstamp21", 32, false],
- ["fabric_metadata_t._int_meta_eg_tstamp22", 32, false],
+ ["fabric_metadata_t._ipv4_src_addr15", 32, false],
+ ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
+ ["fabric_metadata_t._int_meta_source17", 1, false],
+ ["fabric_metadata_t._int_meta_transit18", 1, false],
+ ["fabric_metadata_t._int_meta_sink19", 1, false],
+ ["fabric_metadata_t._int_meta_switch_id20", 32, false],
+ ["fabric_metadata_t._int_meta_new_words21", 8, false],
+ ["fabric_metadata_t._int_meta_new_bytes22", 16, false],
+ ["fabric_metadata_t._int_meta_ig_tstamp23", 32, false],
+ ["fabric_metadata_t._int_meta_eg_tstamp24", 32, false],
["_padding_0", 6, false]
]
},
@@ -828,6 +830,32 @@
"parameters" : [
{
"type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "last_ipv4_dscp_0"]
},
{
@@ -1109,7 +1137,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1472,7 +1500,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source15"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
},
{
"type" : "expression",
@@ -2670,7 +2698,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 157,
+ "line" : 160,
"column" : 36,
"source_fragment" : "4; ..."
}
@@ -3088,7 +3116,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 153,
+ "line" : 156,
"column" : 24,
"source_fragment" : "0x1; ..."
}
@@ -3110,7 +3138,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit16"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
},
{
"type" : "expression",
@@ -3139,7 +3167,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
},
{
"type" : "runtime_data",
@@ -3237,7 +3265,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -3251,7 +3279,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -3279,7 +3307,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -3293,7 +3321,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -3362,7 +3390,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -3376,7 +3404,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -3404,7 +3432,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -3418,7 +3446,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -3553,7 +3581,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -3567,7 +3595,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -3595,7 +3623,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -3609,7 +3637,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -3723,7 +3751,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -3737,7 +3765,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -3765,7 +3793,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -3779,7 +3807,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -3959,7 +3987,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -3973,7 +4001,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4001,7 +4029,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4015,7 +4043,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -4163,7 +4191,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -4177,7 +4205,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4205,7 +4233,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4219,7 +4247,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -4433,7 +4461,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -4447,7 +4475,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4475,7 +4503,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4489,7 +4517,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -4543,7 +4571,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -4558,7 +4586,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -4572,7 +4600,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4600,7 +4628,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4614,7 +4642,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -4734,7 +4762,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -4749,7 +4777,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -4763,7 +4791,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4791,7 +4819,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4805,7 +4833,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -4893,7 +4921,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -4908,7 +4936,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -4922,7 +4950,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -4950,7 +4978,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -4964,7 +4992,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -5118,7 +5146,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -5133,7 +5161,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -5147,7 +5175,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -5175,7 +5203,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -5189,7 +5217,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -5322,7 +5350,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -5337,7 +5365,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -5351,7 +5379,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -5379,7 +5407,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -5393,7 +5421,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -5592,7 +5620,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -5607,7 +5635,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -5621,7 +5649,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -5649,7 +5677,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -5663,7 +5691,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -5830,7 +5858,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -5845,7 +5873,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -5859,7 +5887,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -5887,7 +5915,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -5901,7 +5929,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6134,7 +6162,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id18"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
}
],
"source_info" : {
@@ -6149,7 +6177,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6163,7 +6191,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6191,7 +6219,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6205,7 +6233,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6280,7 +6308,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6294,7 +6322,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6322,7 +6350,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6336,7 +6364,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6424,7 +6452,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6438,7 +6466,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6466,7 +6494,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6480,7 +6508,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6602,7 +6630,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6616,7 +6644,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6644,7 +6672,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6658,7 +6686,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6750,7 +6778,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6764,7 +6792,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6792,7 +6820,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6806,7 +6834,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -6932,7 +6960,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -6946,7 +6974,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -6974,7 +7002,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -6988,7 +7016,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -7133,7 +7161,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -7147,7 +7175,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -7175,7 +7203,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -7189,7 +7217,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -7368,7 +7396,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -7382,7 +7410,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -7410,7 +7438,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -7424,7 +7452,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -7493,7 +7521,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -7507,7 +7535,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -7535,7 +7563,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -7549,7 +7577,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -7652,7 +7680,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -7666,7 +7694,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -7694,7 +7722,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -7708,7 +7736,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -7830,7 +7858,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -7844,7 +7872,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -7872,7 +7900,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -7886,7 +7914,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -8042,7 +8070,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -8056,7 +8084,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -8084,7 +8112,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -8098,7 +8126,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -8224,7 +8252,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -8238,7 +8266,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -8266,7 +8294,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -8280,7 +8308,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -8440,7 +8468,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -8454,7 +8482,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -8482,7 +8510,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -8496,7 +8524,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -8675,7 +8703,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -8689,7 +8717,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -8717,7 +8745,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -8731,7 +8759,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -8944,7 +8972,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
{
"type" : "expression",
@@ -8958,7 +8986,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
},
"right" : {
"type" : "hexstr",
@@ -8986,7 +9014,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
{
"type" : "expression",
@@ -9000,7 +9028,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
},
"right" : {
"type" : "hexstr",
@@ -9176,7 +9204,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -9255,7 +9283,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -9689,7 +9717,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
}
}
},
@@ -9787,7 +9815,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
}
}
},
@@ -9836,7 +9864,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words19"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
}
}
},
@@ -10154,7 +10182,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
"mask" : null
}
],
@@ -10549,11 +10577,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
},
{
"type" : "field",
@@ -12630,7 +12658,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source15"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
}
}
},
@@ -12686,7 +12714,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit16"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
}
}
},
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index cb56bf0..9e0d9a5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -32,19 +32,28 @@
["fabric_metadata_t._ip_proto12", 8, false],
["fabric_metadata_t._l4_sport13", 16, false],
["fabric_metadata_t._l4_dport14", 16, false],
- ["fabric_metadata_t._spgw_direction15", 2, false],
- ["fabric_metadata_t._spgw_ipv4_len16", 16, false],
- ["fabric_metadata_t._spgw_teid17", 32, false],
- ["fabric_metadata_t._spgw_s1u_enb_addr18", 32, false],
- ["fabric_metadata_t._spgw_s1u_sgw_addr19", 32, false],
- ["fabric_metadata_t._int_meta_source20", 1, false],
- ["fabric_metadata_t._int_meta_transit21", 1, false],
- ["fabric_metadata_t._int_meta_sink22", 1, false],
- ["fabric_metadata_t._int_meta_switch_id23", 32, false],
- ["fabric_metadata_t._int_meta_new_words24", 8, false],
- ["fabric_metadata_t._int_meta_new_bytes25", 16, false],
- ["fabric_metadata_t._int_meta_ig_tstamp26", 32, false],
- ["fabric_metadata_t._int_meta_eg_tstamp27", 32, false]
+ ["fabric_metadata_t._ipv4_src_addr15", 32, false],
+ ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
+ ["fabric_metadata_t._spgw_direction17", 2, false],
+ ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+ ["fabric_metadata_t._spgw_teid19", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_src_addr20", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_dst_addr21", 32, false],
+ ["fabric_metadata_t._spgw_ctr_id22", 32, false],
+ ["fabric_metadata_t._spgw_far_id23", 32, false],
+ ["fabric_metadata_t._spgw_pdr_hit24", 1, false],
+ ["fabric_metadata_t._spgw_far_dropped25", 1, false],
+ ["fabric_metadata_t._spgw_notify_cp26", 1, false],
+ ["fabric_metadata_t._spgw_outer_header_creation27", 1, false],
+ ["fabric_metadata_t._int_meta_source28", 1, false],
+ ["fabric_metadata_t._int_meta_transit29", 1, false],
+ ["fabric_metadata_t._int_meta_sink30", 1, false],
+ ["fabric_metadata_t._int_meta_switch_id31", 32, false],
+ ["fabric_metadata_t._int_meta_new_words32", 8, false],
+ ["fabric_metadata_t._int_meta_new_bytes33", 16, false],
+ ["fabric_metadata_t._int_meta_ig_tstamp34", 32, false],
+ ["fabric_metadata_t._int_meta_eg_tstamp35", 32, false],
+ ["_padding_0", 4, false]
]
},
{
@@ -887,6 +896,32 @@
"parameters" : [
{
"type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
"value" : ["scalars", "last_ipv4_dscp_0"]
},
{
@@ -1362,7 +1397,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1372,16 +1407,16 @@
"meter_arrays" : [],
"counter_arrays" : [
{
- "name" : "FabricIngress.spgw_ingress.ue_counter",
+ "name" : "FabricIngress.spgw_ingress.pdr_counter",
"id" : 0,
- "is_direct" : true,
- "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup",
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 52,
- "column" : 50,
- "source_fragment" : "ue_counter"
- }
+ "line" : 56,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
},
{
"name" : "FabricIngress.process_set_source_sink.counter_set_source",
@@ -1528,8 +1563,20 @@
"is_direct" : false
},
{
- "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
+ "name" : "FabricEgress.spgw_egress.pdr_counter",
"id" : 13,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 246,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
+ },
+ {
+ "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
+ "id" : 14,
"is_direct" : true,
"binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
"source_info" : {
@@ -1541,7 +1588,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan_counter",
- "id" : 14,
+ "id" : 15,
"is_direct" : true,
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
@@ -1620,7 +1667,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
@@ -1801,11 +1848,99 @@
"primitives" : []
},
{
- "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "name" : "NoAction",
"id" : 10,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 11,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "id" : 12,
+ "runtime_data" : [],
"primitives" : [
{
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu", "teid"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 61,
+ "column" : 30,
+ "source_fragment" : "= gtpu.teid; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 62,
+ "column" : 41,
+ "source_fragment" : "= gtpu_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 64,
+ "column" : 34,
+ "source_fragment" : "= ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 65,
+ "column" : 34,
+ "source_fragment" : "= ipv4.dst_addr; ..."
+ }
+ },
+ {
"op" : "remove_header",
"parameters" : [
{
@@ -1815,7 +1950,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 56,
+ "line" : 67,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setInvalid()"
}
@@ -1830,7 +1965,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 57,
+ "line" : 68,
"column" : 8,
"source_fragment" : "gtpu_udp.setInvalid()"
}
@@ -1845,7 +1980,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 58,
+ "line" : 69,
"column" : 8,
"source_fragment" : "gtpu.setInvalid()"
}
@@ -1853,19 +1988,15 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 11,
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 13,
"runtime_data" : [
{
- "name" : "teid",
+ "name" : "ctr_id",
"bitwidth" : 32
},
{
- "name" : "s1u_enb_addr",
- "bitwidth" : 32
- },
- {
- "name" : "s1u_sgw_addr",
+ "name" : "far_id",
"bitwidth" : 32
}
],
@@ -1875,7 +2006,36 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
},
{
"type" : "runtime_data",
@@ -1884,7 +2044,440 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 64,
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 14,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 15,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+ "id" : 16,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 146,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 147,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+ "id" : 17,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "tunnel_src_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "tunnel_dst_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "teid",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 155,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 156,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 158,
+ "column" : 47,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 4
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 159,
"column" : 30,
"source_fragment" : "= teid; ..."
}
@@ -1894,26 +2487,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 65,
- "column" : 38,
- "source_fragment" : "= s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
},
{
"type" : "runtime_data",
@@ -1922,16 +2496,73 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 66,
- "column" : 38,
- "source_fragment" : "= s1u_sgw_addr; ..."
+ "line" : 160,
+ "column" : 41,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 161,
+ "column" : 41,
+ "source_fragment" : "= tunnel_dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 163,
+ "column" : 34,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 164,
+ "column" : 34,
+ "source_fragment" : "= tunnel_dst_addr; ..."
}
}
]
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_source",
- "id" : 12,
+ "id" : 18,
"runtime_data" : [],
"primitives" : [
{
@@ -1939,7 +2570,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
},
{
"type" : "expression",
@@ -1967,7 +2598,7 @@
},
{
"name" : "FabricIngress.filtering.deny",
- "id" : 13,
+ "id" : 19,
"runtime_data" : [],
"primitives" : [
{
@@ -2032,13 +2663,13 @@
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 14,
+ "id" : 20,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 15,
+ "id" : 21,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -2069,7 +2700,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 16,
+ "id" : 22,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -2100,7 +2731,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 17,
+ "id" : 23,
"runtime_data" : [
{
"name" : "next_id",
@@ -2131,7 +2762,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 18,
+ "id" : 24,
"runtime_data" : [
{
"name" : "next_id",
@@ -2181,7 +2812,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 19,
+ "id" : 25,
"runtime_data" : [
{
"name" : "next_id",
@@ -2212,13 +2843,13 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 20,
+ "id" : 26,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 21,
+ "id" : 27,
"runtime_data" : [
{
"name" : "next_id",
@@ -2249,7 +2880,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 22,
+ "id" : 28,
"runtime_data" : [],
"primitives" : [
{
@@ -2304,7 +2935,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 23,
+ "id" : 29,
"runtime_data" : [
{
"name" : "clone_id",
@@ -2335,7 +2966,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 24,
+ "id" : 30,
"runtime_data" : [],
"primitives" : [
{
@@ -2386,13 +3017,13 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 25,
+ "id" : 31,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.next.set_vlan",
- "id" : 26,
+ "id" : 32,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -2423,7 +3054,7 @@
},
{
"name" : "FabricIngress.next.output_xconnect",
- "id" : 27,
+ "id" : 33,
"runtime_data" : [
{
"name" : "port_num",
@@ -2454,7 +3085,7 @@
},
{
"name" : "FabricIngress.next.set_next_id_xconnect",
- "id" : 28,
+ "id" : 34,
"runtime_data" : [
{
"name" : "next_id",
@@ -2485,7 +3116,7 @@
},
{
"name" : "FabricIngress.next.output_hashed",
- "id" : 29,
+ "id" : 35,
"runtime_data" : [
{
"name" : "port_num",
@@ -2516,7 +3147,7 @@
},
{
"name" : "FabricIngress.next.routing_hashed",
- "id" : 30,
+ "id" : 36,
"runtime_data" : [
{
"name" : "port_num",
@@ -2593,7 +3224,7 @@
},
{
"name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 31,
+ "id" : 37,
"runtime_data" : [
{
"name" : "port_num",
@@ -2693,7 +3324,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 32,
+ "id" : 38,
"runtime_data" : [
{
"name" : "group_id",
@@ -2753,7 +3384,7 @@
},
{
"name" : "act",
- "id" : 33,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -2780,7 +3411,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
}
@@ -2789,7 +3420,7 @@
},
{
"name" : "act_0",
- "id" : 34,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -2849,7 +3480,7 @@
},
{
"name" : "act_1",
- "id" : 35,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -2866,7 +3497,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "= inner_udp; ..."
}
@@ -2875,7 +3506,7 @@
},
{
"name" : "act_2",
- "id" : 36,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -2888,7 +3519,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
}
@@ -2897,7 +3528,7 @@
},
{
"name" : "act_3",
- "id" : 37,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -2914,7 +3545,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
}
@@ -2933,7 +3564,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 32,
+ "line" : 36,
"column" : 13,
"source_fragment" : "= inner_ipv4; ..."
}
@@ -2952,7 +3583,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 33,
+ "line" : 37,
"column" : 17,
"source_fragment" : "= udp; ..."
}
@@ -2961,7 +3592,7 @@
},
{
"name" : "act_4",
- "id" : 38,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3041,7 +3672,7 @@
},
{
"name" : "act_5",
- "id" : 39,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3105,7 +3736,7 @@
},
{
"name" : "act_6",
- "id" : 40,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -3131,7 +3762,7 @@
},
{
"name" : "act_7",
- "id" : 41,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -3161,7 +3792,7 @@
},
{
"name" : "act_8",
- "id" : 42,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -3191,7 +3822,7 @@
},
{
"name" : "act_9",
- "id" : 43,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3204,7 +3835,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -3213,7 +3844,7 @@
},
{
"name" : "act_10",
- "id" : 44,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -3221,7 +3852,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -3230,7 +3861,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 147,
+ "line" : 150,
"column" : 36,
"source_fragment" : "2w1; ..."
}
@@ -3239,7 +3870,7 @@
},
{
"name" : "act_11",
- "id" : 45,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -3269,7 +3900,7 @@
},
{
"name" : "act_12",
- "id" : 46,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -3299,7 +3930,7 @@
},
{
"name" : "act_13",
- "id" : 47,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -3307,7 +3938,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -3316,7 +3947,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 148,
+ "line" : 151,
"column" : 38,
"source_fragment" : "2w2; ..."
}
@@ -3325,7 +3956,7 @@
},
{
"name" : "act_14",
- "id" : 48,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -3333,7 +3964,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -3342,7 +3973,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 146,
+ "line" : 149,
"column" : 37,
"source_fragment" : "2w0; ..."
}
@@ -3371,7 +4002,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 158,
+ "line" : 196,
"column" : 12,
"source_fragment" : "return"
}
@@ -3380,7 +4011,7 @@
},
{
"name" : "act_15",
- "id" : 49,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -3410,7 +4041,7 @@
},
{
"name" : "act_16",
- "id" : 50,
+ "id" : 56,
"runtime_data" : [],
"primitives" : [
{
@@ -3418,7 +4049,134 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_17",
+ "id" : 57,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricIngress.spgw_ingress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_18",
+ "id" : 58,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 224,
+ "column" : 34,
+ "source_fragment" : "= true; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_19",
+ "id" : 59,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
},
{
"type" : "field",
@@ -3427,7 +4185,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 232,
"column" : 34,
"source_fragment" : "= ipv4.total_len; ..."
}
@@ -3435,8 +4193,8 @@
]
},
{
- "name" : "act_17",
- "id" : 51,
+ "name" : "act_20",
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -3493,8 +4251,8 @@
]
},
{
- "name" : "act_18",
- "id" : 52,
+ "name" : "act_21",
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -3552,37 +4310,37 @@
},
{
"name" : "nop",
- "id" : 53,
+ "id" : 62,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "nop",
- "id" : 54,
+ "id" : 63,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "nop",
- "id" : 55,
+ "id" : 64,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "NoAction",
- "id" : 56,
+ "id" : 65,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "NoAction",
- "id" : 57,
+ "id" : 66,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 58,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -3595,7 +4353,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 191,
+ "line" : 251,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setValid()"
}
@@ -3614,7 +4372,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 192,
+ "line" : 252,
"column" : 8,
"source_fragment" : "gtpu_ipv4.version = 4"
}
@@ -3633,7 +4391,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 132,
"column" : 28,
"source_fragment" : "5; ..."
}
@@ -3652,7 +4410,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 194,
+ "line" : 254,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dscp = 0"
}
@@ -3671,7 +4429,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 195,
+ "line" : 255,
"column" : 8,
"source_fragment" : "gtpu_ipv4.ecn = 0"
}
@@ -3713,7 +4471,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 196,
+ "line" : 256,
"column" : 8,
"source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
}
@@ -3732,7 +4490,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 198,
+ "line" : 258,
"column" : 8,
"source_fragment" : "gtpu_ipv4.identification = 0x1513"
}
@@ -3751,7 +4509,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 199,
+ "line" : 259,
"column" : 8,
"source_fragment" : "gtpu_ipv4.flags = 0"
}
@@ -3770,7 +4528,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 200,
+ "line" : 260,
"column" : 8,
"source_fragment" : "gtpu_ipv4.frag_offset = 0"
}
@@ -3789,7 +4547,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 142,
+ "line" : 145,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3808,7 +4566,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 129,
"column" : 25,
"source_fragment" : "17; ..."
}
@@ -3818,37 +4576,37 @@
"parameters" : [
{
"type" : "field",
- "value" : ["gtpu_ipv4", "dst_addr"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 203,
- "column" : 8,
- "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
"value" : ["gtpu_ipv4", "src_addr"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 204,
+ "line" : 263,
"column" : 8,
- "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
+ "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 264,
+ "column" : 8,
+ "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr; ..."
}
},
{
@@ -3865,7 +4623,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 205,
+ "line" : 265,
"column" : 8,
"source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
}
@@ -3880,7 +4638,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 207,
+ "line" : 267,
"column" : 8,
"source_fragment" : "gtpu_udp.setValid()"
}
@@ -3899,7 +4657,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 208,
+ "line" : 268,
"column" : 8,
"source_fragment" : "gtpu_udp.sport = 2152"
}
@@ -3918,7 +4676,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 209,
+ "line" : 269,
"column" : 8,
"source_fragment" : "gtpu_udp.dport = 2152"
}
@@ -3942,7 +4700,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
},
"right" : {
"type" : "hexstr",
@@ -3960,7 +4718,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 210,
+ "line" : 270,
"column" : 8,
"source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
}
@@ -3979,7 +4737,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 212,
+ "line" : 272,
"column" : 8,
"source_fragment" : "gtpu_udp.checksum = 0"
}
@@ -3994,7 +4752,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 214,
+ "line" : 275,
"column" : 8,
"source_fragment" : "gtpu.setValid()"
}
@@ -4013,7 +4771,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 215,
+ "line" : 276,
"column" : 8,
"source_fragment" : "gtpu.version = 0x01"
}
@@ -4032,7 +4790,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 216,
+ "line" : 277,
"column" : 8,
"source_fragment" : "gtpu.pt = 0x01"
}
@@ -4051,7 +4809,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 217,
+ "line" : 278,
"column" : 8,
"source_fragment" : "gtpu.spare = 0"
}
@@ -4070,7 +4828,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 218,
+ "line" : 279,
"column" : 8,
"source_fragment" : "gtpu.ex_flag = 0"
}
@@ -4089,7 +4847,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 219,
+ "line" : 280,
"column" : 8,
"source_fragment" : "gtpu.seq_flag = 0"
}
@@ -4108,7 +4866,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 220,
+ "line" : 281,
"column" : 8,
"source_fragment" : "gtpu.npdu_flag = 0"
}
@@ -4127,7 +4885,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 221,
+ "line" : 282,
"column" : 8,
"source_fragment" : "gtpu.msgtype = 0xff"
}
@@ -4141,12 +4899,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 222,
+ "line" : 283,
"column" : 8,
"source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
}
@@ -4160,12 +4918,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 223,
+ "line" : 284,
"column" : 8,
"source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
}
@@ -4174,7 +4932,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
- "id" : 59,
+ "id" : 68,
"runtime_data" : [
{
"name" : "max_hop",
@@ -4242,7 +5000,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 157,
+ "line" : 160,
"column" : 36,
"source_fragment" : "4; ..."
}
@@ -4660,7 +5418,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 153,
+ "line" : 156,
"column" : 24,
"source_fragment" : "0x1; ..."
}
@@ -4669,7 +5427,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
- "id" : 60,
+ "id" : 69,
"runtime_data" : [
{
"name" : "switch_id",
@@ -4682,7 +5440,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit21"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
},
{
"type" : "expression",
@@ -4711,7 +5469,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
},
{
"type" : "runtime_data",
@@ -4729,13 +5487,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
- "id" : 61,
+ "id" : 70,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
- "id" : 62,
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -4809,7 +5567,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -4823,7 +5581,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -4851,7 +5609,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -4865,7 +5623,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -4892,7 +5650,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
- "id" : 63,
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -4934,7 +5692,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -4948,7 +5706,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -4976,7 +5734,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -4990,7 +5748,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -5017,7 +5775,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
- "id" : 64,
+ "id" : 73,
"runtime_data" : [],
"primitives" : [
{
@@ -5125,7 +5883,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -5139,7 +5897,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -5167,7 +5925,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -5181,7 +5939,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -5208,7 +5966,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
- "id" : 65,
+ "id" : 74,
"runtime_data" : [],
"primitives" : [
{
@@ -5295,7 +6053,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -5309,7 +6067,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -5337,7 +6095,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -5351,7 +6109,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -5378,7 +6136,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
- "id" : 66,
+ "id" : 75,
"runtime_data" : [],
"primitives" : [
{
@@ -5531,7 +6289,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -5545,7 +6303,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -5573,7 +6331,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -5587,7 +6345,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -5614,7 +6372,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
- "id" : 67,
+ "id" : 76,
"runtime_data" : [],
"primitives" : [
{
@@ -5735,7 +6493,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -5749,7 +6507,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -5777,7 +6535,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -5791,7 +6549,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -5818,7 +6576,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
- "id" : 68,
+ "id" : 77,
"runtime_data" : [],
"primitives" : [
{
@@ -6005,7 +6763,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6019,7 +6777,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6047,7 +6805,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6061,7 +6819,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6088,7 +6846,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
- "id" : 69,
+ "id" : 78,
"runtime_data" : [],
"primitives" : [
{
@@ -6115,7 +6873,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -6130,7 +6888,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6144,7 +6902,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6172,7 +6930,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6186,7 +6944,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6213,7 +6971,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
- "id" : 70,
+ "id" : 79,
"runtime_data" : [],
"primitives" : [
{
@@ -6306,7 +7064,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -6321,7 +7079,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6335,7 +7093,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6363,7 +7121,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6377,7 +7135,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6404,7 +7162,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
- "id" : 71,
+ "id" : 80,
"runtime_data" : [],
"primitives" : [
{
@@ -6465,7 +7223,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -6480,7 +7238,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6494,7 +7252,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6522,7 +7280,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6536,7 +7294,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6563,7 +7321,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
- "id" : 72,
+ "id" : 81,
"runtime_data" : [],
"primitives" : [
{
@@ -6690,7 +7448,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -6705,7 +7463,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6719,7 +7477,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6747,7 +7505,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6761,7 +7519,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6788,7 +7546,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
- "id" : 73,
+ "id" : 82,
"runtime_data" : [],
"primitives" : [
{
@@ -6894,7 +7652,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -6909,7 +7667,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -6923,7 +7681,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -6951,7 +7709,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -6965,7 +7723,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -6992,7 +7750,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
- "id" : 74,
+ "id" : 83,
"runtime_data" : [],
"primitives" : [
{
@@ -7164,7 +7922,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -7179,7 +7937,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -7193,7 +7951,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -7221,7 +7979,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -7235,7 +7993,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -7262,7 +8020,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
- "id" : 75,
+ "id" : 84,
"runtime_data" : [],
"primitives" : [
{
@@ -7402,7 +8160,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -7417,7 +8175,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -7431,7 +8189,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -7459,7 +8217,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -7473,7 +8231,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -7500,7 +8258,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
- "id" : 76,
+ "id" : 85,
"runtime_data" : [],
"primitives" : [
{
@@ -7706,7 +8464,7 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
}
],
"source_info" : {
@@ -7721,7 +8479,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -7735,7 +8493,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -7763,7 +8521,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -7777,7 +8535,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -7804,13 +8562,13 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
- "id" : 77,
+ "id" : 86,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
- "id" : 78,
+ "id" : 87,
"runtime_data" : [],
"primitives" : [
{
@@ -7852,7 +8610,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -7866,7 +8624,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -7894,7 +8652,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -7908,7 +8666,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -7935,7 +8693,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
- "id" : 79,
+ "id" : 88,
"runtime_data" : [],
"primitives" : [
{
@@ -7996,7 +8754,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8010,7 +8768,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8038,7 +8796,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8052,7 +8810,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -8079,7 +8837,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
- "id" : 80,
+ "id" : 89,
"runtime_data" : [],
"primitives" : [
{
@@ -8174,7 +8932,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8188,7 +8946,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8216,7 +8974,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8230,7 +8988,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -8257,7 +9015,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
- "id" : 81,
+ "id" : 90,
"runtime_data" : [],
"primitives" : [
{
@@ -8322,7 +9080,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8336,7 +9094,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8364,7 +9122,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8378,7 +9136,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -8405,7 +9163,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
- "id" : 82,
+ "id" : 91,
"runtime_data" : [],
"primitives" : [
{
@@ -8504,7 +9262,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8518,7 +9276,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8546,7 +9304,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8560,7 +9318,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -8587,7 +9345,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
- "id" : 83,
+ "id" : 92,
"runtime_data" : [],
"primitives" : [
{
@@ -8705,7 +9463,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8719,7 +9477,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8747,7 +9505,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8761,7 +9519,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -8788,7 +9546,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
- "id" : 84,
+ "id" : 93,
"runtime_data" : [],
"primitives" : [
{
@@ -8940,7 +9698,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -8954,7 +9712,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -8982,7 +9740,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -8996,7 +9754,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9023,7 +9781,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
- "id" : 85,
+ "id" : 94,
"runtime_data" : [],
"primitives" : [
{
@@ -9065,7 +9823,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -9079,7 +9837,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -9107,7 +9865,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -9121,7 +9879,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9148,7 +9906,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
- "id" : 86,
+ "id" : 95,
"runtime_data" : [],
"primitives" : [
{
@@ -9224,7 +9982,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -9238,7 +9996,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -9266,7 +10024,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -9280,7 +10038,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9307,7 +10065,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
- "id" : 87,
+ "id" : 96,
"runtime_data" : [],
"primitives" : [
{
@@ -9402,7 +10160,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -9416,7 +10174,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -9444,7 +10202,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -9458,7 +10216,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9485,7 +10243,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
- "id" : 88,
+ "id" : 97,
"runtime_data" : [],
"primitives" : [
{
@@ -9614,7 +10372,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -9628,7 +10386,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -9656,7 +10414,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -9670,7 +10428,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9697,7 +10455,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
- "id" : 89,
+ "id" : 98,
"runtime_data" : [],
"primitives" : [
{
@@ -9796,7 +10554,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -9810,7 +10568,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -9838,7 +10596,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -9852,7 +10610,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -9879,7 +10637,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
- "id" : 90,
+ "id" : 99,
"runtime_data" : [],
"primitives" : [
{
@@ -10012,7 +10770,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -10026,7 +10784,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -10054,7 +10812,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -10068,7 +10826,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -10095,7 +10853,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
- "id" : 91,
+ "id" : 100,
"runtime_data" : [],
"primitives" : [
{
@@ -10247,7 +11005,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -10261,7 +11019,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -10289,7 +11047,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -10303,7 +11061,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -10330,7 +11088,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
- "id" : 92,
+ "id" : 101,
"runtime_data" : [],
"primitives" : [
{
@@ -10516,7 +11274,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
{
"type" : "expression",
@@ -10530,7 +11288,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
},
"right" : {
"type" : "hexstr",
@@ -10558,7 +11316,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
{
"type" : "expression",
@@ -10572,7 +11330,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
},
"right" : {
"type" : "hexstr",
@@ -10599,7 +11357,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 93,
+ "id" : 102,
"runtime_data" : [],
"primitives" : [
{
@@ -10640,7 +11398,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 94,
+ "id" : 103,
"runtime_data" : [],
"primitives" : [
{
@@ -10748,7 +11506,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -10757,7 +11515,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 95,
+ "id" : 104,
"runtime_data" : [],
"primitives" : [
{
@@ -10827,7 +11585,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -10855,7 +11613,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 96,
+ "id" : 105,
"runtime_data" : [],
"primitives" : [
{
@@ -10876,8 +11634,8 @@
]
},
{
- "name" : "act_19",
- "id" : 97,
+ "name" : "act_22",
+ "id" : 106,
"runtime_data" : [],
"primitives" : [
{
@@ -10893,8 +11651,8 @@
]
},
{
- "name" : "act_20",
- "id" : 98,
+ "name" : "act_23",
+ "id" : 107,
"runtime_data" : [],
"primitives" : [
{
@@ -10944,8 +11702,8 @@
]
},
{
- "name" : "act_21",
- "id" : 99,
+ "name" : "act_24",
+ "id" : 108,
"runtime_data" : [],
"primitives" : [
{
@@ -10966,8 +11724,8 @@
]
},
{
- "name" : "act_22",
- "id" : 100,
+ "name" : "act_25",
+ "id" : 109,
"runtime_data" : [],
"primitives" : [
{
@@ -10996,8 +11754,8 @@
]
},
{
- "name" : "act_23",
- "id" : 101,
+ "name" : "act_26",
+ "id" : 110,
"runtime_data" : [],
"primitives" : [
{
@@ -11026,8 +11784,8 @@
]
},
{
- "name" : "act_24",
- "id" : 102,
+ "name" : "act_27",
+ "id" : 111,
"runtime_data" : [],
"primitives" : [
{
@@ -11048,8 +11806,8 @@
]
},
{
- "name" : "act_25",
- "id" : 103,
+ "name" : "act_28",
+ "id" : 112,
"runtime_data" : [],
"primitives" : [
{
@@ -11097,8 +11855,8 @@
]
},
{
- "name" : "act_26",
- "id" : 104,
+ "name" : "act_29",
+ "id" : 113,
"runtime_data" : [],
"primitives" : [
{
@@ -11119,8 +11877,8 @@
]
},
{
- "name" : "act_27",
- "id" : 105,
+ "name" : "act_30",
+ "id" : 114,
"runtime_data" : [],
"primitives" : [
{
@@ -11168,8 +11926,34 @@
]
},
{
- "name" : "act_28",
- "id" : 106,
+ "name" : "act_31",
+ "id" : 115,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricEgress.spgw_egress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_32",
+ "id" : 116,
"runtime_data" : [],
"primitives" : [
{
@@ -11198,8 +11982,8 @@
]
},
{
- "name" : "act_29",
- "id" : 107,
+ "name" : "act_33",
+ "id" : 117,
"runtime_data" : [],
"primitives" : [
{
@@ -11234,8 +12018,8 @@
]
},
{
- "name" : "act_30",
- "id" : 108,
+ "name" : "act_34",
+ "id" : 118,
"runtime_data" : [],
"primitives" : [
{
@@ -11261,7 +12045,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
}
}
},
@@ -11283,8 +12067,8 @@
]
},
{
- "name" : "act_31",
- "id" : 109,
+ "name" : "act_35",
+ "id" : 119,
"runtime_data" : [],
"primitives" : [
{
@@ -11332,8 +12116,8 @@
]
},
{
- "name" : "act_32",
- "id" : 110,
+ "name" : "act_36",
+ "id" : 120,
"runtime_data" : [],
"primitives" : [
{
@@ -11359,7 +12143,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
}
}
},
@@ -11381,8 +12165,8 @@
]
},
{
- "name" : "act_33",
- "id" : 111,
+ "name" : "act_37",
+ "id" : 121,
"runtime_data" : [],
"primitives" : [
{
@@ -11408,7 +12192,7 @@
},
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
}
}
},
@@ -11458,14 +12242,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34],
+ "action_ids" : [40],
"actions" : ["act_0"],
"base_default_next" : "node_3",
"next_tables" : {
"act_0" : "node_3"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11476,7 +12260,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
},
@@ -11487,14 +12271,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
+ "action_ids" : [39],
"actions" : ["act"],
"base_default_next" : "node_5",
"next_tables" : {
"act" : "node_5"
},
"default_entry" : {
- "action_id" : 33,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11505,7 +12289,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
},
@@ -11516,14 +12300,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [43],
"actions" : ["act_3"],
"base_default_next" : "node_7",
"next_tables" : {
"act_3" : "node_7"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11534,7 +12318,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "="
},
@@ -11545,14 +12329,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
+ "action_ids" : [41],
"actions" : ["act_1"],
"base_default_next" : "node_10",
"next_tables" : {
"act_1" : "node_10"
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11563,7 +12347,7 @@
"id" : 4,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
},
@@ -11574,14 +12358,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36],
+ "action_ids" : [42],
"actions" : ["act_2"],
"base_default_next" : "node_10",
"next_tables" : {
"act_2" : "node_10"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 42,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11603,14 +12387,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
+ "action_ids" : [44],
"actions" : ["act_4"],
"base_default_next" : "node_12",
"next_tables" : {
"act_4" : "node_12"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11632,14 +12416,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [45],
"actions" : ["act_5"],
"base_default_next" : "node_14",
"next_tables" : {
"act_5" : "node_14"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11661,14 +12445,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [46],
"actions" : ["act_6"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
"act_6" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11709,7 +12493,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [13, 14, 15],
+ "action_ids" : [19, 20, 21],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -11718,7 +12502,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 13,
+ "action_id" : 19,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11765,14 +12549,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16],
+ "action_ids" : [22],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "tbl_act_7",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
},
"default_entry" : {
- "action_id" : 16,
+ "action_id" : 22,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -11788,27 +12572,27 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
+ "action_ids" : [55],
"actions" : ["act_15"],
"base_default_next" : "node_19",
"next_tables" : {
"act_15" : "node_19"
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
+ "name" : "FabricIngress.spgw_ingress.uplink_filter_table",
"id" : 11,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 83,
+ "line" : 84,
"column" : 10,
- "source_fragment" : "s1u_filter_table"
+ "source_fragment" : "uplink_filter_table"
},
"key" : [
{
@@ -11848,14 +12632,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [47],
"actions" : ["act_7"],
"base_default_next" : "node_23",
"next_tables" : {
"act_7" : "node_23"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11871,14 +12655,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [48],
"actions" : ["act_8"],
"base_default_next" : "node_23",
"next_tables" : {
"act_8" : "node_23"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11889,7 +12673,7 @@
"id" : 14,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -11900,14 +12684,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [49],
"actions" : ["act_9"],
"base_default_next" : "tbl_act_11",
"next_tables" : {
"act_9" : "tbl_act_11"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11918,7 +12702,7 @@
"id" : 15,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 151,
+ "line" : 189,
"column" : 39,
"source_fragment" : "="
},
@@ -11929,14 +12713,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [50],
"actions" : ["act_10"],
"base_default_next" : "tbl_spgw_ingress_gtpu_decap",
"next_tables" : {
"act_10" : "tbl_spgw_ingress_gtpu_decap"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11947,7 +12731,7 @@
"id" : 16,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 152,
+ "line" : 190,
"column" : 12,
"source_fragment" : "gtpu_decap()"
},
@@ -11958,44 +12742,44 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10],
+ "action_ids" : [12],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_33",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
},
"default_entry" : {
- "action_id" : 10,
+ "action_id" : 12,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
+ "name" : "FabricIngress.spgw_ingress.downlink_filter_table",
"id" : 17,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 70,
+ "line" : 73,
"column" : 10,
- "source_fragment" : "dl_sess_lookup"
+ "source_fragment" : "downlink_filter_table"
},
"key" : [
{
- "match_type" : "exact",
- "name" : "ipv4_dst",
+ "match_type" : "lpm",
+ "name" : "ipv4_prefix",
"target" : ["ipv4", "dst_addr"],
"mask" : null
}
],
- "match_type" : "exact",
+ "match_type" : "lpm",
"type" : "simple",
"max_size" : 1024,
- "with_counters" : true,
+ "with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 0],
- "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
+ "action_ids" : [0],
+ "actions" : ["nop"],
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_act_12",
@@ -12018,14 +12802,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [51],
"actions" : ["act_11"],
"base_default_next" : "node_30",
"next_tables" : {
"act_11" : "node_30"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12041,14 +12825,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [52],
"actions" : ["act_12"],
"base_default_next" : "node_30",
"next_tables" : {
"act_12" : "node_30"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12059,7 +12843,7 @@
"id" : 20,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 154,
+ "line" : 192,
"column" : 39,
"source_fragment" : "="
},
@@ -12070,14 +12854,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [53],
"actions" : ["act_13"],
"base_default_next" : "node_33",
"next_tables" : {
"act_13" : "node_33"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12088,7 +12872,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 156,
+ "line" : 194,
"column" : 39,
"source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
},
@@ -12099,25 +12883,313 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
+ "action_ids" : [54],
"actions" : ["act_14"],
"base_default_next" : "node_33",
"next_tables" : {
"act_14" : "node_33"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_16",
+ "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
"id" : 22,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 111,
+ "column" : 10,
+ "source_fragment" : "uplink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [14, 11],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+ "NoAction" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 11,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "id" : 23,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 103,
+ "column" : 10,
+ "source_fragment" : "downlink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [13, 10],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+ "NoAction" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 10,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "tbl_act_16",
+ "id" : 24,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [56],
+ "actions" : ["act_16"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "act_16" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 56,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "id" : 25,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 123,
+ "column" : 10,
+ "source_fragment" : "flexible_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "ternary",
+ "name" : "spgw_direction",
+ "target" : ["scalars", "fabric_metadata_t._spgw_direction17"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_src",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_dst",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ip_proto",
+ "target" : ["ipv4", "protocol"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_sport",
+ "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_dport",
+ "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "ternary",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [15],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+ "base_default_next" : "tbl_act_17",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_17"
+ },
+ "default_entry" : {
+ "action_id" : 15,
+ "action_const" : true,
+ "action_data" : ["0x0", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_17",
+ "id" : 26,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [57],
+ "actions" : ["act_17"],
+ "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+ "next_tables" : {
+ "act_17" : "FabricIngress.spgw_ingress.far_lookup"
+ },
+ "default_entry" : {
+ "action_id" : 57,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.far_lookup",
+ "id" : 27,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 168,
+ "column" : 10,
+ "source_fragment" : "far_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "far_id",
+ "target" : ["scalars", "fabric_metadata_t._spgw_far_id23"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [16, 17],
+ "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
+ "base_default_next" : "node_44",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_44",
+ "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_44"
+ },
+ "default_entry" : {
+ "action_id" : 16,
+ "action_const" : true,
+ "action_data" : ["0x1", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_18",
+ "id" : 28,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [58],
+ "actions" : ["act_18"],
+ "base_default_next" : "tbl_act_19",
+ "next_tables" : {
+ "act_18" : "tbl_act_19"
+ },
+ "default_entry" : {
+ "action_id" : 58,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_19",
+ "id" : 29,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 232,
"column" : 34,
"source_fragment" : "="
},
@@ -12128,14 +13200,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
- "actions" : ["act_16"],
- "base_default_next" : "node_35",
+ "action_ids" : [59],
+ "actions" : ["act_19"],
+ "base_default_next" : "node_47",
"next_tables" : {
- "act_16" : "node_35"
+ "act_19" : "node_47"
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 59,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12143,7 +13215,7 @@
},
{
"name" : "FabricIngress.forwarding.bridging",
- "id" : 23,
+ "id" : 30,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 46,
@@ -12170,7 +13242,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17, 3],
+ "action_ids" : [23, 3],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -12186,7 +13258,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 24,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 71,
@@ -12207,7 +13279,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [18, 4],
+ "action_ids" : [24, 4],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -12223,7 +13295,7 @@
},
{
"name" : "FabricIngress.forwarding.routing_v4",
- "id" : 25,
+ "id" : 32,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 108,
@@ -12234,7 +13306,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
"mask" : null
}
],
@@ -12244,7 +13316,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 20, 5],
+ "action_ids" : [25, 26, 5],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -12261,7 +13333,7 @@
},
{
"name" : "FabricIngress.acl.acl",
- "id" : 26,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/acl.p4",
"line" : 60,
@@ -12348,18 +13420,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [21, 22, 23, 24, 25],
+ "action_ids" : [27, 28, 29, 30, 31],
"actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
- "base_default_next" : "node_43",
+ "base_default_next" : "node_55",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_43",
- "FabricIngress.acl.punt_to_cpu" : "node_43",
- "FabricIngress.acl.set_clone_session_id" : "node_43",
- "FabricIngress.acl.drop" : "node_43",
- "FabricIngress.acl.nop_acl" : "node_43"
+ "FabricIngress.acl.set_next_id_acl" : "node_55",
+ "FabricIngress.acl.punt_to_cpu" : "node_55",
+ "FabricIngress.acl.set_clone_session_id" : "node_55",
+ "FabricIngress.acl.drop" : "node_55",
+ "FabricIngress.acl.nop_acl" : "node_55"
},
"default_entry" : {
- "action_id" : 25,
+ "action_id" : 31,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12367,7 +13439,7 @@
},
{
"name" : "FabricIngress.next.xconnect",
- "id" : 27,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 119,
@@ -12394,7 +13466,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 28, 7],
+ "action_ids" : [33, 34, 7],
"actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
@@ -12411,7 +13483,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 28,
+ "id" : 35,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 202,
@@ -12433,7 +13505,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [29, 30, 31, 8],
+ "action_ids" : [35, 36, 37, 8],
"actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
@@ -12445,7 +13517,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 29,
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 236,
@@ -12466,7 +13538,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32, 9],
+ "action_ids" : [38, 9],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
"base_default_next" : "FabricIngress.next.next_vlan",
"next_tables" : {
@@ -12482,7 +13554,7 @@
},
{
"name" : "FabricIngress.next.next_vlan",
- "id" : 30,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 86,
@@ -12503,12 +13575,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [26, 6],
+ "action_ids" : [32, 6],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
- "base_default_next" : "node_48",
+ "base_default_next" : "node_60",
"next_tables" : {
- "FabricIngress.next.set_vlan" : "node_48",
- "nop" : "node_48"
+ "FabricIngress.next.set_vlan" : "node_60",
+ "nop" : "node_60"
},
"default_entry" : {
"action_id" : 6,
@@ -12518,8 +13590,8 @@
}
},
{
- "name" : "tbl_act_17",
- "id" : 31,
+ "name" : "tbl_act_20",
+ "id" : 38,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -12533,22 +13605,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51],
- "actions" : ["act_17"],
- "base_default_next" : "node_50",
+ "action_ids" : [60],
+ "actions" : ["act_20"],
+ "base_default_next" : "node_62",
"next_tables" : {
- "act_17" : "node_50"
+ "act_20" : "node_62"
},
"default_entry" : {
- "action_id" : 51,
+ "action_id" : 60,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_18",
- "id" : 32,
+ "name" : "tbl_act_21",
+ "id" : 39,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -12562,14 +13634,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
- "actions" : ["act_18"],
+ "action_ids" : [61],
+ "actions" : ["act_21"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
"next_tables" : {
- "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
+ "act_21" : "FabricIngress.process_set_source_sink.tb_set_source"
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12577,7 +13649,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.tb_set_source",
- "id" : 33,
+ "id" : 40,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 46,
@@ -12598,7 +13670,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 2],
+ "action_ids" : [18, 2],
"actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
"base_default_next" : null,
"next_tables" : {
@@ -12629,11 +13701,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
},
{
"type" : "field",
@@ -12657,7 +13729,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 12,
"source_fragment" : "! is_gtpu_encapped"
},
@@ -12711,7 +13783,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 34,
+ "line" : 38,
"column" : 12,
"source_fragment" : "inner_udp.isValid()"
},
@@ -12810,7 +13882,7 @@
"id" : 6,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 144,
+ "line" : 181,
"column" : 12,
"source_fragment" : "gtpu.isValid()"
},
@@ -12825,17 +13897,17 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
- "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
+ "true_next" : "FabricIngress.spgw_ingress.uplink_filter_table",
+ "false_next" : "FabricIngress.spgw_ingress.downlink_filter_table"
},
{
"name" : "node_23",
"id" : 7,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 148,
+ "line" : 185,
"column" : 16,
- "source_fragment" : "!s1u_filter_table.apply().hit"
+ "source_fragment" : "!uplink_filter_table.apply().hit"
},
"expression" : {
"type" : "expression",
@@ -12896,13 +13968,155 @@
}
}
},
- "true_next" : "tbl_act_16",
- "false_next" : "node_35"
+ "true_next" : "node_34",
+ "false_next" : "node_39"
},
{
- "name" : "node_35",
+ "name" : "node_34",
"id" : 10,
"source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 201,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_UPLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+ "false_next" : "node_36"
+ },
+ {
+ "name" : "node_36",
+ "id" : 11,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 203,
+ "column" : 19,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x02"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "false_next" : "tbl_act_16"
+ },
+ {
+ "name" : "node_39",
+ "id" : 12,
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "not",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "node_40",
+ "false_next" : "node_47"
+ },
+ {
+ "name" : "node_40",
+ "id" : 13,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 209,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.pdr_hit == false"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : false
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "false_next" : "tbl_act_17"
+ },
+ {
+ "name" : "node_44",
+ "id" : 14,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 220,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.far_dropped == true"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ },
+ "true_next" : "tbl_act_18",
+ "false_next" : "tbl_act_19"
+ },
+ {
+ "name" : "node_47",
+ "id" : 15,
+ "source_info" : {
"filename" : "fabric.p4",
"line" : 71,
"column" : 12,
@@ -12929,12 +14143,12 @@
}
}
},
- "true_next" : "node_36",
+ "true_next" : "node_48",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_36",
- "id" : 11,
+ "name" : "node_48",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 150,
@@ -12956,11 +14170,11 @@
}
},
"true_next" : "FabricIngress.forwarding.bridging",
- "false_next" : "node_38"
+ "false_next" : "node_50"
},
{
- "name" : "node_38",
- "id" : 12,
+ "name" : "node_50",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 151,
@@ -12982,11 +14196,11 @@
}
},
"true_next" : "FabricIngress.forwarding.mpls",
- "false_next" : "node_40"
+ "false_next" : "node_52"
},
{
- "name" : "node_40",
- "id" : 13,
+ "name" : "node_52",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 152,
@@ -13011,8 +14225,8 @@
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_43",
- "id" : 14,
+ "name" : "node_55",
+ "id" : 19,
"source_info" : {
"filename" : "fabric.p4",
"line" : 75,
@@ -13044,8 +14258,8 @@
"true_next" : "FabricIngress.next.xconnect"
},
{
- "name" : "node_48",
- "id" : 15,
+ "name" : "node_60",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -13066,12 +14280,12 @@
}
}
},
- "true_next" : "tbl_act_17",
- "false_next" : "node_50"
+ "true_next" : "tbl_act_20",
+ "false_next" : "node_62"
},
{
- "name" : "node_50",
- "id" : 16,
+ "name" : "node_62",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -13092,7 +14306,7 @@
}
}
},
- "true_next" : "tbl_act_18",
+ "true_next" : "tbl_act_21",
"false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
}
]
@@ -13106,11 +14320,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_55",
+ "init_table" : "node_67",
"tables" : [
{
- "name" : "tbl_act_19",
- "id" : 34,
+ "name" : "tbl_act_22",
+ "id" : 41,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -13124,22 +14338,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [97],
- "actions" : ["act_19"],
- "base_default_next" : "node_57",
+ "action_ids" : [106],
+ "actions" : ["act_22"],
+ "base_default_next" : "node_69",
"next_tables" : {
- "act_19" : "node_57"
+ "act_22" : "node_69"
},
"default_entry" : {
- "action_id" : 97,
+ "action_id" : 106,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_20",
- "id" : 35,
+ "name" : "tbl_act_23",
+ "id" : 42,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -13153,22 +14367,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [98],
- "actions" : ["act_20"],
- "base_default_next" : "node_59",
+ "action_ids" : [107],
+ "actions" : ["act_23"],
+ "base_default_next" : "node_71",
"next_tables" : {
- "act_20" : "node_59"
+ "act_23" : "node_71"
},
"default_entry" : {
- "action_id" : 98,
+ "action_id" : 107,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_21",
- "id" : 36,
+ "name" : "tbl_act_24",
+ "id" : 43,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 337,
@@ -13182,14 +14396,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [99],
- "actions" : ["act_21"],
- "base_default_next" : "node_61",
+ "action_ids" : [108],
+ "actions" : ["act_24"],
+ "base_default_next" : "node_73",
"next_tables" : {
- "act_21" : "node_61"
+ "act_24" : "node_73"
},
"default_entry" : {
- "action_id" : 99,
+ "action_id" : 108,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13197,7 +14411,7 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 37,
+ "id" : 44,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -13211,14 +14425,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [93],
+ "action_ids" : [102],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 93,
+ "action_id" : 102,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13226,7 +14440,7 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 38,
+ "id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 343,
@@ -13240,14 +14454,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [94],
+ "action_ids" : [103],
"actions" : ["FabricEgress.egress_next.set_mpls"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 94,
+ "action_id" : 103,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13255,7 +14469,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 39,
+ "id" : 46,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 320,
@@ -13282,23 +14496,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [96, 55],
+ "action_ids" : [105, 64],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_22",
- "__MISS__" : "tbl_act_23"
+ "__HIT__" : "tbl_act_25",
+ "__MISS__" : "tbl_act_26"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_22",
- "id" : 40,
+ "name" : "tbl_act_25",
+ "id" : 47,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13306,22 +14520,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [100],
- "actions" : ["act_22"],
- "base_default_next" : "node_68",
+ "action_ids" : [109],
+ "actions" : ["act_25"],
+ "base_default_next" : "node_80",
"next_tables" : {
- "act_22" : "node_68"
+ "act_25" : "node_80"
},
"default_entry" : {
- "action_id" : 100,
+ "action_id" : 109,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_23",
- "id" : 41,
+ "name" : "tbl_act_26",
+ "id" : 48,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13329,14 +14543,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [101],
- "actions" : ["act_23"],
- "base_default_next" : "node_68",
+ "action_ids" : [110],
+ "actions" : ["act_26"],
+ "base_default_next" : "node_80",
"next_tables" : {
- "act_23" : "node_68"
+ "act_26" : "node_80"
},
"default_entry" : {
- "action_id" : 101,
+ "action_id" : 110,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13344,7 +14558,7 @@
},
{
"name" : "tbl_egress_next_push_vlan",
- "id" : 42,
+ "id" : 49,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 360,
@@ -13358,22 +14572,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [95],
+ "action_ids" : [104],
"actions" : ["FabricEgress.egress_next.push_vlan"],
- "base_default_next" : "node_71",
+ "base_default_next" : "node_83",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_71"
+ "FabricEgress.egress_next.push_vlan" : "node_83"
},
"default_entry" : {
- "action_id" : 95,
+ "action_id" : 104,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_24",
- "id" : 43,
+ "name" : "tbl_act_27",
+ "id" : 50,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 369,
@@ -13387,22 +14601,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [103],
- "actions" : ["act_25"],
- "base_default_next" : "node_73",
+ "action_ids" : [112],
+ "actions" : ["act_28"],
+ "base_default_next" : "node_85",
"next_tables" : {
- "act_25" : "node_73"
+ "act_28" : "node_85"
},
"default_entry" : {
- "action_id" : 103,
+ "action_id" : 112,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_25",
- "id" : 44,
+ "name" : "tbl_act_28",
+ "id" : 51,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -13416,22 +14630,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [102],
- "actions" : ["act_24"],
- "base_default_next" : "node_79",
+ "action_ids" : [111],
+ "actions" : ["act_27"],
+ "base_default_next" : "tbl_act_31",
"next_tables" : {
- "act_24" : "node_79"
+ "act_27" : "tbl_act_31"
},
"default_entry" : {
- "action_id" : 102,
+ "action_id" : 111,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_26",
- "id" : 45,
+ "name" : "tbl_act_29",
+ "id" : 52,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 373,
@@ -13445,22 +14659,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [105],
- "actions" : ["act_27"],
- "base_default_next" : "node_77",
+ "action_ids" : [114],
+ "actions" : ["act_30"],
+ "base_default_next" : "node_89",
"next_tables" : {
- "act_27" : "node_77"
+ "act_30" : "node_89"
},
"default_entry" : {
- "action_id" : 105,
+ "action_id" : 114,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_27",
- "id" : 46,
+ "name" : "tbl_act_30",
+ "id" : 53,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -13474,14 +14688,43 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [104],
- "actions" : ["act_26"],
- "base_default_next" : "node_79",
+ "action_ids" : [113],
+ "actions" : ["act_29"],
+ "base_default_next" : "tbl_act_31",
"next_tables" : {
- "act_26" : "node_79"
+ "act_29" : "tbl_act_31"
},
"default_entry" : {
- "action_id" : 104,
+ "action_id" : 113,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_31",
+ "id" : 54,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [115],
+ "actions" : ["act_31"],
+ "base_default_next" : "node_92",
+ "next_tables" : {
+ "act_31" : "node_92"
+ },
+ "default_entry" : {
+ "action_id" : 115,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13489,10 +14732,10 @@
},
{
"name" : "tbl_spgw_egress_gtpu_encap",
- "id" : 47,
+ "id" : 55,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 228,
+ "line" : 291,
"column" : 12,
"source_fragment" : "gtpu_encap()"
},
@@ -13503,14 +14746,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
+ "action_ids" : [67],
"actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
- "base_default_next" : "node_81",
+ "base_default_next" : "node_94",
"next_tables" : {
- "FabricEgress.spgw_egress.gtpu_encap" : "node_81"
+ "FabricEgress.spgw_egress.gtpu_encap" : "node_94"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13518,7 +14761,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "id" : 48,
+ "id" : 56,
"source_info" : {
"filename" : "include/int/int_source.p4",
"line" : 66,
@@ -13557,23 +14800,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59, 53],
+ "action_ids" : [68, 62],
"actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
- "base_default_next" : "node_84",
+ "base_default_next" : "node_97",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
- "nop" : "node_84"
+ "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_97",
+ "nop" : "node_97"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_28",
- "id" : 49,
+ "name" : "tbl_act_32",
+ "id" : 57,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13581,14 +14824,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [106],
- "actions" : ["act_28"],
+ "action_ids" : [116],
+ "actions" : ["act_32"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
"next_tables" : {
- "act_28" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+ "act_32" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
},
"default_entry" : {
- "action_id" : 106,
+ "action_id" : 116,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13596,7 +14839,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
- "id" : 50,
+ "id" : 58,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 315,
@@ -13617,23 +14860,23 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [60, 54],
+ "action_ids" : [69, 63],
"actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
- "base_default_next" : "node_87",
+ "base_default_next" : "node_100",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
- "nop" : "node_87"
+ "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_100",
+ "nop" : "node_100"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_29",
- "id" : 51,
+ "name" : "tbl_act_33",
+ "id" : 59,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 420,
@@ -13647,14 +14890,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [107],
- "actions" : ["act_29"],
- "base_default_next" : "node_89",
+ "action_ids" : [117],
+ "actions" : ["act_33"],
+ "base_default_next" : "node_102",
"next_tables" : {
- "act_29" : "node_89"
+ "act_33" : "node_102"
},
"default_entry" : {
- "action_id" : 107,
+ "action_id" : 117,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -13662,7 +14905,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
- "id" : 52,
+ "id" : 60,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 331,
@@ -13683,7 +14926,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 56],
+ "action_ids" : [70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 65],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -13706,7 +14949,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 65,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -13726,7 +14969,7 @@
}
],
"action_entry" : {
- "action_id" : 61,
+ "action_id" : 70,
"action_data" : []
},
"priority" : 1
@@ -13745,7 +14988,7 @@
}
],
"action_entry" : {
- "action_id" : 62,
+ "action_id" : 71,
"action_data" : []
},
"priority" : 2
@@ -13764,7 +15007,7 @@
}
],
"action_entry" : {
- "action_id" : 63,
+ "action_id" : 72,
"action_data" : []
},
"priority" : 3
@@ -13783,7 +15026,7 @@
}
],
"action_entry" : {
- "action_id" : 64,
+ "action_id" : 73,
"action_data" : []
},
"priority" : 4
@@ -13802,7 +15045,7 @@
}
],
"action_entry" : {
- "action_id" : 65,
+ "action_id" : 74,
"action_data" : []
},
"priority" : 5
@@ -13821,7 +15064,7 @@
}
],
"action_entry" : {
- "action_id" : 66,
+ "action_id" : 75,
"action_data" : []
},
"priority" : 6
@@ -13840,7 +15083,7 @@
}
],
"action_entry" : {
- "action_id" : 67,
+ "action_id" : 76,
"action_data" : []
},
"priority" : 7
@@ -13859,7 +15102,7 @@
}
],
"action_entry" : {
- "action_id" : 68,
+ "action_id" : 77,
"action_data" : []
},
"priority" : 8
@@ -13878,7 +15121,7 @@
}
],
"action_entry" : {
- "action_id" : 69,
+ "action_id" : 78,
"action_data" : []
},
"priority" : 9
@@ -13897,7 +15140,7 @@
}
],
"action_entry" : {
- "action_id" : 70,
+ "action_id" : 79,
"action_data" : []
},
"priority" : 10
@@ -13916,7 +15159,7 @@
}
],
"action_entry" : {
- "action_id" : 71,
+ "action_id" : 80,
"action_data" : []
},
"priority" : 11
@@ -13935,7 +15178,7 @@
}
],
"action_entry" : {
- "action_id" : 72,
+ "action_id" : 81,
"action_data" : []
},
"priority" : 12
@@ -13954,7 +15197,7 @@
}
],
"action_entry" : {
- "action_id" : 73,
+ "action_id" : 82,
"action_data" : []
},
"priority" : 13
@@ -13973,7 +15216,7 @@
}
],
"action_entry" : {
- "action_id" : 74,
+ "action_id" : 83,
"action_data" : []
},
"priority" : 14
@@ -13992,7 +15235,7 @@
}
],
"action_entry" : {
- "action_id" : 75,
+ "action_id" : 84,
"action_data" : []
},
"priority" : 15
@@ -14011,7 +15254,7 @@
}
],
"action_entry" : {
- "action_id" : 76,
+ "action_id" : 85,
"action_data" : []
},
"priority" : 16
@@ -14020,7 +15263,7 @@
},
{
"name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
- "id" : 53,
+ "id" : 61,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 375,
@@ -14041,30 +15284,30 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 57],
+ "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 66],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
- "base_default_next" : "tbl_act_30",
+ "base_default_next" : "tbl_act_34",
"next_tables" : {
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_30",
- "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_30",
- "NoAction" : "tbl_act_30"
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_34",
+ "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_34",
+ "NoAction" : "tbl_act_34"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 66,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -14084,7 +15327,7 @@
}
],
"action_entry" : {
- "action_id" : 77,
+ "action_id" : 86,
"action_data" : []
},
"priority" : 1
@@ -14103,7 +15346,7 @@
}
],
"action_entry" : {
- "action_id" : 78,
+ "action_id" : 87,
"action_data" : []
},
"priority" : 2
@@ -14122,7 +15365,7 @@
}
],
"action_entry" : {
- "action_id" : 79,
+ "action_id" : 88,
"action_data" : []
},
"priority" : 3
@@ -14141,7 +15384,7 @@
}
],
"action_entry" : {
- "action_id" : 80,
+ "action_id" : 89,
"action_data" : []
},
"priority" : 4
@@ -14160,7 +15403,7 @@
}
],
"action_entry" : {
- "action_id" : 81,
+ "action_id" : 90,
"action_data" : []
},
"priority" : 5
@@ -14179,7 +15422,7 @@
}
],
"action_entry" : {
- "action_id" : 82,
+ "action_id" : 91,
"action_data" : []
},
"priority" : 6
@@ -14198,7 +15441,7 @@
}
],
"action_entry" : {
- "action_id" : 83,
+ "action_id" : 92,
"action_data" : []
},
"priority" : 7
@@ -14217,7 +15460,7 @@
}
],
"action_entry" : {
- "action_id" : 84,
+ "action_id" : 93,
"action_data" : []
},
"priority" : 8
@@ -14236,7 +15479,7 @@
}
],
"action_entry" : {
- "action_id" : 85,
+ "action_id" : 94,
"action_data" : []
},
"priority" : 9
@@ -14255,7 +15498,7 @@
}
],
"action_entry" : {
- "action_id" : 86,
+ "action_id" : 95,
"action_data" : []
},
"priority" : 10
@@ -14274,7 +15517,7 @@
}
],
"action_entry" : {
- "action_id" : 87,
+ "action_id" : 96,
"action_data" : []
},
"priority" : 11
@@ -14293,7 +15536,7 @@
}
],
"action_entry" : {
- "action_id" : 88,
+ "action_id" : 97,
"action_data" : []
},
"priority" : 12
@@ -14312,7 +15555,7 @@
}
],
"action_entry" : {
- "action_id" : 89,
+ "action_id" : 98,
"action_data" : []
},
"priority" : 13
@@ -14331,7 +15574,7 @@
}
],
"action_entry" : {
- "action_id" : 90,
+ "action_id" : 99,
"action_data" : []
},
"priority" : 14
@@ -14350,7 +15593,7 @@
}
],
"action_entry" : {
- "action_id" : 91,
+ "action_id" : 100,
"action_data" : []
},
"priority" : 15
@@ -14369,7 +15612,7 @@
}
],
"action_entry" : {
- "action_id" : 92,
+ "action_id" : 101,
"action_data" : []
},
"priority" : 16
@@ -14377,8 +15620,8 @@
]
},
{
- "name" : "tbl_act_30",
- "id" : 54,
+ "name" : "tbl_act_34",
+ "id" : 62,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 425,
@@ -14392,22 +15635,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [109],
- "actions" : ["act_31"],
- "base_default_next" : "node_93",
+ "action_ids" : [119],
+ "actions" : ["act_35"],
+ "base_default_next" : "node_106",
"next_tables" : {
- "act_31" : "node_93"
+ "act_35" : "node_106"
},
"default_entry" : {
- "action_id" : 109,
+ "action_id" : 119,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_31",
- "id" : 55,
+ "name" : "tbl_act_35",
+ "id" : 63,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 428,
@@ -14421,22 +15664,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [108],
- "actions" : ["act_30"],
- "base_default_next" : "node_95",
+ "action_ids" : [118],
+ "actions" : ["act_34"],
+ "base_default_next" : "node_108",
"next_tables" : {
- "act_30" : "node_95"
+ "act_34" : "node_108"
},
"default_entry" : {
- "action_id" : 108,
+ "action_id" : 118,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_32",
- "id" : 56,
+ "name" : "tbl_act_36",
+ "id" : 64,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 431,
@@ -14450,22 +15693,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [110],
- "actions" : ["act_32"],
- "base_default_next" : "node_97",
+ "action_ids" : [120],
+ "actions" : ["act_36"],
+ "base_default_next" : "node_110",
"next_tables" : {
- "act_32" : "node_97"
+ "act_36" : "node_110"
},
"default_entry" : {
- "action_id" : 110,
+ "action_id" : 120,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_33",
- "id" : 57,
+ "name" : "tbl_act_37",
+ "id" : 65,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 434,
@@ -14479,14 +15722,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [111],
- "actions" : ["act_33"],
+ "action_ids" : [121],
+ "actions" : ["act_37"],
"base_default_next" : null,
"next_tables" : {
- "act_33" : null
+ "act_37" : null
},
"default_entry" : {
- "action_id" : 111,
+ "action_id" : 121,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -14496,8 +15739,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_55",
- "id" : 17,
+ "name" : "node_67",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 39,
@@ -14525,12 +15768,12 @@
}
}
},
- "true_next" : "tbl_act_19",
- "false_next" : "node_57"
+ "true_next" : "tbl_act_22",
+ "false_next" : "node_69"
},
{
- "name" : "node_57",
- "id" : 18,
+ "name" : "node_69",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -14551,12 +15794,12 @@
}
}
},
- "true_next" : "tbl_act_20",
- "false_next" : "node_59"
+ "true_next" : "tbl_act_23",
+ "false_next" : "node_71"
},
{
- "name" : "node_59",
- "id" : 19,
+ "name" : "node_71",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 335,
@@ -14604,12 +15847,12 @@
}
}
},
- "true_next" : "tbl_act_21",
- "false_next" : "node_61"
+ "true_next" : "tbl_act_24",
+ "false_next" : "node_73"
},
{
- "name" : "node_61",
- "id" : 20,
+ "name" : "node_73",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 340,
@@ -14630,12 +15873,12 @@
}
}
},
- "true_next" : "node_62",
+ "true_next" : "node_74",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_62",
- "id" : 21,
+ "name" : "node_74",
+ "id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -14657,8 +15900,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_68",
- "id" : 22,
+ "name" : "node_80",
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 357,
@@ -14683,12 +15926,12 @@
}
}
},
- "true_next" : "node_69",
- "false_next" : "node_71"
+ "true_next" : "node_81",
+ "false_next" : "node_83"
},
{
- "name" : "node_69",
- "id" : 23,
+ "name" : "node_81",
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 359,
@@ -14710,11 +15953,11 @@
}
},
"true_next" : "tbl_egress_next_push_vlan",
- "false_next" : "node_71"
+ "false_next" : "node_83"
},
{
- "name" : "node_71",
- "id" : 24,
+ "name" : "node_83",
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 368,
@@ -14732,12 +15975,12 @@
}
}
},
- "true_next" : "tbl_act_24",
- "false_next" : "node_75"
+ "true_next" : "tbl_act_27",
+ "false_next" : "node_87"
},
{
- "name" : "node_73",
- "id" : 25,
+ "name" : "node_85",
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -14758,12 +16001,12 @@
}
}
},
- "true_next" : "tbl_act_25",
- "false_next" : "node_79"
+ "true_next" : "tbl_act_28",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_75",
- "id" : 26,
+ "name" : "node_87",
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 372,
@@ -14781,12 +16024,12 @@
}
}
},
- "true_next" : "tbl_act_26",
- "false_next" : "node_79"
+ "true_next" : "tbl_act_29",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_77",
- "id" : 27,
+ "name" : "node_89",
+ "id" : 32,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -14807,38 +16050,45 @@
}
}
},
- "true_next" : "tbl_act_27",
- "false_next" : "node_79"
+ "true_next" : "tbl_act_30",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_79",
- "id" : 28,
+ "name" : "node_92",
+ "id" : 33,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 227,
+ "line" : 290,
"column" : 12,
- "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ "source_fragment" : "fabric_meta.spgw.outer_header_creation == true"
},
"expression" : {
"type" : "expression",
"value" : {
"op" : "==",
"left" : {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+ }
+ }
},
"right" : {
- "type" : "hexstr",
- "value" : "0x02"
+ "type" : "bool",
+ "value" : true
}
}
},
"true_next" : "tbl_spgw_egress_gtpu_encap",
- "false_next" : "node_81"
+ "false_next" : "node_94"
},
{
- "name" : "node_81",
- "id" : 29,
+ "name" : "node_94",
+ "id" : 34,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 102,
@@ -14914,11 +16164,11 @@
}
},
"false_next" : null,
- "true_next" : "node_82"
+ "true_next" : "node_95"
},
{
- "name" : "node_82",
- "id" : 30,
+ "name" : "node_95",
+ "id" : 35,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 106,
@@ -14936,7 +16186,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_source20"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
}
}
},
@@ -14947,11 +16197,11 @@
}
},
"true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
- "false_next" : "node_84"
+ "false_next" : "node_97"
},
{
- "name" : "node_84",
- "id" : 31,
+ "name" : "node_97",
+ "id" : 36,
"source_info" : {
"filename" : "include/int/int_main.p4",
"line" : 110,
@@ -14970,11 +16220,11 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_28"
+ "true_next" : "tbl_act_32"
},
{
- "name" : "node_87",
- "id" : 32,
+ "name" : "node_100",
+ "id" : 37,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 419,
@@ -14992,7 +16242,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._int_meta_transit21"]
+ "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
}
}
},
@@ -15002,12 +16252,12 @@
}
}
},
- "true_next" : "tbl_act_29",
- "false_next" : "node_89"
+ "true_next" : "tbl_act_33",
+ "false_next" : "node_102"
},
{
- "name" : "node_89",
- "id" : 33,
+ "name" : "node_102",
+ "id" : 38,
"expression" : {
"type" : "expression",
"value" : {
@@ -15030,8 +16280,8 @@
"true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
},
{
- "name" : "node_93",
- "id" : 34,
+ "name" : "node_106",
+ "id" : 39,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 427,
@@ -15049,12 +16299,12 @@
}
}
},
- "true_next" : "tbl_act_31",
- "false_next" : "node_95"
+ "true_next" : "tbl_act_35",
+ "false_next" : "node_108"
},
{
- "name" : "node_95",
- "id" : 35,
+ "name" : "node_108",
+ "id" : 40,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 430,
@@ -15072,12 +16322,12 @@
}
}
},
- "true_next" : "tbl_act_32",
- "false_next" : "node_97"
+ "true_next" : "tbl_act_36",
+ "false_next" : "node_110"
},
{
- "name" : "node_97",
- "id" : 36,
+ "name" : "node_110",
+ "id" : 41,
"source_info" : {
"filename" : "include/int/int_transit.p4",
"line" : 433,
@@ -15096,7 +16346,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_33"
+ "true_next" : "tbl_act_37"
}
]
}
@@ -15133,7 +16383,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index e99b94e..a009b3d 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -3,33 +3,27 @@
}
tables {
preamble {
- id: 33582731
- name: "FabricIngress.spgw_ingress.dl_sess_lookup"
- alias: "dl_sess_lookup"
+ id: 33586632
+ name: "FabricIngress.spgw_ingress.downlink_filter_table"
+ alias: "downlink_filter_table"
}
match_fields {
id: 1
- name: "ipv4_dst"
+ name: "ipv4_prefix"
bitwidth: 32
- match_type: EXACT
- }
- action_refs {
- id: 16804065
+ match_type: LPM
}
action_refs {
id: 16819938
- annotations: "@defaultonly"
- scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
- direct_resource_ids: 318781522
size: 1024
}
tables {
preamble {
- id: 33615906
- name: "FabricIngress.spgw_ingress.s1u_filter_table"
- alias: "s1u_filter_table"
+ id: 33567046
+ name: "FabricIngress.spgw_ingress.uplink_filter_table"
+ alias: "uplink_filter_table"
}
match_fields {
id: 1
@@ -45,6 +39,143 @@
}
tables {
preamble {
+ id: 33586958
+ name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+ alias: "downlink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33587070
+ name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
+ alias: "uplink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "teid"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 3
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33582573
+ name: "FabricIngress.spgw_ingress.flexible_pdr_lookup"
+ alias: "flexible_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "spgw_direction"
+ bitwidth: 2
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 2
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 3
+ name: "teid"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 4
+ name: "ipv4_src"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 5
+ name: "ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 6
+ name: "ip_proto"
+ bitwidth: 8
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 7
+ name: "l4_sport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 8
+ name: "l4_dport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ action_refs {
+ id: 16799934
+ }
+ const_default_action_id: 16799934
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33613200
+ name: "FabricIngress.spgw_ingress.far_lookup"
+ alias: "far_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "far_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16834935
+ }
+ action_refs {
+ id: 16787606
+ }
+ const_default_action_id: 16834935
+ size: 1024
+}
+tables {
+ preamble {
id: 33581620
name: "FabricIngress.process_set_source_sink.tb_set_source"
alias: "tb_set_source"
@@ -533,23 +664,74 @@
}
actions {
preamble {
- id: 16804065
- name: "FabricIngress.spgw_ingress.set_dl_sess_info"
- alias: "set_dl_sess_info"
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
+ id: 16799934
+ name: "FabricIngress.spgw_ingress.set_pdr_attributes"
+ alias: "set_pdr_attributes"
}
params {
id: 1
- name: "teid"
+ name: "ctr_id"
bitwidth: 32
}
params {
id: 2
- name: "s1u_enb_addr"
+ name: "far_id"
bitwidth: 32
}
+}
+actions {
+ preamble {
+ id: 16834935
+ name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
+ alias: "load_normal_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
+}
+actions {
+ preamble {
+ id: 16787606
+ name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
+ alias: "load_tunnel_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
params {
id: 3
- name: "s1u_sgw_addr"
+ name: "tunnel_src_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 4
+ name: "tunnel_dst_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 5
+ name: "teid"
bitwidth: 32
}
}
@@ -797,13 +979,6 @@
}
actions {
preamble {
- id: 16800567
- name: "NoAction"
- alias: "NoAction"
- }
-}
-actions {
- preamble {
id: 16785857
name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
alias: "int_source_dscp"
@@ -861,6 +1036,17 @@
}
counters {
preamble {
+ id: 302029884
+ name: "FabricIngress.spgw_ingress.pdr_counter"
+ alias: "spgw_ingress.pdr_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ size: 1024
+}
+counters {
+ preamble {
id: 302011205
name: "FabricIngress.port_counters_control.egress_port_counter"
alias: "egress_port_counter"
@@ -881,16 +1067,16 @@
}
size: 511
}
-direct_counters {
+counters {
preamble {
- id: 318781522
- name: "FabricIngress.spgw_ingress.ue_counter"
- alias: "ue_counter"
+ id: 302012289
+ name: "FabricEgress.spgw_egress.pdr_counter"
+ alias: "spgw_egress.pdr_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33582731
+ size: 1024
}
direct_counters {
preamble {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 87c94f3..e0a3285 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -30,12 +30,20 @@
["fabric_metadata_t._ip_proto12", 8, false],
["fabric_metadata_t._l4_sport13", 16, false],
["fabric_metadata_t._l4_dport14", 16, false],
- ["fabric_metadata_t._spgw_direction15", 2, false],
- ["fabric_metadata_t._spgw_ipv4_len16", 16, false],
- ["fabric_metadata_t._spgw_teid17", 32, false],
- ["fabric_metadata_t._spgw_s1u_enb_addr18", 32, false],
- ["fabric_metadata_t._spgw_s1u_sgw_addr19", 32, false],
- ["_padding_0", 2, false]
+ ["fabric_metadata_t._ipv4_src_addr15", 32, false],
+ ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
+ ["fabric_metadata_t._spgw_direction17", 2, false],
+ ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+ ["fabric_metadata_t._spgw_teid19", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_src_addr20", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_dst_addr21", 32, false],
+ ["fabric_metadata_t._spgw_ctr_id22", 32, false],
+ ["fabric_metadata_t._spgw_far_id23", 32, false],
+ ["fabric_metadata_t._spgw_pdr_hit24", 1, false],
+ ["fabric_metadata_t._spgw_far_dropped25", 1, false],
+ ["fabric_metadata_t._spgw_notify_cp26", 1, false],
+ ["fabric_metadata_t._spgw_outer_header_creation27", 1, false],
+ ["_padding_0", 6, false]
]
},
{
@@ -698,6 +706,32 @@
}
],
"op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
}
],
"transitions" : [
@@ -1049,7 +1083,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1059,16 +1093,16 @@
"meter_arrays" : [],
"counter_arrays" : [
{
- "name" : "FabricIngress.spgw_ingress.ue_counter",
+ "name" : "FabricIngress.spgw_ingress.pdr_counter",
"id" : 0,
- "is_direct" : true,
- "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup",
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 52,
- "column" : 50,
- "source_fragment" : "ue_counter"
- }
+ "line" : 56,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
},
{
"name" : "FabricIngress.filtering.ingress_port_vlan_counter",
@@ -1203,8 +1237,20 @@
"is_direct" : false
},
{
- "name" : "FabricEgress.egress_next.egress_vlan_counter",
+ "name" : "FabricEgress.spgw_egress.pdr_counter",
"id" : 12,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 246,
+ "column" : 49,
+ "source_fragment" : "pdr_counter"
+ },
+ "size" : 1024,
+ "is_direct" : false
+ },
+ {
+ "name" : "FabricEgress.egress_next.egress_vlan_counter",
+ "id" : 13,
"is_direct" : true,
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
@@ -1283,7 +1329,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
@@ -1458,11 +1504,99 @@
"primitives" : []
},
{
- "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "name" : "NoAction",
"id" : 9,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 10,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+ "id" : 11,
+ "runtime_data" : [],
"primitives" : [
{
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu", "teid"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 61,
+ "column" : 30,
+ "source_fragment" : "= gtpu.teid; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ },
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 62,
+ "column" : 41,
+ "source_fragment" : "= gtpu_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 64,
+ "column" : 34,
+ "source_fragment" : "= ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 65,
+ "column" : 34,
+ "source_fragment" : "= ipv4.dst_addr; ..."
+ }
+ },
+ {
"op" : "remove_header",
"parameters" : [
{
@@ -1472,7 +1606,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 56,
+ "line" : 67,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setInvalid()"
}
@@ -1487,7 +1621,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 57,
+ "line" : 68,
"column" : 8,
"source_fragment" : "gtpu_udp.setInvalid()"
}
@@ -1502,7 +1636,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 58,
+ "line" : 69,
"column" : 8,
"source_fragment" : "gtpu.setInvalid()"
}
@@ -1510,19 +1644,15 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 10,
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 12,
"runtime_data" : [
{
- "name" : "teid",
+ "name" : "ctr_id",
"bitwidth" : 32
},
{
- "name" : "s1u_enb_addr",
- "bitwidth" : 32
- },
- {
- "name" : "s1u_sgw_addr",
+ "name" : "far_id",
"bitwidth" : 32
}
],
@@ -1532,7 +1662,36 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
},
{
"type" : "runtime_data",
@@ -1541,7 +1700,440 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 64,
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 13,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+ "id" : 14,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 97,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 98,
+ "column" : 32,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 99,
+ "column" : 32,
+ "source_fragment" : "= far_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+ "id" : 15,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 146,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 147,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+ "id" : 16,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "tunnel_src_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "tunnel_dst_addr",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "teid",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 0
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 155,
+ "column" : 37,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 1
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 156,
+ "column" : 35,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 158,
+ "column" : 47,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 4
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 159,
"column" : 30,
"source_fragment" : "= teid; ..."
}
@@ -1551,26 +2143,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 65,
- "column" : 38,
- "source_fragment" : "= s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
},
{
"type" : "runtime_data",
@@ -1579,16 +2152,73 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 66,
- "column" : 38,
- "source_fragment" : "= s1u_sgw_addr; ..."
+ "line" : 160,
+ "column" : 41,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 161,
+ "column" : 41,
+ "source_fragment" : "= tunnel_dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 163,
+ "column" : 34,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 164,
+ "column" : 34,
+ "source_fragment" : "= tunnel_dst_addr; ..."
}
}
]
},
{
"name" : "FabricIngress.filtering.deny",
- "id" : 11,
+ "id" : 17,
"runtime_data" : [],
"primitives" : [
{
@@ -1653,13 +2283,13 @@
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 12,
+ "id" : 18,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 13,
+ "id" : 19,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -1690,7 +2320,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 14,
+ "id" : 20,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -1721,7 +2351,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 15,
+ "id" : 21,
"runtime_data" : [
{
"name" : "next_id",
@@ -1752,7 +2382,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 16,
+ "id" : 22,
"runtime_data" : [
{
"name" : "next_id",
@@ -1802,7 +2432,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 17,
+ "id" : 23,
"runtime_data" : [
{
"name" : "next_id",
@@ -1833,13 +2463,13 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 18,
+ "id" : 24,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 19,
+ "id" : 25,
"runtime_data" : [
{
"name" : "next_id",
@@ -1870,7 +2500,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 20,
+ "id" : 26,
"runtime_data" : [],
"primitives" : [
{
@@ -1925,7 +2555,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 21,
+ "id" : 27,
"runtime_data" : [
{
"name" : "clone_id",
@@ -1956,7 +2586,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 22,
+ "id" : 28,
"runtime_data" : [],
"primitives" : [
{
@@ -2007,13 +2637,13 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 23,
+ "id" : 29,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.next.set_vlan",
- "id" : 24,
+ "id" : 30,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -2044,7 +2674,7 @@
},
{
"name" : "FabricIngress.next.output_xconnect",
- "id" : 25,
+ "id" : 31,
"runtime_data" : [
{
"name" : "port_num",
@@ -2075,7 +2705,7 @@
},
{
"name" : "FabricIngress.next.set_next_id_xconnect",
- "id" : 26,
+ "id" : 32,
"runtime_data" : [
{
"name" : "next_id",
@@ -2106,7 +2736,7 @@
},
{
"name" : "FabricIngress.next.output_hashed",
- "id" : 27,
+ "id" : 33,
"runtime_data" : [
{
"name" : "port_num",
@@ -2137,7 +2767,7 @@
},
{
"name" : "FabricIngress.next.routing_hashed",
- "id" : 28,
+ "id" : 34,
"runtime_data" : [
{
"name" : "port_num",
@@ -2214,7 +2844,7 @@
},
{
"name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 29,
+ "id" : 35,
"runtime_data" : [
{
"name" : "port_num",
@@ -2314,7 +2944,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 30,
+ "id" : 36,
"runtime_data" : [
{
"name" : "group_id",
@@ -2374,7 +3004,7 @@
},
{
"name" : "act",
- "id" : 31,
+ "id" : 37,
"runtime_data" : [],
"primitives" : [
{
@@ -2401,7 +3031,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
}
@@ -2410,7 +3040,7 @@
},
{
"name" : "act_0",
- "id" : 32,
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -2470,7 +3100,7 @@
},
{
"name" : "act_1",
- "id" : 33,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -2487,7 +3117,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "= inner_udp; ..."
}
@@ -2496,7 +3126,7 @@
},
{
"name" : "act_2",
- "id" : 34,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -2509,7 +3139,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
}
@@ -2518,7 +3148,7 @@
},
{
"name" : "act_3",
- "id" : 35,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -2535,7 +3165,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
}
@@ -2554,7 +3184,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 32,
+ "line" : 36,
"column" : 13,
"source_fragment" : "= inner_ipv4; ..."
}
@@ -2573,7 +3203,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 33,
+ "line" : 37,
"column" : 17,
"source_fragment" : "= udp; ..."
}
@@ -2582,7 +3212,7 @@
},
{
"name" : "act_4",
- "id" : 36,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -2662,7 +3292,7 @@
},
{
"name" : "act_5",
- "id" : 37,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -2726,7 +3356,7 @@
},
{
"name" : "act_6",
- "id" : 38,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -2752,7 +3382,7 @@
},
{
"name" : "act_7",
- "id" : 39,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -2782,7 +3412,7 @@
},
{
"name" : "act_8",
- "id" : 40,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -2812,7 +3442,7 @@
},
{
"name" : "act_9",
- "id" : 41,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -2825,7 +3455,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -2834,7 +3464,7 @@
},
{
"name" : "act_10",
- "id" : 42,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -2842,7 +3472,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -2851,7 +3481,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 147,
+ "line" : 150,
"column" : 36,
"source_fragment" : "2w1; ..."
}
@@ -2860,7 +3490,7 @@
},
{
"name" : "act_11",
- "id" : 43,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -2890,7 +3520,7 @@
},
{
"name" : "act_12",
- "id" : 44,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -2920,7 +3550,7 @@
},
{
"name" : "act_13",
- "id" : 45,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -2928,7 +3558,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -2937,7 +3567,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 148,
+ "line" : 151,
"column" : 38,
"source_fragment" : "2w2; ..."
}
@@ -2946,7 +3576,7 @@
},
{
"name" : "act_14",
- "id" : 46,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -2954,7 +3584,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
},
{
"type" : "hexstr",
@@ -2963,7 +3593,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 146,
+ "line" : 149,
"column" : 37,
"source_fragment" : "2w0; ..."
}
@@ -2992,7 +3622,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 158,
+ "line" : 196,
"column" : 12,
"source_fragment" : "return"
}
@@ -3001,7 +3631,7 @@
},
{
"name" : "act_15",
- "id" : 47,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -3031,7 +3661,7 @@
},
{
"name" : "act_16",
- "id" : 48,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -3039,7 +3669,134 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_17",
+ "id" : 55,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricIngress.spgw_ingress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_18",
+ "id" : 56,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 224,
+ "column" : 34,
+ "source_fragment" : "= true; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_19",
+ "id" : 57,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
},
{
"type" : "field",
@@ -3048,7 +3805,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 232,
"column" : 34,
"source_fragment" : "= ipv4.total_len; ..."
}
@@ -3056,8 +3813,8 @@
]
},
{
- "name" : "act_17",
- "id" : 49,
+ "name" : "act_20",
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -3114,8 +3871,8 @@
]
},
{
- "name" : "act_18",
- "id" : 50,
+ "name" : "act_21",
+ "id" : 59,
"runtime_data" : [],
"primitives" : [
{
@@ -3173,13 +3930,13 @@
},
{
"name" : "nop",
- "id" : 51,
+ "id" : 60,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 52,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -3192,7 +3949,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 191,
+ "line" : 251,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setValid()"
}
@@ -3211,7 +3968,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 192,
+ "line" : 252,
"column" : 8,
"source_fragment" : "gtpu_ipv4.version = 4"
}
@@ -3230,7 +3987,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 132,
"column" : 28,
"source_fragment" : "5; ..."
}
@@ -3249,7 +4006,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 194,
+ "line" : 254,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dscp = 0"
}
@@ -3268,7 +4025,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 195,
+ "line" : 255,
"column" : 8,
"source_fragment" : "gtpu_ipv4.ecn = 0"
}
@@ -3310,7 +4067,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 196,
+ "line" : 256,
"column" : 8,
"source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
}
@@ -3329,7 +4086,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 198,
+ "line" : 258,
"column" : 8,
"source_fragment" : "gtpu_ipv4.identification = 0x1513"
}
@@ -3348,7 +4105,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 199,
+ "line" : 259,
"column" : 8,
"source_fragment" : "gtpu_ipv4.flags = 0"
}
@@ -3367,7 +4124,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 200,
+ "line" : 260,
"column" : 8,
"source_fragment" : "gtpu_ipv4.frag_offset = 0"
}
@@ -3386,7 +4143,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 142,
+ "line" : 145,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -3405,7 +4162,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 129,
"column" : 25,
"source_fragment" : "17; ..."
}
@@ -3415,37 +4172,37 @@
"parameters" : [
{
"type" : "field",
- "value" : ["gtpu_ipv4", "dst_addr"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
- }
- ],
- "source_info" : {
- "filename" : "include/spgw.p4",
- "line" : 203,
- "column" : 8,
- "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
"value" : ["gtpu_ipv4", "src_addr"]
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 204,
+ "line" : 263,
"column" : 8,
- "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
+ "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["gtpu_ipv4", "dst_addr"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 264,
+ "column" : 8,
+ "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr; ..."
}
},
{
@@ -3462,7 +4219,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 205,
+ "line" : 265,
"column" : 8,
"source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
}
@@ -3477,7 +4234,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 207,
+ "line" : 267,
"column" : 8,
"source_fragment" : "gtpu_udp.setValid()"
}
@@ -3496,7 +4253,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 208,
+ "line" : 268,
"column" : 8,
"source_fragment" : "gtpu_udp.sport = 2152"
}
@@ -3515,7 +4272,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 209,
+ "line" : 269,
"column" : 8,
"source_fragment" : "gtpu_udp.dport = 2152"
}
@@ -3539,7 +4296,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
},
"right" : {
"type" : "hexstr",
@@ -3557,7 +4314,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 210,
+ "line" : 270,
"column" : 8,
"source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
}
@@ -3576,7 +4333,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 212,
+ "line" : 272,
"column" : 8,
"source_fragment" : "gtpu_udp.checksum = 0"
}
@@ -3591,7 +4348,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 214,
+ "line" : 275,
"column" : 8,
"source_fragment" : "gtpu.setValid()"
}
@@ -3610,7 +4367,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 215,
+ "line" : 276,
"column" : 8,
"source_fragment" : "gtpu.version = 0x01"
}
@@ -3629,7 +4386,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 216,
+ "line" : 277,
"column" : 8,
"source_fragment" : "gtpu.pt = 0x01"
}
@@ -3648,7 +4405,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 217,
+ "line" : 278,
"column" : 8,
"source_fragment" : "gtpu.spare = 0"
}
@@ -3667,7 +4424,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 218,
+ "line" : 279,
"column" : 8,
"source_fragment" : "gtpu.ex_flag = 0"
}
@@ -3686,7 +4443,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 219,
+ "line" : 280,
"column" : 8,
"source_fragment" : "gtpu.seq_flag = 0"
}
@@ -3705,7 +4462,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 220,
+ "line" : 281,
"column" : 8,
"source_fragment" : "gtpu.npdu_flag = 0"
}
@@ -3724,7 +4481,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 221,
+ "line" : 282,
"column" : 8,
"source_fragment" : "gtpu.msgtype = 0xff"
}
@@ -3738,12 +4495,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 222,
+ "line" : 283,
"column" : 8,
"source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
}
@@ -3757,12 +4514,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
}
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 223,
+ "line" : 284,
"column" : 8,
"source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
}
@@ -3771,7 +4528,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 53,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -3812,7 +4569,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 54,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -3920,7 +4677,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -3929,7 +4686,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 55,
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -3999,7 +4756,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -4027,7 +4784,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 56,
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -4048,8 +4805,8 @@
]
},
{
- "name" : "act_19",
- "id" : 57,
+ "name" : "act_22",
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -4065,8 +4822,8 @@
]
},
{
- "name" : "act_20",
- "id" : 58,
+ "name" : "act_23",
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -4116,8 +4873,8 @@
]
},
{
- "name" : "act_21",
- "id" : 59,
+ "name" : "act_24",
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -4138,8 +4895,8 @@
]
},
{
- "name" : "act_22",
- "id" : 60,
+ "name" : "act_25",
+ "id" : 69,
"runtime_data" : [],
"primitives" : [
{
@@ -4168,8 +4925,8 @@
]
},
{
- "name" : "act_23",
- "id" : 61,
+ "name" : "act_26",
+ "id" : 70,
"runtime_data" : [],
"primitives" : [
{
@@ -4198,8 +4955,8 @@
]
},
{
- "name" : "act_24",
- "id" : 62,
+ "name" : "act_27",
+ "id" : 71,
"runtime_data" : [],
"primitives" : [
{
@@ -4220,8 +4977,8 @@
]
},
{
- "name" : "act_25",
- "id" : 63,
+ "name" : "act_28",
+ "id" : 72,
"runtime_data" : [],
"primitives" : [
{
@@ -4269,8 +5026,8 @@
]
},
{
- "name" : "act_26",
- "id" : 64,
+ "name" : "act_29",
+ "id" : 73,
"runtime_data" : [],
"primitives" : [
{
@@ -4291,8 +5048,8 @@
]
},
{
- "name" : "act_27",
- "id" : 65,
+ "name" : "act_30",
+ "id" : 74,
"runtime_data" : [],
"primitives" : [
{
@@ -4338,6 +5095,32 @@
}
}
]
+ },
+ {
+ "name" : "act_31",
+ "id" : 75,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "count",
+ "parameters" : [
+ {
+ "type" : "counter_array",
+ "value" : "FabricEgress.spgw_egress.pdr_counter"
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ }
+ }
+ ]
}
],
"pipelines" : [
@@ -4368,14 +5151,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32],
+ "action_ids" : [38],
"actions" : ["act_0"],
"base_default_next" : "node_3",
"next_tables" : {
"act_0" : "node_3"
},
"default_entry" : {
- "action_id" : 32,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4386,7 +5169,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 32,
"source_fragment" : "return"
},
@@ -4397,14 +5180,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31],
+ "action_ids" : [37],
"actions" : ["act"],
"base_default_next" : "node_5",
"next_tables" : {
"act" : "node_5"
},
"default_entry" : {
- "action_id" : 31,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4415,7 +5198,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 31,
+ "line" : 35,
"column" : 18,
"source_fragment" : "= ipv4; ..."
},
@@ -4426,14 +5209,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
+ "action_ids" : [41],
"actions" : ["act_3"],
"base_default_next" : "node_7",
"next_tables" : {
"act_3" : "node_7"
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4444,7 +5227,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 35,
+ "line" : 39,
"column" : 16,
"source_fragment" : "="
},
@@ -4455,14 +5238,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
+ "action_ids" : [39],
"actions" : ["act_1"],
"base_default_next" : "node_10",
"next_tables" : {
"act_1" : "node_10"
},
"default_entry" : {
- "action_id" : 33,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4473,7 +5256,7 @@
"id" : 4,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 37,
+ "line" : 41,
"column" : 12,
"source_fragment" : "udp.setInvalid()"
},
@@ -4484,14 +5267,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34],
+ "action_ids" : [40],
"actions" : ["act_2"],
"base_default_next" : "node_10",
"next_tables" : {
"act_2" : "node_10"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4513,14 +5296,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36],
+ "action_ids" : [42],
"actions" : ["act_4"],
"base_default_next" : "node_12",
"next_tables" : {
"act_4" : "node_12"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 42,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4542,14 +5325,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [43],
"actions" : ["act_5"],
"base_default_next" : "node_14",
"next_tables" : {
"act_5" : "node_14"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4571,14 +5354,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
+ "action_ids" : [44],
"actions" : ["act_6"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
"act_6" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4619,7 +5402,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 12, 13],
+ "action_ids" : [17, 18, 19],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -4628,7 +5411,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 11,
+ "action_id" : 17,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4675,14 +5458,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [14],
+ "action_ids" : [20],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "tbl_act_7",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
},
"default_entry" : {
- "action_id" : 14,
+ "action_id" : 20,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -4698,27 +5481,27 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [53],
"actions" : ["act_15"],
"base_default_next" : "node_19",
"next_tables" : {
"act_15" : "node_19"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
+ "name" : "FabricIngress.spgw_ingress.uplink_filter_table",
"id" : 11,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 83,
+ "line" : 84,
"column" : 10,
- "source_fragment" : "s1u_filter_table"
+ "source_fragment" : "uplink_filter_table"
},
"key" : [
{
@@ -4758,14 +5541,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [45],
"actions" : ["act_7"],
"base_default_next" : "node_23",
"next_tables" : {
"act_7" : "node_23"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4781,14 +5564,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [46],
"actions" : ["act_8"],
"base_default_next" : "node_23",
"next_tables" : {
"act_8" : "node_23"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4799,7 +5582,7 @@
"id" : 14,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 149,
+ "line" : 187,
"column" : 16,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -4810,14 +5593,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [47],
"actions" : ["act_9"],
"base_default_next" : "tbl_act_11",
"next_tables" : {
"act_9" : "tbl_act_11"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4828,7 +5611,7 @@
"id" : 15,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 151,
+ "line" : 189,
"column" : 39,
"source_fragment" : "="
},
@@ -4839,14 +5622,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [48],
"actions" : ["act_10"],
"base_default_next" : "tbl_spgw_ingress_gtpu_decap",
"next_tables" : {
"act_10" : "tbl_spgw_ingress_gtpu_decap"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4857,7 +5640,7 @@
"id" : 16,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 152,
+ "line" : 190,
"column" : 12,
"source_fragment" : "gtpu_decap()"
},
@@ -4868,44 +5651,44 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [9],
+ "action_ids" : [11],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_33",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
},
"default_entry" : {
- "action_id" : 9,
+ "action_id" : 11,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
+ "name" : "FabricIngress.spgw_ingress.downlink_filter_table",
"id" : 17,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 70,
+ "line" : 73,
"column" : 10,
- "source_fragment" : "dl_sess_lookup"
+ "source_fragment" : "downlink_filter_table"
},
"key" : [
{
- "match_type" : "exact",
- "name" : "ipv4_dst",
+ "match_type" : "lpm",
+ "name" : "ipv4_prefix",
"target" : ["ipv4", "dst_addr"],
"mask" : null
}
],
- "match_type" : "exact",
+ "match_type" : "lpm",
"type" : "simple",
"max_size" : 1024,
- "with_counters" : true,
+ "with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10, 0],
- "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
+ "action_ids" : [0],
+ "actions" : ["nop"],
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_act_12",
@@ -4928,14 +5711,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [49],
"actions" : ["act_11"],
"base_default_next" : "node_30",
"next_tables" : {
"act_11" : "node_30"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4951,14 +5734,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [50],
"actions" : ["act_12"],
"base_default_next" : "node_30",
"next_tables" : {
"act_12" : "node_30"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4969,7 +5752,7 @@
"id" : 20,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 154,
+ "line" : 192,
"column" : 39,
"source_fragment" : "="
},
@@ -4980,14 +5763,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [51],
"actions" : ["act_13"],
"base_default_next" : "node_33",
"next_tables" : {
"act_13" : "node_33"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4998,7 +5781,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 156,
+ "line" : 194,
"column" : 39,
"source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
},
@@ -5009,25 +5792,313 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [52],
"actions" : ["act_14"],
"base_default_next" : "node_33",
"next_tables" : {
"act_14" : "node_33"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_16",
+ "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
"id" : 22,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 175,
+ "line" : 111,
+ "column" : 10,
+ "source_fragment" : "uplink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+ "mask" : null
+ },
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [13, 10],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+ "NoAction" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 10,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "id" : 23,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 103,
+ "column" : 10,
+ "source_fragment" : "downlink_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "ue_addr",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [12, 9],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+ "NoAction" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 9,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "tbl_act_16",
+ "id" : 24,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 206,
+ "column" : 12,
+ "source_fragment" : "return"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [54],
+ "actions" : ["act_16"],
+ "base_default_next" : "node_39",
+ "next_tables" : {
+ "act_16" : "node_39"
+ },
+ "default_entry" : {
+ "action_id" : 54,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "id" : 25,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 123,
+ "column" : 10,
+ "source_fragment" : "flexible_pdr_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "ternary",
+ "name" : "spgw_direction",
+ "target" : ["scalars", "fabric_metadata_t._spgw_direction17"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "tunnel_ipv4_dst",
+ "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "teid",
+ "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_src",
+ "target" : ["ipv4", "src_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ipv4_dst",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "ip_proto",
+ "target" : ["ipv4", "protocol"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_sport",
+ "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+ "mask" : null
+ },
+ {
+ "match_type" : "ternary",
+ "name" : "l4_dport",
+ "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "ternary",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [14],
+ "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+ "base_default_next" : "tbl_act_17",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_17"
+ },
+ "default_entry" : {
+ "action_id" : 14,
+ "action_const" : true,
+ "action_data" : ["0x0", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_17",
+ "id" : 26,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 213,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [55],
+ "actions" : ["act_17"],
+ "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+ "next_tables" : {
+ "act_17" : "FabricIngress.spgw_ingress.far_lookup"
+ },
+ "default_entry" : {
+ "action_id" : 55,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "FabricIngress.spgw_ingress.far_lookup",
+ "id" : 27,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 168,
+ "column" : 10,
+ "source_fragment" : "far_lookup"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "far_id",
+ "target" : ["scalars", "fabric_metadata_t._spgw_far_id23"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [15, 16],
+ "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
+ "base_default_next" : "node_44",
+ "next_tables" : {
+ "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_44",
+ "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_44"
+ },
+ "default_entry" : {
+ "action_id" : 15,
+ "action_const" : true,
+ "action_data" : ["0x1", "0x0"],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_18",
+ "id" : 28,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 223,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [56],
+ "actions" : ["act_18"],
+ "base_default_next" : "tbl_act_19",
+ "next_tables" : {
+ "act_18" : "tbl_act_19"
+ },
+ "default_entry" : {
+ "action_id" : 56,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_19",
+ "id" : 29,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 232,
"column" : 34,
"source_fragment" : "="
},
@@ -5038,14 +6109,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
- "actions" : ["act_16"],
- "base_default_next" : "node_35",
+ "action_ids" : [57],
+ "actions" : ["act_19"],
+ "base_default_next" : "node_47",
"next_tables" : {
- "act_16" : "node_35"
+ "act_19" : "node_47"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 57,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5053,7 +6124,7 @@
},
{
"name" : "FabricIngress.forwarding.bridging",
- "id" : 23,
+ "id" : 30,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 46,
@@ -5080,7 +6151,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 2],
+ "action_ids" : [21, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -5096,7 +6167,7 @@
},
{
"name" : "FabricIngress.forwarding.mpls",
- "id" : 24,
+ "id" : 31,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 71,
@@ -5117,7 +6188,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16, 3],
+ "action_ids" : [22, 3],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -5133,7 +6204,7 @@
},
{
"name" : "FabricIngress.forwarding.routing_v4",
- "id" : 25,
+ "id" : 32,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 108,
@@ -5144,7 +6215,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
"mask" : null
}
],
@@ -5154,7 +6225,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17, 18, 4],
+ "action_ids" : [23, 24, 4],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -5171,7 +6242,7 @@
},
{
"name" : "FabricIngress.acl.acl",
- "id" : 26,
+ "id" : 33,
"source_info" : {
"filename" : "include/control/acl.p4",
"line" : 60,
@@ -5258,18 +6329,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 20, 21, 22, 23],
+ "action_ids" : [25, 26, 27, 28, 29],
"actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
- "base_default_next" : "node_43",
+ "base_default_next" : "node_55",
"next_tables" : {
- "FabricIngress.acl.set_next_id_acl" : "node_43",
- "FabricIngress.acl.punt_to_cpu" : "node_43",
- "FabricIngress.acl.set_clone_session_id" : "node_43",
- "FabricIngress.acl.drop" : "node_43",
- "FabricIngress.acl.nop_acl" : "node_43"
+ "FabricIngress.acl.set_next_id_acl" : "node_55",
+ "FabricIngress.acl.punt_to_cpu" : "node_55",
+ "FabricIngress.acl.set_clone_session_id" : "node_55",
+ "FabricIngress.acl.drop" : "node_55",
+ "FabricIngress.acl.nop_acl" : "node_55"
},
"default_entry" : {
- "action_id" : 23,
+ "action_id" : 29,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5277,7 +6348,7 @@
},
{
"name" : "FabricIngress.next.xconnect",
- "id" : 27,
+ "id" : 34,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 119,
@@ -5304,7 +6375,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [25, 26, 6],
+ "action_ids" : [31, 32, 6],
"actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
@@ -5321,7 +6392,7 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 28,
+ "id" : 35,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 202,
@@ -5343,7 +6414,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 28, 29, 7],
+ "action_ids" : [33, 34, 35, 7],
"actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
@@ -5355,7 +6426,7 @@
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 29,
+ "id" : 36,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 236,
@@ -5376,7 +6447,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30, 8],
+ "action_ids" : [36, 8],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
"base_default_next" : "FabricIngress.next.next_vlan",
"next_tables" : {
@@ -5392,7 +6463,7 @@
},
{
"name" : "FabricIngress.next.next_vlan",
- "id" : 30,
+ "id" : 37,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 86,
@@ -5413,12 +6484,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [24, 5],
+ "action_ids" : [30, 5],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
- "base_default_next" : "node_48",
+ "base_default_next" : "node_60",
"next_tables" : {
- "FabricIngress.next.set_vlan" : "node_48",
- "nop" : "node_48"
+ "FabricIngress.next.set_vlan" : "node_60",
+ "nop" : "node_60"
},
"default_entry" : {
"action_id" : 5,
@@ -5428,8 +6499,8 @@
}
},
{
- "name" : "tbl_act_17",
- "id" : 31,
+ "name" : "tbl_act_20",
+ "id" : 38,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 31,
@@ -5443,22 +6514,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
- "actions" : ["act_17"],
- "base_default_next" : "node_50",
+ "action_ids" : [58],
+ "actions" : ["act_20"],
+ "base_default_next" : "node_62",
"next_tables" : {
- "act_17" : "node_50"
+ "act_20" : "node_62"
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 58,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_18",
- "id" : 32,
+ "name" : "tbl_act_21",
+ "id" : 39,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 34,
@@ -5472,14 +6543,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
- "actions" : ["act_18"],
+ "action_ids" : [59],
+ "actions" : ["act_21"],
"base_default_next" : null,
"next_tables" : {
- "act_18" : null
+ "act_21" : null
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 59,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5502,11 +6573,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
},
{
"type" : "field",
@@ -5530,7 +6601,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 30,
+ "line" : 34,
"column" : 12,
"source_fragment" : "! is_gtpu_encapped"
},
@@ -5584,7 +6655,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 34,
+ "line" : 38,
"column" : 12,
"source_fragment" : "inner_udp.isValid()"
},
@@ -5683,7 +6754,7 @@
"id" : 6,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 144,
+ "line" : 181,
"column" : 12,
"source_fragment" : "gtpu.isValid()"
},
@@ -5698,17 +6769,17 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
- "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
+ "true_next" : "FabricIngress.spgw_ingress.uplink_filter_table",
+ "false_next" : "FabricIngress.spgw_ingress.downlink_filter_table"
},
{
"name" : "node_23",
"id" : 7,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 148,
+ "line" : 185,
"column" : 16,
- "source_fragment" : "!s1u_filter_table.apply().hit"
+ "source_fragment" : "!uplink_filter_table.apply().hit"
},
"expression" : {
"type" : "expression",
@@ -5769,13 +6840,155 @@
}
}
},
- "true_next" : "tbl_act_16",
- "false_next" : "node_35"
+ "true_next" : "node_34",
+ "false_next" : "node_39"
},
{
- "name" : "node_35",
+ "name" : "node_34",
"id" : 10,
"source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 201,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_UPLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+ "false_next" : "node_36"
+ },
+ {
+ "name" : "node_36",
+ "id" : 11,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 203,
+ "column" : 19,
+ "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x02"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "false_next" : "tbl_act_16"
+ },
+ {
+ "name" : "node_39",
+ "id" : 12,
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "not",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "spgw_ingress_hasReturned"]
+ }
+ }
+ }
+ }
+ },
+ "true_next" : "node_40",
+ "false_next" : "node_47"
+ },
+ {
+ "name" : "node_40",
+ "id" : 13,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 209,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.pdr_hit == false"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : false
+ }
+ }
+ },
+ "true_next" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+ "false_next" : "tbl_act_17"
+ },
+ {
+ "name" : "node_44",
+ "id" : 14,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 220,
+ "column" : 12,
+ "source_fragment" : "fabric_meta.spgw.far_dropped == true"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+ }
+ }
+ },
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ },
+ "true_next" : "tbl_act_18",
+ "false_next" : "tbl_act_19"
+ },
+ {
+ "name" : "node_47",
+ "id" : 15,
+ "source_info" : {
"filename" : "fabric.p4",
"line" : 71,
"column" : 12,
@@ -5802,12 +7015,12 @@
}
}
},
- "true_next" : "node_36",
+ "true_next" : "node_48",
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_36",
- "id" : 11,
+ "name" : "node_48",
+ "id" : 16,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 150,
@@ -5829,11 +7042,11 @@
}
},
"true_next" : "FabricIngress.forwarding.bridging",
- "false_next" : "node_38"
+ "false_next" : "node_50"
},
{
- "name" : "node_38",
- "id" : 12,
+ "name" : "node_50",
+ "id" : 17,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 151,
@@ -5855,11 +7068,11 @@
}
},
"true_next" : "FabricIngress.forwarding.mpls",
- "false_next" : "node_40"
+ "false_next" : "node_52"
},
{
- "name" : "node_40",
- "id" : 13,
+ "name" : "node_52",
+ "id" : 18,
"source_info" : {
"filename" : "include/control/forwarding.p4",
"line" : 152,
@@ -5884,8 +7097,8 @@
"false_next" : "FabricIngress.acl.acl"
},
{
- "name" : "node_43",
- "id" : 14,
+ "name" : "node_55",
+ "id" : 19,
"source_info" : {
"filename" : "fabric.p4",
"line" : 75,
@@ -5917,8 +7130,8 @@
"true_next" : "FabricIngress.next.xconnect"
},
{
- "name" : "node_48",
- "id" : 15,
+ "name" : "node_60",
+ "id" : 20,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 30,
@@ -5939,12 +7152,12 @@
}
}
},
- "true_next" : "tbl_act_17",
- "false_next" : "node_50"
+ "true_next" : "tbl_act_20",
+ "false_next" : "node_62"
},
{
- "name" : "node_50",
- "id" : 16,
+ "name" : "node_62",
+ "id" : 21,
"source_info" : {
"filename" : "include/control/port_counter.p4",
"line" : 33,
@@ -5966,7 +7179,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_18"
+ "true_next" : "tbl_act_21"
}
]
},
@@ -5979,11 +7192,11 @@
"column" : 8,
"source_fragment" : "FabricEgress"
},
- "init_table" : "node_54",
+ "init_table" : "node_66",
"tables" : [
{
- "name" : "tbl_act_19",
- "id" : 33,
+ "name" : "tbl_act_22",
+ "id" : 40,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 41,
@@ -5997,22 +7210,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
- "actions" : ["act_19"],
- "base_default_next" : "node_56",
+ "action_ids" : [66],
+ "actions" : ["act_22"],
+ "base_default_next" : "node_68",
"next_tables" : {
- "act_19" : "node_56"
+ "act_22" : "node_68"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_20",
- "id" : 34,
+ "name" : "tbl_act_23",
+ "id" : 41,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 44,
@@ -6026,22 +7239,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
- "actions" : ["act_20"],
- "base_default_next" : "node_58",
+ "action_ids" : [67],
+ "actions" : ["act_23"],
+ "base_default_next" : "node_70",
"next_tables" : {
- "act_20" : "node_58"
+ "act_23" : "node_70"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_21",
- "id" : 35,
+ "name" : "tbl_act_24",
+ "id" : 42,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 337,
@@ -6055,14 +7268,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59],
- "actions" : ["act_21"],
- "base_default_next" : "node_60",
+ "action_ids" : [68],
+ "actions" : ["act_24"],
+ "base_default_next" : "node_72",
"next_tables" : {
- "act_21" : "node_60"
+ "act_24" : "node_72"
},
"default_entry" : {
- "action_id" : 59,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6070,7 +7283,7 @@
},
{
"name" : "tbl_egress_next_pop_mpls_if_present",
- "id" : 36,
+ "id" : 43,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -6084,14 +7297,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [53],
+ "action_ids" : [62],
"actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6099,7 +7312,7 @@
},
{
"name" : "tbl_egress_next_set_mpls",
- "id" : 37,
+ "id" : 44,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 343,
@@ -6113,14 +7326,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54],
+ "action_ids" : [63],
"actions" : ["FabricEgress.egress_next.set_mpls"],
"base_default_next" : "FabricEgress.egress_next.egress_vlan",
"next_tables" : {
"FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6128,7 +7341,7 @@
},
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 38,
+ "id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 320,
@@ -6155,35 +7368,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56, 51],
+ "action_ids" : [65, 60],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
"base_default_next" : null,
"next_tables" : {
- "__HIT__" : "tbl_act_22",
- "__MISS__" : "tbl_act_23"
- },
- "default_entry" : {
- "action_id" : 51,
- "action_const" : true,
- "action_data" : [],
- "action_entry_const" : true
- }
- },
- {
- "name" : "tbl_act_22",
- "id" : 39,
- "key" : [],
- "match_type" : "exact",
- "type" : "simple",
- "max_size" : 1024,
- "with_counters" : false,
- "support_timeout" : false,
- "direct_meters" : null,
- "action_ids" : [60],
- "actions" : ["act_22"],
- "base_default_next" : "node_67",
- "next_tables" : {
- "act_22" : "node_67"
+ "__HIT__" : "tbl_act_25",
+ "__MISS__" : "tbl_act_26"
},
"default_entry" : {
"action_id" : 60,
@@ -6193,8 +7383,8 @@
}
},
{
- "name" : "tbl_act_23",
- "id" : 40,
+ "name" : "tbl_act_25",
+ "id" : 46,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -6202,14 +7392,37 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
- "actions" : ["act_23"],
- "base_default_next" : "node_67",
+ "action_ids" : [69],
+ "actions" : ["act_25"],
+ "base_default_next" : "node_79",
"next_tables" : {
- "act_23" : "node_67"
+ "act_25" : "node_79"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 69,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_26",
+ "id" : 47,
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [70],
+ "actions" : ["act_26"],
+ "base_default_next" : "node_79",
+ "next_tables" : {
+ "act_26" : "node_79"
+ },
+ "default_entry" : {
+ "action_id" : 70,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6217,7 +7430,7 @@
},
{
"name" : "tbl_egress_next_push_vlan",
- "id" : 41,
+ "id" : 48,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 360,
@@ -6231,22 +7444,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
+ "action_ids" : [64],
"actions" : ["FabricEgress.egress_next.push_vlan"],
- "base_default_next" : "node_70",
+ "base_default_next" : "node_82",
"next_tables" : {
- "FabricEgress.egress_next.push_vlan" : "node_70"
+ "FabricEgress.egress_next.push_vlan" : "node_82"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_24",
- "id" : 42,
+ "name" : "tbl_act_27",
+ "id" : 49,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 369,
@@ -6260,22 +7473,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [63],
- "actions" : ["act_25"],
- "base_default_next" : "node_72",
+ "action_ids" : [72],
+ "actions" : ["act_28"],
+ "base_default_next" : "node_84",
"next_tables" : {
- "act_25" : "node_72"
+ "act_28" : "node_84"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 72,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_25",
- "id" : 43,
+ "name" : "tbl_act_28",
+ "id" : 50,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -6289,22 +7502,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [62],
- "actions" : ["act_24"],
- "base_default_next" : "node_78",
+ "action_ids" : [71],
+ "actions" : ["act_27"],
+ "base_default_next" : "tbl_act_31",
"next_tables" : {
- "act_24" : "node_78"
+ "act_27" : "tbl_act_31"
},
"default_entry" : {
- "action_id" : 62,
+ "action_id" : 71,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_26",
- "id" : 44,
+ "name" : "tbl_act_29",
+ "id" : 51,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 373,
@@ -6318,22 +7531,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [65],
- "actions" : ["act_27"],
- "base_default_next" : "node_76",
+ "action_ids" : [74],
+ "actions" : ["act_30"],
+ "base_default_next" : "node_88",
"next_tables" : {
- "act_27" : "node_76"
+ "act_30" : "node_88"
},
"default_entry" : {
- "action_id" : 65,
+ "action_id" : 74,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_27",
- "id" : 45,
+ "name" : "tbl_act_30",
+ "id" : 52,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -6347,14 +7560,43 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
- "actions" : ["act_26"],
- "base_default_next" : "node_78",
+ "action_ids" : [73],
+ "actions" : ["act_29"],
+ "base_default_next" : "tbl_act_31",
"next_tables" : {
- "act_26" : "node_78"
+ "act_29" : "tbl_act_31"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 73,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_31",
+ "id" : 53,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 288,
+ "column" : 8,
+ "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+ },
+ "key" : [],
+ "match_type" : "exact",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : false,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [75],
+ "actions" : ["act_31"],
+ "base_default_next" : "node_91",
+ "next_tables" : {
+ "act_31" : "node_91"
+ },
+ "default_entry" : {
+ "action_id" : 75,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6362,10 +7604,10 @@
},
{
"name" : "tbl_spgw_egress_gtpu_encap",
- "id" : 46,
+ "id" : 54,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 228,
+ "line" : 291,
"column" : 12,
"source_fragment" : "gtpu_encap()"
},
@@ -6376,14 +7618,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
+ "action_ids" : [61],
"actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.spgw_egress.gtpu_encap" : null
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6393,8 +7635,8 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_54",
- "id" : 17,
+ "name" : "node_66",
+ "id" : 22,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 39,
@@ -6422,12 +7664,12 @@
}
}
},
- "true_next" : "tbl_act_19",
- "false_next" : "node_56"
+ "true_next" : "tbl_act_22",
+ "false_next" : "node_68"
},
{
- "name" : "node_56",
- "id" : 18,
+ "name" : "node_68",
+ "id" : 23,
"source_info" : {
"filename" : "include/control/packetio.p4",
"line" : 43,
@@ -6448,12 +7690,12 @@
}
}
},
- "true_next" : "tbl_act_20",
- "false_next" : "node_58"
+ "true_next" : "tbl_act_23",
+ "false_next" : "node_70"
},
{
- "name" : "node_58",
- "id" : 19,
+ "name" : "node_70",
+ "id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 335,
@@ -6501,12 +7743,12 @@
}
}
},
- "true_next" : "tbl_act_21",
- "false_next" : "node_60"
+ "true_next" : "tbl_act_24",
+ "false_next" : "node_72"
},
{
- "name" : "node_60",
- "id" : 20,
+ "name" : "node_72",
+ "id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 340,
@@ -6527,12 +7769,12 @@
}
}
},
- "true_next" : "node_61",
+ "true_next" : "node_73",
"false_next" : "tbl_egress_next_set_mpls"
},
{
- "name" : "node_61",
- "id" : 21,
+ "name" : "node_73",
+ "id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 341,
@@ -6554,8 +7796,8 @@
"false_next" : "FabricEgress.egress_next.egress_vlan"
},
{
- "name" : "node_67",
- "id" : 22,
+ "name" : "node_79",
+ "id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 357,
@@ -6580,12 +7822,12 @@
}
}
},
- "true_next" : "node_68",
- "false_next" : "node_70"
+ "true_next" : "node_80",
+ "false_next" : "node_82"
},
{
- "name" : "node_68",
- "id" : 23,
+ "name" : "node_80",
+ "id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 359,
@@ -6607,11 +7849,11 @@
}
},
"true_next" : "tbl_egress_next_push_vlan",
- "false_next" : "node_70"
+ "false_next" : "node_82"
},
{
- "name" : "node_70",
- "id" : 24,
+ "name" : "node_82",
+ "id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 368,
@@ -6629,12 +7871,12 @@
}
}
},
- "true_next" : "tbl_act_24",
- "false_next" : "node_74"
+ "true_next" : "tbl_act_27",
+ "false_next" : "node_86"
},
{
- "name" : "node_72",
- "id" : 25,
+ "name" : "node_84",
+ "id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 370,
@@ -6655,12 +7897,12 @@
}
}
},
- "true_next" : "tbl_act_25",
- "false_next" : "node_78"
+ "true_next" : "tbl_act_28",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_74",
- "id" : 26,
+ "name" : "node_86",
+ "id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 372,
@@ -6678,12 +7920,12 @@
}
}
},
- "true_next" : "tbl_act_26",
- "false_next" : "node_78"
+ "true_next" : "tbl_act_29",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_76",
- "id" : 27,
+ "name" : "node_88",
+ "id" : 32,
"source_info" : {
"filename" : "include/control/next.p4",
"line" : 374,
@@ -6704,29 +7946,36 @@
}
}
},
- "true_next" : "tbl_act_27",
- "false_next" : "node_78"
+ "true_next" : "tbl_act_30",
+ "false_next" : "tbl_act_31"
},
{
- "name" : "node_78",
- "id" : 28,
+ "name" : "node_91",
+ "id" : 33,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 227,
+ "line" : 290,
"column" : 12,
- "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+ "source_fragment" : "fabric_meta.spgw.outer_header_creation == true"
},
"expression" : {
"type" : "expression",
"value" : {
"op" : "==",
"left" : {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+ }
+ }
},
"right" : {
- "type" : "hexstr",
- "value" : "0x02"
+ "type" : "bool",
+ "value" : true
}
}
},
@@ -6768,7 +8017,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 243,
+ "line" : 306,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index aa87ff9..d3f8df9 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -3,33 +3,27 @@
}
tables {
preamble {
- id: 33582731
- name: "FabricIngress.spgw_ingress.dl_sess_lookup"
- alias: "dl_sess_lookup"
+ id: 33586632
+ name: "FabricIngress.spgw_ingress.downlink_filter_table"
+ alias: "downlink_filter_table"
}
match_fields {
id: 1
- name: "ipv4_dst"
+ name: "ipv4_prefix"
bitwidth: 32
- match_type: EXACT
- }
- action_refs {
- id: 16804065
+ match_type: LPM
}
action_refs {
id: 16819938
- annotations: "@defaultonly"
- scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
- direct_resource_ids: 318781522
size: 1024
}
tables {
preamble {
- id: 33615906
- name: "FabricIngress.spgw_ingress.s1u_filter_table"
- alias: "s1u_filter_table"
+ id: 33567046
+ name: "FabricIngress.spgw_ingress.uplink_filter_table"
+ alias: "uplink_filter_table"
}
match_fields {
id: 1
@@ -45,6 +39,143 @@
}
tables {
preamble {
+ id: 33586958
+ name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+ alias: "downlink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33587070
+ name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
+ alias: "uplink_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "teid"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ match_fields {
+ id: 3
+ name: "ue_addr"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16799934
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33582573
+ name: "FabricIngress.spgw_ingress.flexible_pdr_lookup"
+ alias: "flexible_pdr_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "spgw_direction"
+ bitwidth: 2
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 2
+ name: "tunnel_ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 3
+ name: "teid"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 4
+ name: "ipv4_src"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 5
+ name: "ipv4_dst"
+ bitwidth: 32
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 6
+ name: "ip_proto"
+ bitwidth: 8
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 7
+ name: "l4_sport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ match_fields {
+ id: 8
+ name: "l4_dport"
+ bitwidth: 16
+ match_type: TERNARY
+ }
+ action_refs {
+ id: 16799934
+ }
+ const_default_action_id: 16799934
+ size: 1024
+}
+tables {
+ preamble {
+ id: 33613200
+ name: "FabricIngress.spgw_ingress.far_lookup"
+ alias: "far_lookup"
+ }
+ match_fields {
+ id: 1
+ name: "far_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16834935
+ }
+ action_refs {
+ id: 16787606
+ }
+ const_default_action_id: 16834935
+ size: 1024
+}
+tables {
+ preamble {
id: 33611649
name: "FabricIngress.filtering.ingress_port_vlan"
alias: "ingress_port_vlan"
@@ -444,23 +575,74 @@
}
actions {
preamble {
- id: 16804065
- name: "FabricIngress.spgw_ingress.set_dl_sess_info"
- alias: "set_dl_sess_info"
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
+ id: 16799934
+ name: "FabricIngress.spgw_ingress.set_pdr_attributes"
+ alias: "set_pdr_attributes"
}
params {
id: 1
- name: "teid"
+ name: "ctr_id"
bitwidth: 32
}
params {
id: 2
- name: "s1u_enb_addr"
+ name: "far_id"
bitwidth: 32
}
+}
+actions {
+ preamble {
+ id: 16834935
+ name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
+ alias: "load_normal_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
+}
+actions {
+ preamble {
+ id: 16787606
+ name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
+ alias: "load_tunnel_far_attributes"
+ }
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
+ }
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
+ }
params {
id: 3
- name: "s1u_sgw_addr"
+ name: "tunnel_src_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 4
+ name: "tunnel_dst_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 5
+ name: "teid"
bitwidth: 32
}
}
@@ -719,6 +901,17 @@
}
counters {
preamble {
+ id: 302029884
+ name: "FabricIngress.spgw_ingress.pdr_counter"
+ alias: "spgw_ingress.pdr_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ size: 1024
+}
+counters {
+ preamble {
id: 302011205
name: "FabricIngress.port_counters_control.egress_port_counter"
alias: "egress_port_counter"
@@ -739,16 +932,16 @@
}
size: 511
}
-direct_counters {
+counters {
preamble {
- id: 318781522
- name: "FabricIngress.spgw_ingress.ue_counter"
- alias: "ue_counter"
+ id: 302012289
+ name: "FabricEgress.spgw_egress.pdr_counter"
+ alias: "spgw_egress.pdr_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33582731
+ size: 1024
}
direct_counters {
preamble {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 1ff415c..c152abf 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -24,7 +24,9 @@
["fabric_metadata_t.is_controller_packet_out", 1, false],
["fabric_metadata_t.ip_proto", 8, false],
["fabric_metadata_t.l4_sport", 16, false],
- ["fabric_metadata_t.l4_dport", 16, false]
+ ["fabric_metadata_t.l4_dport", 16, false],
+ ["fabric_metadata_t.ipv4_src_addr", 32, false],
+ ["fabric_metadata_t.ipv4_dst_addr", 32, false]
]
},
{
@@ -637,6 +639,32 @@
}
],
"op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.ipv4_src_addr"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "src_addr"]
+ }
+ ],
+ "op" : "set"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ }
+ ],
+ "op" : "set"
}
],
"transitions" : [
@@ -807,7 +835,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 269,
+ "line" : 267,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -2359,7 +2387,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 112,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -2438,7 +2466,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 111,
+ "line" : 114,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3075,7 +3103,7 @@
{
"match_type" : "lpm",
"name" : "ipv4_dst",
- "target" : ["ipv4", "dst_addr"],
+ "target" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"],
"mask" : null
}
],
@@ -3433,11 +3461,11 @@
"input" : [
{
"type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "value" : ["scalars", "fabric_metadata_t.ipv4_src_addr"]
},
{
"type" : "field",
- "value" : ["ipv4", "src_addr"]
+ "value" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"]
},
{
"type" : "field",