Update SPGW p4 namespace to match fabric-tna
Change-Id: If97062655590150b06f8375080db2e12c9ef8cd7
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 c28ef4e..036ea1d 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
@@ -9,7 +9,7 @@
["tmp_3", 4, false],
["tmp", 32, false],
["tmp_0", 32, false],
- ["spgw_ingress_tmp", 1, false],
+ ["spgw_tmp", 1, false],
["egress_next_tmp", 1, false],
["fabric_metadata_t._ip_eth_type0", 16, false],
["fabric_metadata_t._vlan_id1", 12, false],
@@ -30,23 +30,20 @@
["fabric_metadata_t._ipv4_dst_addr16", 32, false],
["fabric_metadata_t._inner_l4_sport17", 16, false],
["fabric_metadata_t._inner_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_tunnel_src_port22", 16, false],
- ["fabric_metadata_t._spgw_tunnel_src_addr23", 32, false],
- ["fabric_metadata_t._spgw_tunnel_dst_addr24", 32, false],
- ["fabric_metadata_t._spgw_ctr_id25", 32, false],
- ["fabric_metadata_t._spgw_far_id26", 32, false],
- ["fabric_metadata_t._spgw_src_iface27", 8, false],
- ["fabric_metadata_t._spgw_skip_spgw28", 1, false],
- ["fabric_metadata_t._spgw_pdr_hit29", 1, false],
- ["fabric_metadata_t._spgw_far_dropped30", 1, false],
- ["fabric_metadata_t._spgw_notify_spgwc31", 1, false],
- ["fabric_metadata_t._spgw_needs_gtpu_encap32", 1, false],
- ["fabric_metadata_t._spgw_needs_gtpu_decap33", 1, false],
- ["fabric_metadata_t._spgw_skip_egress_pdr_ctr34", 1, false],
- ["_padding_0", 6, false]
+ ["fabric_metadata_t._spgw_ipv4_len19", 16, false],
+ ["fabric_metadata_t._spgw_teid20", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_src_port21", 16, false],
+ ["fabric_metadata_t._spgw_tunnel_src_addr22", 32, false],
+ ["fabric_metadata_t._spgw_tunnel_dst_addr23", 32, false],
+ ["fabric_metadata_t._spgw_ctr_id24", 32, false],
+ ["fabric_metadata_t._spgw_far_id25", 32, false],
+ ["fabric_metadata_t._spgw_src_iface26", 8, false],
+ ["fabric_metadata_t._spgw_skip_spgw27", 1, false],
+ ["fabric_metadata_t._spgw_notify_spgwc28", 1, false],
+ ["fabric_metadata_t._spgw_needs_gtpu_encap29", 1, false],
+ ["fabric_metadata_t._spgw_needs_gtpu_decap30", 1, false],
+ ["fabric_metadata_t._spgw_skip_egress_pdr_ctr31", 1, false],
+ ["_padding_0", 2, false]
]
},
{
@@ -1178,7 +1175,7 @@
"is_direct" : false
},
{
- "name" : "FabricIngress.spgw_ingress.pdr_counter",
+ "name" : "FabricIngress.spgw.pdr_counter",
"id" : 11,
"source_info" : {
"filename" : "include/control/spgw.p4",
@@ -1202,11 +1199,11 @@
}
},
{
- "name" : "FabricEgress.spgw_egress.pdr_counter",
+ "name" : "FabricEgress.spgw.pdr_counter",
"id" : 13,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 312,
+ "line" : 286,
"column" : 53,
"source_fragment" : "pdr_counter"
},
@@ -1282,7 +1279,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 375,
+ "line" : 349,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
@@ -1445,9 +1442,21 @@
"primitives" : []
},
{
- "name" : "FabricIngress.filtering.deny",
+ "name" : "NoAction",
"id" : 7,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 8,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.filtering.deny",
+ "id" : 9,
+ "runtime_data" : [],
"primitives" : [
{
"op" : "assign",
@@ -1511,13 +1520,13 @@
},
{
"name" : "FabricIngress.filtering.permit",
- "id" : 8,
+ "id" : 10,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.filtering.permit_with_internal_vlan",
- "id" : 9,
+ "id" : 11,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -1548,7 +1557,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 10,
+ "id" : 12,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -1579,7 +1588,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 11,
+ "id" : 13,
"runtime_data" : [
{
"name" : "next_id",
@@ -1610,7 +1619,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 12,
+ "id" : 14,
"runtime_data" : [
{
"name" : "next_id",
@@ -1660,7 +1669,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_routing_v4",
- "id" : 13,
+ "id" : 15,
"runtime_data" : [
{
"name" : "next_id",
@@ -1691,13 +1700,13 @@
},
{
"name" : "FabricIngress.forwarding.nop_routing_v4",
- "id" : 14,
+ "id" : 16,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.acl.set_next_id_acl",
- "id" : 15,
+ "id" : 17,
"runtime_data" : [
{
"name" : "next_id",
@@ -1728,7 +1737,7 @@
},
{
"name" : "FabricIngress.acl.punt_to_cpu",
- "id" : 16,
+ "id" : 18,
"runtime_data" : [],
"primitives" : [
{
@@ -1783,7 +1792,7 @@
},
{
"name" : "FabricIngress.acl.set_clone_session_id",
- "id" : 17,
+ "id" : 19,
"runtime_data" : [
{
"name" : "clone_id",
@@ -1814,7 +1823,7 @@
},
{
"name" : "FabricIngress.acl.drop",
- "id" : 18,
+ "id" : 20,
"runtime_data" : [],
"primitives" : [
{
@@ -1865,13 +1874,13 @@
},
{
"name" : "FabricIngress.acl.nop_acl",
- "id" : 19,
+ "id" : 21,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricIngress.next.set_vlan",
- "id" : 20,
+ "id" : 22,
"runtime_data" : [
{
"name" : "vlan_id",
@@ -1902,68 +1911,6 @@
},
{
"name" : "FabricIngress.next.output_xconnect",
- "id" : 21,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 31,
- "column" : 5,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.set_next_id_xconnect",
- "id" : 22,
- "runtime_data" : [
- {
- "name" : "next_id",
- "bitwidth" : 32
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._next_id9"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 115,
- "column" : 32,
- "source_fragment" : "= next_id; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.output_hashed",
"id" : 23,
"runtime_data" : [
{
@@ -1994,10 +1941,72 @@
]
},
{
- "name" : "FabricIngress.next.routing_hashed",
+ "name" : "FabricIngress.next.set_next_id_xconnect",
"id" : 24,
"runtime_data" : [
{
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._next_id9"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 115,
+ "column" : 32,
+ "source_fragment" : "= next_id; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.output_hashed",
+ "id" : 25,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 31,
+ "column" : 5,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.routing_hashed",
+ "id" : 26,
+ "runtime_data" : [
+ {
"name" : "port_num",
"bitwidth" : 9
},
@@ -2072,7 +2081,7 @@
},
{
"name" : "FabricIngress.next.mpls_routing_hashed",
- "id" : 25,
+ "id" : 27,
"runtime_data" : [
{
"name" : "port_num",
@@ -2172,7 +2181,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group_id",
- "id" : 26,
+ "id" : 28,
"runtime_data" : [
{
"name" : "group_id",
@@ -2231,430 +2240,7 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp",
- "id" : 27,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0800"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 129,
- "column" : 31,
- "source_fragment" : "0x0800; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "protocol"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 39,
- "column" : 27,
- "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "src_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 40,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "dst_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 41,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 42,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_sport; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 43,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_dport; ..."
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "ipv4"
- },
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 45,
- "column" : 8,
- "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 46,
- "column" : 8,
- "source_fragment" : "hdr.inner_ipv4.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "gtpu"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 47,
- "column" : 8,
- "source_fragment" : "hdr.gtpu.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "udp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 52,
- "column" : 8,
- "source_fragment" : "hdr.udp.setInvalid()"
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "tcp"
- },
- {
- "type" : "header",
- "value" : "inner_tcp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 53,
- "column" : 8,
- "source_fragment" : "hdr.tcp = hdr.inner_tcp"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_tcp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 54,
- "column" : 8,
- "source_fragment" : "hdr.inner_tcp.setInvalid()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp",
- "id" : 28,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0800"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 129,
- "column" : 31,
- "source_fragment" : "0x0800; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "protocol"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 39,
- "column" : 27,
- "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "src_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 40,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "dst_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 41,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 42,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_sport; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 43,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_dport; ..."
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "ipv4"
- },
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 45,
- "column" : 8,
- "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 46,
- "column" : 8,
- "source_fragment" : "hdr.inner_ipv4.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "gtpu"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 47,
- "column" : 8,
- "source_fragment" : "hdr.gtpu.setInvalid()"
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "udp"
- },
- {
- "type" : "header",
- "value" : "inner_udp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 59,
- "column" : 8,
- "source_fragment" : "hdr.udp = hdr.inner_udp"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_udp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 60,
- "column" : 8,
- "source_fragment" : "hdr.inner_udp.setInvalid()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp",
+ "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
"id" : 29,
"runtime_data" : [],
"primitives" : [
@@ -2672,411 +2258,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
- "column" : 31,
- "source_fragment" : "0x0800; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "protocol"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 39,
- "column" : 27,
- "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "src_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 40,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "dst_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 41,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 42,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_sport; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 43,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_dport; ..."
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "ipv4"
- },
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 45,
- "column" : 8,
- "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 46,
- "column" : 8,
- "source_fragment" : "hdr.inner_ipv4.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "gtpu"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 47,
- "column" : 8,
- "source_fragment" : "hdr.gtpu.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "udp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 65,
- "column" : 8,
- "source_fragment" : "hdr.udp.setInvalid()"
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "icmp"
- },
- {
- "type" : "header",
- "value" : "inner_icmp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 66,
- "column" : 8,
- "source_fragment" : "hdr.icmp = hdr.inner_icmp"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_icmp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 67,
- "column" : 8,
- "source_fragment" : "hdr.inner_icmp.setInvalid()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown",
- "id" : 30,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0800"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 129,
- "column" : 31,
- "source_fragment" : "0x0800; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "protocol"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 39,
- "column" : 27,
- "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "src_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 40,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
- },
- {
- "type" : "field",
- "value" : ["inner_ipv4", "dst_addr"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 41,
- "column" : 32,
- "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 42,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_sport; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
- },
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 43,
- "column" : 27,
- "source_fragment" : "= fabric_md.inner_l4_dport; ..."
- }
- },
- {
- "op" : "assign_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "ipv4"
- },
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 45,
- "column" : 8,
- "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "inner_ipv4"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 46,
- "column" : 8,
- "source_fragment" : "hdr.inner_ipv4.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "gtpu"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 47,
- "column" : 8,
- "source_fragment" : "hdr.gtpu.setInvalid()"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "udp"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 72,
- "column" : 8,
- "source_fragment" : "hdr.udp.setInvalid()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp",
- "id" : 31,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0800"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -3277,8 +2459,8 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp",
- "id" : 32,
+ "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
+ "id" : 30,
"runtime_data" : [],
"primitives" : [
{
@@ -3295,7 +2477,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -3481,8 +2663,8 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp",
- "id" : 33,
+ "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
+ "id" : 31,
"runtime_data" : [],
"primitives" : [
{
@@ -3499,7 +2681,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -3700,8 +2882,8 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown",
- "id" : 34,
+ "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
+ "id" : 32,
"runtime_data" : [],
"primitives" : [
{
@@ -3718,7 +2900,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 129,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -3885,20 +3067,839 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.set_source_iface",
+ "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
+ "id" : 33,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0800"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 118,
+ "column" : 31,
+ "source_fragment" : "0x0800; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 39,
+ "column" : 27,
+ "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 40,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 41,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 42,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 43,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "ipv4"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 45,
+ "column" : 8,
+ "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "gtpu"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 47,
+ "column" : 8,
+ "source_fragment" : "hdr.gtpu.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "udp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 52,
+ "column" : 8,
+ "source_fragment" : "hdr.udp.setInvalid()"
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "tcp"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_tcp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 53,
+ "column" : 8,
+ "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_tcp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 54,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_tcp.setInvalid()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
+ "id" : 34,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0800"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 118,
+ "column" : 31,
+ "source_fragment" : "0x0800; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 39,
+ "column" : 27,
+ "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 40,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 41,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 42,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 43,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "ipv4"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 45,
+ "column" : 8,
+ "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "gtpu"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 47,
+ "column" : 8,
+ "source_fragment" : "hdr.gtpu.setInvalid()"
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "udp"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_udp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 59,
+ "column" : 8,
+ "source_fragment" : "hdr.udp = hdr.inner_udp"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_udp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 60,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_udp.setInvalid()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
"id" : 35,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0800"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 118,
+ "column" : 31,
+ "source_fragment" : "0x0800; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 39,
+ "column" : 27,
+ "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 40,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 41,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 42,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 43,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "ipv4"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 45,
+ "column" : 8,
+ "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "gtpu"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 47,
+ "column" : 8,
+ "source_fragment" : "hdr.gtpu.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "udp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 65,
+ "column" : 8,
+ "source_fragment" : "hdr.udp.setInvalid()"
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "icmp"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_icmp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 66,
+ "column" : 8,
+ "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_icmp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 67,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_icmp.setInvalid()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
+ "id" : 36,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0800"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/../define.p4",
+ "line" : 118,
+ "column" : 31,
+ "source_fragment" : "0x0800; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "protocol"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 39,
+ "column" : 27,
+ "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "src_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 40,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "field",
+ "value" : ["inner_ipv4", "dst_addr"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 41,
+ "column" : 32,
+ "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 42,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+ },
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 43,
+ "column" : 27,
+ "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+ }
+ },
+ {
+ "op" : "assign_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "ipv4"
+ },
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 45,
+ "column" : 8,
+ "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "inner_ipv4"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "gtpu"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 47,
+ "column" : 8,
+ "source_fragment" : "hdr.gtpu.setInvalid()"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "udp"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 72,
+ "column" : 8,
+ "source_fragment" : "hdr.udp.setInvalid()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.load_iface",
+ "id" : 37,
"runtime_data" : [
{
"name" : "src_iface",
"bitwidth" : 8
- },
- {
- "name" : "direction",
- "bitwidth" : 2
- },
- {
- "name" : "skip_spgw",
- "bitwidth" : 1
}
],
"primitives" : [
@@ -3907,7 +3908,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
},
{
"type" : "runtime_data",
@@ -3916,7 +3917,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 123,
+ "line" : 121,
"column" : 33,
"source_fragment" : "= src_iface; ..."
}
@@ -3926,85 +3927,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 124,
- "column" : 33,
- "source_fragment" : "= direction; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "expression",
- "value" : {
- "op" : "!=",
- "left" : {
- "type" : "local",
- "value" : 2
- },
- "right" : {
- "type" : "hexstr",
- "value" : "0x00"
- }
- }
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 125,
- "column" : 33,
- "source_fragment" : "= (bool)skip_spgw; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
- "id" : 36,
- "runtime_data" : [
- {
- "name" : "ctr_id",
- "bitwidth" : 32
- },
- {
- "name" : "far_id",
- "bitwidth" : 32
- },
- {
- "name" : "needs_gtpu_decap",
- "bitwidth" : 1
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
},
{
"type" : "expression",
@@ -4015,7 +3938,7 @@
"left" : null,
"right" : {
"type" : "bool",
- "value" : true
+ "value" : false
}
}
}
@@ -4023,267 +3946,35 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 148,
- "column" : 31,
- "source_fragment" : "= true; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 149,
- "column" : 30,
- "source_fragment" : "= ctr_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 150,
- "column" : 30,
- "source_fragment" : "= far_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "expression",
- "value" : {
- "op" : "!=",
- "left" : {
- "type" : "local",
- "value" : 2
- },
- "right" : {
- "type" : "hexstr",
- "value" : "0x00"
- }
- }
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 151,
- "column" : 40,
- "source_fragment" : "= (bool)needs_gtpu_decap; ..."
+ "line" : 122,
+ "column" : 33,
+ "source_fragment" : "= false; ..."
}
}
]
},
{
- "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
- "id" : 37,
- "runtime_data" : [
- {
- "name" : "ctr_id",
- "bitwidth" : 32
- },
- {
- "name" : "far_id",
- "bitwidth" : 32
- },
- {
- "name" : "needs_gtpu_decap",
- "bitwidth" : 1
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "bool",
- "value" : true
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 148,
- "column" : 31,
- "source_fragment" : "= true; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 149,
- "column" : 30,
- "source_fragment" : "= ctr_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 150,
- "column" : 30,
- "source_fragment" : "= far_id; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "expression",
- "value" : {
- "op" : "!=",
- "left" : {
- "type" : "local",
- "value" : 2
- },
- "right" : {
- "type" : "hexstr",
- "value" : "0x00"
- }
- }
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 151,
- "column" : 40,
- "source_fragment" : "= (bool)needs_gtpu_decap; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+ "name" : "FabricIngress.spgw.iface_miss",
"id" : 38,
- "runtime_data" : [
- {
- "name" : "drop",
- "bitwidth" : 1
- },
- {
- "name" : "notify_cp",
- "bitwidth" : 1
- }
- ],
+ "runtime_data" : [],
"primitives" : [
{
"op" : "assign",
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
},
{
- "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"
- }
- }
- }
- }
- }
+ "type" : "hexstr",
+ "value" : "0x00"
}
],
"source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 211,
- "column" : 34,
- "source_fragment" : "= (bool)drop; ..."
+ "filename" : "include/control/../define.p4",
+ "line" : 108,
+ "column" : 44,
+ "source_fragment" : "8w0; ..."
}
},
{
@@ -4291,7 +3982,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
},
{
"type" : "expression",
@@ -4301,18 +3992,8 @@
"op" : "b2d",
"left" : null,
"right" : {
- "type" : "expression",
- "value" : {
- "op" : "!=",
- "left" : {
- "type" : "local",
- "value" : 0
- },
- "right" : {
- "type" : "hexstr",
- "value" : "0x00"
- }
- }
+ "type" : "bool",
+ "value" : true
}
}
}
@@ -4320,79 +4001,218 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 212,
- "column" : 28,
- "source_fragment" : "= (bool)drop; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
- },
- {
- "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/control/spgw.p4",
- "line" : 213,
- "column" : 36,
- "source_fragment" : "= (bool)notify_cp; ..."
+ "line" : 126,
+ "column" : 33,
+ "source_fragment" : "= true; ..."
}
}
]
},
{
- "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+ "name" : "FabricIngress.spgw.load_pdr",
"id" : 39,
"runtime_data" : [
{
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "needs_gtpu_decap",
+ "bitwidth" : 1
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 151,
+ "column" : 30,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 152,
+ "column" : 30,
+ "source_fragment" : "= far_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 2
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 153,
+ "column" : 40,
+ "source_fragment" : "= (bool)needs_gtpu_decap; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.load_pdr",
+ "id" : 40,
+ "runtime_data" : [
+ {
+ "name" : "ctr_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "far_id",
+ "bitwidth" : 32
+ },
+ {
+ "name" : "needs_gtpu_decap",
+ "bitwidth" : 1
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 151,
+ "column" : 30,
+ "source_fragment" : "= ctr_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 152,
+ "column" : 30,
+ "source_fragment" : "= far_id; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "!=",
+ "left" : {
+ "type" : "local",
+ "value" : 2
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ }
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 153,
+ "column" : 40,
+ "source_fragment" : "= (bool)needs_gtpu_decap; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.load_normal_far",
+ "id" : 41,
+ "runtime_data" : [
+ {
"name" : "drop",
"bitwidth" : 1
},
{
"name" : "notify_cp",
"bitwidth" : 1
- },
- {
- "name" : "tunnel_src_port",
- "bitwidth" : 16
- },
- {
- "name" : "tunnel_src_addr",
- "bitwidth" : 32
- },
- {
- "name" : "tunnel_dst_addr",
- "bitwidth" : 32
- },
- {
- "name" : "teid",
- "bitwidth" : 32
}
],
"primitives" : [
@@ -4430,7 +4250,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 222,
+ "line" : 186,
"column" : 34,
"source_fragment" : "= (bool)drop; ..."
}
@@ -4469,7 +4289,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 223,
+ "line" : 187,
"column" : 28,
"source_fragment" : "= (bool)drop; ..."
}
@@ -4479,7 +4299,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
},
{
"type" : "expression",
@@ -4508,197 +4328,16 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 224,
+ "line" : 188,
"column" : 36,
"source_fragment" : "= (bool)notify_cp; ..."
}
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
- },
- {
- "type" : "expression",
- "value" : {
- "type" : "expression",
- "value" : {
- "op" : "b2d",
- "left" : null,
- "right" : {
- "type" : "bool",
- "value" : true
- }
- }
- }
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 226,
- "column" : 40,
- "source_fragment" : "= true; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
- },
- {
- "type" : "runtime_data",
- "value" : 5
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 227,
- "column" : 28,
- "source_fragment" : "= teid; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
- },
- {
- "type" : "runtime_data",
- "value" : 2
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 228,
- "column" : 39,
- "source_fragment" : "= tunnel_src_port; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 229,
- "column" : 39,
- "source_fragment" : "= tunnel_src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
- },
- {
- "type" : "runtime_data",
- "value" : 4
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 230,
- "column" : 39,
- "source_fragment" : "= tunnel_dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 232,
- "column" : 32,
- "source_fragment" : "= tunnel_src_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
- },
- {
- "type" : "runtime_data",
- "value" : 4
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 233,
- "column" : 32,
- "source_fragment" : "= tunnel_dst_addr; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
- },
- {
- "type" : "runtime_data",
- "value" : 2
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 234,
- "column" : 27,
- "source_fragment" : "= tunnel_src_port; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
- },
- {
- "type" : "hexstr",
- "value" : "0x0868"
- }
- ],
- "source_info" : {
- "filename" : "include/control/spgw.p4",
- "line" : 235,
- "column" : 27,
- "source_fragment" : "= 2152; ..."
- }
}
]
},
{
- "name" : "FabricIngress.spgw_ingress.load_dbuf_far_attributes",
- "id" : 40,
+ "name" : "FabricIngress.spgw.load_tunnel_far",
+ "id" : 42,
"runtime_data" : [
{
"name" : "drop",
@@ -4760,7 +4399,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 222,
+ "line" : 197,
"column" : 34,
"source_fragment" : "= (bool)drop; ..."
}
@@ -4799,7 +4438,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 223,
+ "line" : 198,
"column" : 28,
"source_fragment" : "= (bool)drop; ..."
}
@@ -4809,7 +4448,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
},
{
"type" : "expression",
@@ -4838,7 +4477,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 224,
+ "line" : 199,
"column" : 36,
"source_fragment" : "= (bool)notify_cp; ..."
}
@@ -4848,7 +4487,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
},
{
"type" : "expression",
@@ -4867,7 +4506,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 226,
+ "line" : 201,
"column" : 40,
"source_fragment" : "= true; ..."
}
@@ -4877,7 +4516,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
},
{
"type" : "runtime_data",
@@ -4886,7 +4525,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 227,
+ "line" : 202,
"column" : 28,
"source_fragment" : "= teid; ..."
}
@@ -4896,7 +4535,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
},
{
"type" : "runtime_data",
@@ -4905,7 +4544,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 228,
+ "line" : 203,
"column" : 39,
"source_fragment" : "= tunnel_src_port; ..."
}
@@ -4915,7 +4554,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
},
{
"type" : "runtime_data",
@@ -4924,7 +4563,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 229,
+ "line" : 204,
"column" : 39,
"source_fragment" : "= tunnel_src_addr; ..."
}
@@ -4934,7 +4573,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
},
{
"type" : "runtime_data",
@@ -4943,7 +4582,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 230,
+ "line" : 205,
"column" : 39,
"source_fragment" : "= tunnel_dst_addr; ..."
}
@@ -4962,7 +4601,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 232,
+ "line" : 207,
"column" : 32,
"source_fragment" : "= tunnel_src_addr; ..."
}
@@ -4981,7 +4620,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 233,
+ "line" : 208,
"column" : 32,
"source_fragment" : "= tunnel_dst_addr; ..."
}
@@ -5000,7 +4639,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 234,
+ "line" : 209,
"column" : 27,
"source_fragment" : "= tunnel_src_port; ..."
}
@@ -5019,17 +4658,166 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 235,
+ "line" : 210,
"column" : 27,
"source_fragment" : "= 2152; ..."
}
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.spgw.load_dbuf_far",
+ "id" : 43,
+ "runtime_data" : [
+ {
+ "name" : "drop",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "notify_cp",
+ "bitwidth" : 1
+ },
+ {
+ "name" : "tunnel_src_port",
+ "bitwidth" : 16
+ },
+ {
+ "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._skip_forwarding6"]
+ },
+ {
+ "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/control/spgw.p4",
+ "line" : 197,
+ "column" : 34,
+ "source_fragment" : "= (bool)drop; ..."
+ }
},
{
"op" : "assign",
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
+ "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+ },
+ {
+ "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/control/spgw.p4",
+ "line" : 198,
+ "column" : 28,
+ "source_fragment" : "= (bool)drop; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+ },
+ {
+ "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/control/spgw.p4",
+ "line" : 199,
+ "column" : 36,
+ "source_fragment" : "= (bool)notify_cp; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
},
{
"type" : "expression",
@@ -5048,7 +4836,188 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 246,
+ "line" : 201,
+ "column" : 40,
+ "source_fragment" : "= true; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 5
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 202,
+ "column" : 28,
+ "source_fragment" : "= teid; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 203,
+ "column" : 39,
+ "source_fragment" : "= tunnel_src_port; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 204,
+ "column" : 39,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 4
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 205,
+ "column" : 39,
+ "source_fragment" : "= tunnel_dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 207,
+ "column" : 32,
+ "source_fragment" : "= tunnel_src_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 4
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 208,
+ "column" : 32,
+ "source_fragment" : "= tunnel_dst_addr; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 209,
+ "column" : 27,
+ "source_fragment" : "= tunnel_src_port; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x0868"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 210,
+ "column" : 27,
+ "source_fragment" : "= 2152; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "b2d",
+ "left" : null,
+ "right" : {
+ "type" : "bool",
+ "value" : true
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/control/spgw.p4",
+ "line" : 221,
"column" : 43,
"source_fragment" : "= true; ..."
}
@@ -5057,7 +5026,7 @@
},
{
"name" : "act",
- "id" : 41,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -5137,7 +5106,7 @@
},
{
"name" : "act_0",
- "id" : 42,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -5145,7 +5114,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "spgw_ingress_tmp"]
+ "value" : ["scalars", "spgw_tmp"]
},
{
"type" : "expression",
@@ -5167,7 +5136,7 @@
},
{
"name" : "act_1",
- "id" : 43,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -5175,7 +5144,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "spgw_ingress_tmp"]
+ "value" : ["scalars", "spgw_tmp"]
},
{
"type" : "expression",
@@ -5197,7 +5166,7 @@
},
{
"name" : "act_2",
- "id" : 44,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -5205,16 +5174,16 @@
"parameters" : [
{
"type" : "counter_array",
- "value" : "FabricIngress.spgw_ingress.pdr_counter"
+ "value" : "FabricIngress.spgw.pdr_counter"
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 282,
+ "line" : 256,
"column" : 16,
"source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
}
@@ -5223,7 +5192,7 @@
},
{
"name" : "act_3",
- "id" : 45,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -5231,7 +5200,7 @@
"parameters" : [
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
},
{
"type" : "field",
@@ -5240,7 +5209,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 299,
+ "line" : 273,
"column" : 36,
"source_fragment" : "= hdr.ipv4.total_len; ..."
}
@@ -5249,7 +5218,7 @@
},
{
"name" : "act_4",
- "id" : 46,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -5313,7 +5282,7 @@
},
{
"name" : "act_5",
- "id" : 47,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -5339,7 +5308,7 @@
},
{
"name" : "act_6",
- "id" : 48,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -5397,7 +5366,7 @@
},
{
"name" : "act_7",
- "id" : 49,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -5455,13 +5424,13 @@
},
{
"name" : "nop",
- "id" : 50,
+ "id" : 53,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.egress_next.pop_mpls_if_present",
- "id" : 51,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -5502,7 +5471,7 @@
},
{
"name" : "FabricEgress.egress_next.set_mpls",
- "id" : 52,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -5610,7 +5579,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 127,
+ "line" : 116,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -5619,7 +5588,7 @@
},
{
"name" : "FabricEgress.egress_next.push_vlan",
- "id" : 53,
+ "id" : 56,
"runtime_data" : [],
"primitives" : [
{
@@ -5689,7 +5658,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -5717,7 +5686,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 54,
+ "id" : 57,
"runtime_data" : [],
"primitives" : [
{
@@ -5738,8 +5707,8 @@
]
},
{
- "name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 55,
+ "name" : "FabricEgress.spgw.gtpu_encap",
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -5752,7 +5721,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 317,
+ "line" : 291,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.setValid()"
}
@@ -5771,7 +5740,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 318,
+ "line" : 292,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.version = 4"
}
@@ -5790,7 +5759,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 144,
+ "line" : 133,
"column" : 28,
"source_fragment" : "5; ..."
}
@@ -5809,7 +5778,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 320,
+ "line" : 294,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
}
@@ -5828,7 +5797,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 321,
+ "line" : 295,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
}
@@ -5870,7 +5839,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 322,
+ "line" : 296,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
}
@@ -5889,7 +5858,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 324,
+ "line" : 298,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
}
@@ -5908,7 +5877,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 325,
+ "line" : 299,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.flags = 0"
}
@@ -5927,7 +5896,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 326,
+ "line" : 300,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
}
@@ -5946,7 +5915,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 157,
+ "line" : 146,
"column" : 32,
"source_fragment" : "64; ..."
}
@@ -5965,7 +5934,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 141,
+ "line" : 130,
"column" : 25,
"source_fragment" : "17; ..."
}
@@ -5979,12 +5948,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 329,
+ "line" : 303,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
}
@@ -5998,12 +5967,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 330,
+ "line" : 304,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
}
@@ -6022,7 +5991,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 331,
+ "line" : 305,
"column" : 8,
"source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
}
@@ -6037,7 +6006,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 333,
+ "line" : 307,
"column" : 8,
"source_fragment" : "hdr.gtpu_udp.setValid()"
}
@@ -6051,12 +6020,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 334,
+ "line" : 308,
"column" : 8,
"source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
}
@@ -6075,7 +6044,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 335,
+ "line" : 309,
"column" : 8,
"source_fragment" : "hdr.gtpu_udp.dport = 2152"
}
@@ -6099,7 +6068,7 @@
"op" : "+",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
},
"right" : {
"type" : "hexstr",
@@ -6117,7 +6086,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 336,
+ "line" : 310,
"column" : 8,
"source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
}
@@ -6136,7 +6105,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 338,
+ "line" : 312,
"column" : 8,
"source_fragment" : "hdr.gtpu_udp.checksum = 0"
}
@@ -6151,7 +6120,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 341,
+ "line" : 315,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.setValid()"
}
@@ -6170,7 +6139,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 342,
+ "line" : 316,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.version = 0x01"
}
@@ -6189,7 +6158,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 343,
+ "line" : 317,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.pt = 0x01"
}
@@ -6208,7 +6177,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 344,
+ "line" : 318,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.spare = 0"
}
@@ -6227,7 +6196,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 345,
+ "line" : 319,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
}
@@ -6246,7 +6215,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 346,
+ "line" : 320,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
}
@@ -6265,7 +6234,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 347,
+ "line" : 321,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
}
@@ -6284,7 +6253,7 @@
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 348,
+ "line" : 322,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
}
@@ -6298,12 +6267,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 349,
+ "line" : 323,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
}
@@ -6317,12 +6286,12 @@
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 350,
+ "line" : 324,
"column" : 8,
"source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
}
@@ -6331,7 +6300,7 @@
},
{
"name" : "act_8",
- "id" : 56,
+ "id" : 59,
"runtime_data" : [],
"primitives" : [
{
@@ -6348,7 +6317,7 @@
},
{
"name" : "act_9",
- "id" : 57,
+ "id" : 60,
"runtime_data" : [],
"primitives" : [
{
@@ -6399,7 +6368,7 @@
},
{
"name" : "act_10",
- "id" : 58,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -6421,7 +6390,7 @@
},
{
"name" : "act_11",
- "id" : 59,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -6451,7 +6420,7 @@
},
{
"name" : "act_12",
- "id" : 60,
+ "id" : 63,
"runtime_data" : [],
"primitives" : [
{
@@ -6481,7 +6450,7 @@
},
{
"name" : "act_13",
- "id" : 61,
+ "id" : 64,
"runtime_data" : [],
"primitives" : [
{
@@ -6503,7 +6472,7 @@
},
{
"name" : "act_14",
- "id" : 62,
+ "id" : 65,
"runtime_data" : [],
"primitives" : [
{
@@ -6552,7 +6521,7 @@
},
{
"name" : "act_15",
- "id" : 63,
+ "id" : 66,
"runtime_data" : [],
"primitives" : [
{
@@ -6574,7 +6543,7 @@
},
{
"name" : "act_16",
- "id" : 64,
+ "id" : 67,
"runtime_data" : [],
"primitives" : [
{
@@ -6623,7 +6592,7 @@
},
{
"name" : "act_17",
- "id" : 65,
+ "id" : 68,
"runtime_data" : [],
"primitives" : [
{
@@ -6631,16 +6600,16 @@
"parameters" : [
{
"type" : "counter_array",
- "value" : "FabricEgress.spgw_egress.pdr_counter"
+ "value" : "FabricEgress.spgw.pdr_counter"
},
{
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
}
],
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 359,
+ "line" : 333,
"column" : 16,
"source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
}
@@ -6676,27 +6645,27 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [44],
"actions" : ["act"],
- "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
+ "base_default_next" : "FabricIngress.spgw.interfaces",
"next_tables" : {
- "act" : "FabricIngress.spgw_ingress.interface_lookup"
+ "act" : "FabricIngress.spgw.interfaces"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.interface_lookup",
+ "name" : "FabricIngress.spgw.interfaces",
"id" : 1,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 128,
+ "line" : 130,
"column" : 10,
- "source_fragment" : "interface_lookup"
+ "source_fragment" : "interfaces"
},
"key" : [
{
@@ -6718,17 +6687,17 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
- "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
+ "action_ids" : [37, 38],
+ "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
"base_default_next" : null,
"next_tables" : {
"__HIT__" : "tbl_act_0",
"__MISS__" : "tbl_act_1"
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 38,
"action_const" : true,
- "action_data" : ["0x0", "0x0", "0x1"],
+ "action_data" : [],
"action_entry_const" : true
}
},
@@ -6742,14 +6711,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [45],
"actions" : ["act_0"],
"base_default_next" : "node_7",
"next_tables" : {
"act_0" : "node_7"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6765,21 +6734,21 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [46],
"actions" : ["act_1"],
"base_default_next" : "node_7",
"next_tables" : {
"act_1" : "node_7"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
+ "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
"id" : 4,
"source_info" : {
"filename" : "include/control/spgw.p4",
@@ -6813,17 +6782,17 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 28, 29, 30],
- "actions" : ["FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown"],
+ "action_ids" : [29, 30, 31, 32],
+ "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
"base_default_next" : "node_10",
"next_tables" : {
- "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
- "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
- "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
- "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
+ "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+ "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+ "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+ "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
},
"default_entry" : {
- "action_id" : 30,
+ "action_id" : 32,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6851,7 +6820,7 @@
}
],
"action_entry" : {
- "action_id" : 27,
+ "action_id" : 29,
"action_data" : []
},
"priority" : 1
@@ -6878,7 +6847,7 @@
}
],
"action_entry" : {
- "action_id" : 28,
+ "action_id" : 30,
"action_data" : []
},
"priority" : 2
@@ -6905,7 +6874,7 @@
}
],
"action_entry" : {
- "action_id" : 29,
+ "action_id" : 31,
"action_data" : []
},
"priority" : 3
@@ -6913,13 +6882,13 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+ "name" : "FabricIngress.spgw.uplink_pdrs",
"id" : 5,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 166,
+ "line" : 168,
"column" : 10,
- "source_fragment" : "uplink_pdr_lookup"
+ "source_fragment" : "uplink_pdrs"
},
"key" : [
{
@@ -6941,27 +6910,28 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
- "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+ "action_ids" : [40, 8],
+ "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
"base_default_next" : "node_13",
"next_tables" : {
- "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+ "FabricIngress.spgw.load_pdr" : "node_13",
+ "NoAction" : "node_13"
},
"default_entry" : {
- "action_id" : 37,
- "action_const" : true,
- "action_data" : ["0x0", "0x0", "0x0"],
- "action_entry_const" : true
+ "action_id" : 8,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
}
},
{
- "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+ "name" : "FabricIngress.spgw.downlink_pdrs",
"id" : 6,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 155,
+ "line" : 157,
"column" : 10,
- "source_fragment" : "downlink_pdr_lookup"
+ "source_fragment" : "downlink_pdrs"
},
"key" : [
{
@@ -6977,17 +6947,18 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36],
- "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+ "action_ids" : [39, 7],
+ "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
"base_default_next" : "node_13",
"next_tables" : {
- "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+ "FabricIngress.spgw.load_pdr" : "node_13",
+ "NoAction" : "node_13"
},
"default_entry" : {
- "action_id" : 36,
- "action_const" : true,
- "action_data" : ["0x0", "0x0", "0x0"],
- "action_entry_const" : true
+ "action_id" : 7,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
}
},
{
@@ -6995,7 +6966,7 @@
"id" : 7,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 282,
+ "line" : 256,
"column" : 16,
"source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
},
@@ -7006,21 +6977,21 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [47],
"actions" : ["act_2"],
"base_default_next" : "node_15",
"next_tables" : {
"act_2" : "node_15"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
+ "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
"id" : 8,
"source_info" : {
"filename" : "include/control/spgw.p4",
@@ -7054,17 +7025,17 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31, 32, 33, 34],
- "actions" : ["FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown"],
- "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+ "action_ids" : [33, 34, 35, 36],
+ "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
+ "base_default_next" : "FabricIngress.spgw.fars",
"next_tables" : {
- "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
- "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
- "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
- "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+ "FabricIngress.spgw.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw.fars",
+ "FabricIngress.spgw.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw.fars",
+ "FabricIngress.spgw.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw.fars",
+ "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 36,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7092,7 +7063,7 @@
}
],
"action_entry" : {
- "action_id" : 31,
+ "action_id" : 33,
"action_data" : []
},
"priority" : 1
@@ -7119,7 +7090,7 @@
}
],
"action_entry" : {
- "action_id" : 32,
+ "action_id" : 34,
"action_data" : []
},
"priority" : 2
@@ -7146,7 +7117,7 @@
}
],
"action_entry" : {
- "action_id" : 33,
+ "action_id" : 35,
"action_data" : []
},
"priority" : 3
@@ -7154,19 +7125,19 @@
]
},
{
- "name" : "FabricIngress.spgw_ingress.far_lookup",
+ "name" : "FabricIngress.spgw.fars",
"id" : 9,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 249,
+ "line" : 224,
"column" : 10,
- "source_fragment" : "far_lookup"
+ "source_fragment" : "fars"
},
"key" : [
{
"match_type" : "exact",
"name" : "far_id",
- "target" : ["scalars", "fabric_metadata_t._spgw_far_id26"],
+ "target" : ["scalars", "fabric_metadata_t._spgw_far_id25"],
"mask" : null
}
],
@@ -7176,16 +7147,16 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38, 39, 40],
- "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes", "FabricIngress.spgw_ingress.load_dbuf_far_attributes"],
+ "action_ids" : [41, 42, 43],
+ "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
"base_default_next" : "tbl_act_3",
"next_tables" : {
- "FabricIngress.spgw_ingress.load_normal_far_attributes" : "tbl_act_3",
- "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "tbl_act_3",
- "FabricIngress.spgw_ingress.load_dbuf_far_attributes" : "tbl_act_3"
+ "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
+ "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
+ "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 41,
"action_const" : true,
"action_data" : ["0x1", "0x0"],
"action_entry_const" : true
@@ -7196,7 +7167,7 @@
"id" : 10,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 299,
+ "line" : 273,
"column" : 36,
"source_fragment" : "="
},
@@ -7207,14 +7178,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [48],
"actions" : ["act_3"],
"base_default_next" : "node_19",
"next_tables" : {
"act_3" : "node_19"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7236,14 +7207,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [49],
"actions" : ["act_4"],
"base_default_next" : "node_21",
"next_tables" : {
"act_4" : "node_21"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7265,14 +7236,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [50],
"actions" : ["act_5"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
"act_5" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7313,7 +7284,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [7, 8, 9],
+ "action_ids" : [9, 10, 11],
"actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -7322,7 +7293,7 @@
"FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
},
"default_entry" : {
- "action_id" : 7,
+ "action_id" : 9,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7369,14 +7340,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [10],
+ "action_ids" : [12],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_25",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_25"
},
"default_entry" : {
- "action_id" : 10,
+ "action_id" : 12,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -7411,7 +7382,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 0],
+ "action_ids" : [13, 0],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -7448,7 +7419,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12, 1],
+ "action_ids" : [14, 1],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -7485,7 +7456,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [13, 14, 2],
+ "action_ids" : [15, 16, 2],
"actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
"base_default_next" : "FabricIngress.acl.acl",
"next_tables" : {
@@ -7589,7 +7560,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 16, 17, 18, 19],
+ "action_ids" : [17, 18, 19, 20, 21],
"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_33",
"next_tables" : {
@@ -7600,7 +7571,7 @@
"FabricIngress.acl.nop_acl" : "node_33"
},
"default_entry" : {
- "action_id" : 19,
+ "action_id" : 21,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7635,7 +7606,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [21, 22, 4],
+ "action_ids" : [23, 24, 4],
"actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
@@ -7674,7 +7645,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [23, 24, 25, 5],
+ "action_ids" : [25, 26, 27, 5],
"actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
@@ -7707,7 +7678,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [26, 6],
+ "action_ids" : [28, 6],
"actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
"base_default_next" : "FabricIngress.next.next_vlan",
"next_tables" : {
@@ -7744,7 +7715,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 3],
+ "action_ids" : [22, 3],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "node_38",
"next_tables" : {
@@ -7774,14 +7745,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
+ "action_ids" : [51],
"actions" : ["act_6"],
"base_default_next" : "node_40",
"next_tables" : {
"act_6" : "node_40"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7803,14 +7774,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
+ "action_ids" : [52],
"actions" : ["act_7"],
"base_default_next" : null,
"next_tables" : {
"act_7" : null
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -7877,7 +7848,7 @@
}
},
"true_next" : "tbl_act",
- "false_next" : "FabricIngress.spgw_ingress.interface_lookup"
+ "false_next" : "FabricIngress.spgw.interfaces"
},
{
"name" : "node_7",
@@ -7889,7 +7860,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "spgw_ingress_tmp"]
+ "value" : ["scalars", "spgw_tmp"]
}
}
},
@@ -7901,7 +7872,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 272,
+ "line" : 246,
"column" : 16,
"source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
},
@@ -7911,7 +7882,7 @@
"op" : "==",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
},
"right" : {
"type" : "hexstr",
@@ -7919,7 +7890,7 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
+ "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
"false_next" : "node_10"
},
{
@@ -7927,7 +7898,7 @@
"id" : 3,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 276,
+ "line" : 250,
"column" : 16,
"source_fragment" : "hdr.gtpu.isValid()"
},
@@ -7942,15 +7913,15 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
- "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+ "true_next" : "FabricIngress.spgw.uplink_pdrs",
+ "false_next" : "FabricIngress.spgw.downlink_pdrs"
},
{
"name" : "node_13",
"id" : 4,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 281,
+ "line" : 255,
"column" : 16,
"source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
},
@@ -7960,7 +7931,7 @@
"op" : "!=",
"left" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
},
"right" : {
"type" : "hexstr",
@@ -7976,7 +7947,7 @@
"id" : 5,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 286,
+ "line" : 260,
"column" : 16,
"source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
},
@@ -7991,7 +7962,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
}
}
},
@@ -8001,8 +7972,8 @@
}
}
},
- "true_next" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
- "false_next" : "FabricIngress.spgw_ingress.far_lookup"
+ "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+ "false_next" : "FabricIngress.spgw.fars"
},
{
"name" : "node_19",
@@ -8282,14 +8253,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [56],
+ "action_ids" : [59],
"actions" : ["act_8"],
"base_default_next" : "node_46",
"next_tables" : {
"act_8" : "node_46"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 59,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8311,14 +8282,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
+ "action_ids" : [60],
"actions" : ["act_9"],
"base_default_next" : "node_48",
"next_tables" : {
"act_9" : "node_48"
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 60,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8340,14 +8311,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
+ "action_ids" : [61],
"actions" : ["act_10"],
"base_default_next" : "node_50",
"next_tables" : {
"act_10" : "node_50"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8369,14 +8340,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51],
+ "action_ids" : [54],
"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" : 51,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8398,14 +8369,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
+ "action_ids" : [55],
"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" : 52,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8440,7 +8411,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54, 50],
+ "action_ids" : [57, 53],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
"base_default_next" : null,
"next_tables" : {
@@ -8448,7 +8419,7 @@
"__MISS__" : "tbl_act_12"
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8464,14 +8435,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59],
+ "action_ids" : [62],
"actions" : ["act_11"],
"base_default_next" : "node_57",
"next_tables" : {
"act_11" : "node_57"
},
"default_entry" : {
- "action_id" : 59,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8487,14 +8458,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [60],
+ "action_ids" : [63],
"actions" : ["act_12"],
"base_default_next" : "node_57",
"next_tables" : {
"act_12" : "node_57"
},
"default_entry" : {
- "action_id" : 60,
+ "action_id" : 63,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8516,14 +8487,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [53],
+ "action_ids" : [56],
"actions" : ["FabricEgress.egress_next.push_vlan"],
"base_default_next" : "node_60",
"next_tables" : {
"FabricEgress.egress_next.push_vlan" : "node_60"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 56,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8545,14 +8516,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [62],
+ "action_ids" : [65],
"actions" : ["act_14"],
"base_default_next" : "node_62",
"next_tables" : {
"act_14" : "node_62"
},
"default_entry" : {
- "action_id" : 62,
+ "action_id" : 65,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8574,14 +8545,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
+ "action_ids" : [64],
"actions" : ["act_13"],
"base_default_next" : "node_68",
"next_tables" : {
"act_13" : "node_68"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 64,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8603,14 +8574,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [64],
+ "action_ids" : [67],
"actions" : ["act_16"],
"base_default_next" : "node_66",
"next_tables" : {
"act_16" : "node_66"
},
"default_entry" : {
- "action_id" : 64,
+ "action_id" : 67,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8632,25 +8603,25 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [63],
+ "action_ids" : [66],
"actions" : ["act_15"],
"base_default_next" : "node_68",
"next_tables" : {
"act_15" : "node_68"
},
"default_entry" : {
- "action_id" : 63,
+ "action_id" : 66,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_spgw_egress_gtpu_encap",
+ "name" : "tbl_spgw_gtpu_encap",
"id" : 38,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 356,
+ "line" : 330,
"column" : 16,
"source_fragment" : "gtpu_encap()"
},
@@ -8661,14 +8632,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
- "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+ "action_ids" : [58],
+ "actions" : ["FabricEgress.spgw.gtpu_encap"],
"base_default_next" : "node_71",
"next_tables" : {
- "FabricEgress.spgw_egress.gtpu_encap" : "node_71"
+ "FabricEgress.spgw.gtpu_encap" : "node_71"
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 58,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -8679,7 +8650,7 @@
"id" : 39,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 359,
+ "line" : 333,
"column" : 16,
"source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
},
@@ -8690,14 +8661,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [65],
+ "action_ids" : [68],
"actions" : ["act_17"],
"base_default_next" : null,
"next_tables" : {
"act_17" : null
},
"default_entry" : {
- "action_id" : 65,
+ "action_id" : 68,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -9046,7 +9017,7 @@
"id" : 26,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 354,
+ "line" : 328,
"column" : 12,
"source_fragment" : "fabric_md.spgw.skip_spgw == false"
},
@@ -9061,7 +9032,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
}
}
},
@@ -9079,7 +9050,7 @@
"id" : 27,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 355,
+ "line" : 329,
"column" : 16,
"source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
},
@@ -9094,7 +9065,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
}
}
},
@@ -9104,7 +9075,7 @@
}
}
},
- "true_next" : "tbl_spgw_egress_gtpu_encap",
+ "true_next" : "tbl_spgw_gtpu_encap",
"false_next" : "node_71"
},
{
@@ -9112,7 +9083,7 @@
"id" : 28,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 358,
+ "line" : 332,
"column" : 16,
"source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
},
@@ -9127,7 +9098,7 @@
"left" : null,
"right" : {
"type" : "field",
- "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
+ "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
}
}
},
@@ -9175,7 +9146,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/control/spgw.p4",
- "line" : 375,
+ "line" : 349,
"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 c96bbda..13a2236 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
@@ -365,9 +365,9 @@
}
tables {
preamble {
- id: 33584493
- name: "FabricIngress.spgw_ingress.interface_lookup"
- alias: "interface_lookup"
+ id: 33557250
+ name: "FabricIngress.spgw.interfaces"
+ alias: "interfaces"
}
match_fields {
id: 1
@@ -382,16 +382,21 @@
match_type: EXACT
}
action_refs {
- id: 16797935
+ id: 16810012
}
- const_default_action_id: 16797935
+ action_refs {
+ id: 16783042
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ const_default_action_id: 16783042
size: 128
}
tables {
preamble {
- id: 33586958
- name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
- alias: "downlink_pdr_lookup"
+ id: 33566601
+ name: "FabricIngress.spgw.downlink_pdrs"
+ alias: "downlink_pdrs"
}
match_fields {
id: 1
@@ -400,16 +405,20 @@
match_type: EXACT
}
action_refs {
- id: 16799934
+ id: 16800614
}
- const_default_action_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"
+ id: 33606410
+ name: "FabricIngress.spgw.uplink_pdrs"
+ alias: "uplink_pdrs"
}
match_fields {
id: 1
@@ -424,16 +433,20 @@
match_type: EXACT
}
action_refs {
- id: 16799934
+ id: 16800614
}
- const_default_action_id: 16799934
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
size: 1024
}
tables {
preamble {
- id: 33613200
- name: "FabricIngress.spgw_ingress.far_lookup"
- alias: "far_lookup"
+ id: 33599560
+ name: "FabricIngress.spgw.fars"
+ alias: "fars"
}
match_fields {
id: 1
@@ -442,15 +455,15 @@
match_type: EXACT
}
action_refs {
- id: 16834935
+ id: 16820307
}
action_refs {
- id: 16787606
+ id: 16814785
}
action_refs {
- id: 16801146
+ id: 16814681
}
- const_default_action_id: 16834935
+ const_default_action_id: 16820307
size: 2048
}
tables {
@@ -492,6 +505,13 @@
}
actions {
preamble {
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
id: 16836487
name: "FabricIngress.filtering.deny"
alias: "deny"
@@ -727,31 +747,28 @@
}
actions {
preamble {
- id: 16797935
- name: "FabricIngress.spgw_ingress.set_source_iface"
- alias: "set_source_iface"
+ id: 16810012
+ name: "FabricIngress.spgw.load_iface"
+ alias: "load_iface"
}
params {
id: 1
name: "src_iface"
bitwidth: 8
}
- params {
- id: 2
- name: "direction"
- bitwidth: 2
- }
- params {
- id: 3
- name: "skip_spgw"
- bitwidth: 1
+}
+actions {
+ preamble {
+ id: 16783042
+ name: "FabricIngress.spgw.iface_miss"
+ alias: "iface_miss"
}
}
actions {
preamble {
- id: 16799934
- name: "FabricIngress.spgw_ingress.set_pdr_attributes"
- alias: "set_pdr_attributes"
+ id: 16800614
+ name: "FabricIngress.spgw.load_pdr"
+ alias: "load_pdr"
}
params {
id: 1
@@ -771,9 +788,9 @@
}
actions {
preamble {
- id: 16834935
- name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
- alias: "load_normal_far_attributes"
+ id: 16820307
+ name: "FabricIngress.spgw.load_normal_far"
+ alias: "load_normal_far"
}
params {
id: 1
@@ -788,9 +805,9 @@
}
actions {
preamble {
- id: 16787606
- name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
- alias: "load_tunnel_far_attributes"
+ id: 16814785
+ name: "FabricIngress.spgw.load_tunnel_far"
+ alias: "load_tunnel_far"
}
params {
id: 1
@@ -825,9 +842,9 @@
}
actions {
preamble {
- id: 16801146
- name: "FabricIngress.spgw_ingress.load_dbuf_far_attributes"
- alias: "load_dbuf_far_attributes"
+ id: 16814681
+ name: "FabricIngress.spgw.load_dbuf_far"
+ alias: "load_dbuf_far"
}
params {
id: 1
@@ -902,9 +919,9 @@
}
counters {
preamble {
- id: 302029884
- name: "FabricIngress.spgw_ingress.pdr_counter"
- alias: "spgw_ingress.pdr_counter"
+ id: 302043952
+ name: "FabricIngress.spgw.pdr_counter"
+ alias: "FabricIngress.spgw.pdr_counter"
}
spec {
unit: BOTH
@@ -913,9 +930,9 @@
}
counters {
preamble {
- id: 302012289
- name: "FabricEgress.spgw_egress.pdr_counter"
- alias: "spgw_egress.pdr_counter"
+ id: 302049491
+ name: "FabricEgress.spgw.pdr_counter"
+ alias: "FabricEgress.spgw.pdr_counter"
}
spec {
unit: BOTH