Skip to content

Commit

Permalink
Update wbb.p4info.pb.txt (openconfig#1935)
Browse files Browse the repository at this point in the history 
Update p4info using the sonic-pins version: https://github.com/sonic-net/sonic-pins/blob/main/sai_p4/instantiations/google/wbb.p4info.pb.txt
  • Loading branch information
@Ankur19 @frasieroh
Ankur19 authored and frasieroh committed Jul 25, 2023
1 parent 98230aa commit 0221bad
Showing 1 changed file with 4 additions and 123 deletions.
127 changes: 4 additions & 123 deletions feature/experimental/p4rt/wbb.p4info.pb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,33 +99,6 @@ tables {
const_default_action_id: 21257015
size: 256
}
tables {
preamble {
id: 33554512
name: "ingress.routing.tunnel_table"
alias: "tunnel_table"
annotations: "@p4runtime_role(\"sdn_controller\")"
}
match_fields {
id: 1
name: "tunnel_id"
match_type: EXACT
type_name {
name: "tunnel_id_t"
}
}
action_refs {
id: 16777235
annotations: "@proto_id(1)"
}
action_refs {
id: 21257015
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
const_default_action_id: 21257015
size: 512
}
tables {
preamble {
id: 33554498
Expand All @@ -145,10 +118,6 @@ tables {
id: 16777219
annotations: "@proto_id(1)"
}
action_refs {
id: 16777234
annotations: "@proto_id(2)"
}
action_refs {
id: 16777236
annotations: "@proto_id(3)"
Expand Down Expand Up @@ -195,7 +164,7 @@ tables {
id: 33554506
name: "ingress.routing.vrf_table"
alias: "vrf_table"
annotations: "@entry_restriction(\"\n // The VRF ID 0 (or \'\' in P4Runtime) encodes the default VRF, which cannot\n // be read or written via this table, but is always present implicitly.\n // TODO(b/197988347): This constraint should read `vrf_id != \'\'` (since\n // constraints are a control plane (P4Runtime) concept), but\n // p4-constraints does not currently support strings.\n vrf_id != 0;\n \")"
annotations: "@entry_restriction(\"\n // The VRF ID 0 (or \'\' in P4Runtime) encodes the default VRF, which cannot\n // be read or written via this table, but is always present implicitly.\n // TODO: This constraint should read `vrf_id != \'\'` (since\n // constraints are a control plane (P4Runtime) concept), but\n // p4-constraints does not currently support strings.\n vrf_id != 0;\n \")"
annotations: "@p4runtime_role(\"sdn_controller\")"
}
match_fields {
Expand Down Expand Up @@ -320,7 +289,7 @@ tables {
alias: "acl_wbb_ingress_table"
annotations: "@p4runtime_role(\"sdn_controller\")"
annotations: "@sai_acl(INGRESS)"
annotations: "@entry_restriction(\"\n // WBB only allows for very specific table entries:\n\n // Traceroute (6 entries)\n (\n // IPv4 or IPv6\n ((is_ipv4 == 1 && is_ipv6::mask == 0) ||\n (is_ipv4::mask == 0 && is_ipv6 == 1)) &&\n // TTL 0, 1, and 2\n (ttl == 0 || ttl == 1 || ttl == 2) &&\n ether_type::mask == 0 && outer_vlan_id::mask == 0\n ) ||\n // LLDP\n (\n ether_type == 0x88cc &&\n is_ipv4::mask == 0 && is_ipv6::mask == 0 && ttl::mask == 0 &&\n outer_vlan_id::mask == 0\n ) ||\n // ND\n (\n // TODO(b/188575259) remove optional match for VLAN ID once VLAN ID is\n // completely removed from ND flows.\n (( outer_vlan_id::mask == 0xfff && outer_vlan_id == 0x0FA0) ||\n outer_vlan_id::mask == 0);\n ether_type == 0x6007;\n is_ipv4::mask == 0;\n is_ipv6::mask == 0;\n ttl::mask == 0\n )\n \")"
annotations: "@entry_restriction(\"\n // WBB only allows for very specific table entries:\n\n // Traceroute (6 entries)\n (\n // IPv4 or IPv6\n ((is_ipv4 == 1 && is_ipv6::mask == 0) ||\n (is_ipv4::mask == 0 && is_ipv6 == 1)) &&\n // TTL 0, 1, and 2\n (ttl == 0 || ttl == 1 || ttl == 2) &&\n ether_type::mask == 0 && outer_vlan_id::mask == 0\n ) ||\n // LLDP\n (\n ether_type == 0x88cc &&\n is_ipv4::mask == 0 && is_ipv6::mask == 0 && ttl::mask == 0 &&\n outer_vlan_id::mask == 0\n ) ||\n // ND\n (\n // TODO remove optional match for VLAN ID once VLAN ID is\n // completely removed from ND flows.\n (( outer_vlan_id::mask == 0xfff && outer_vlan_id == 0x0FA0) ||\n outer_vlan_id::mask == 0);\n ether_type == 0x6007;\n is_ipv4::mask == 0;\n is_ipv6::mask == 0;\n ttl::mask == 0\n )\n \")"
}
match_fields {
id: 1
Expand Down Expand Up @@ -444,41 +413,6 @@ actions {
alias: "admit_to_l3"
}
}
actions {
preamble {
id: 17825802
name: "ingress.hashing.select_ecmp_hash_algorithm"
alias: "select_ecmp_hash_algorithm"
annotations: "@sai_hash_algorithm(SAI_HASH_ALGORITHM_CRC_32LO)"
annotations: "@sai_hash_seed(0)"
annotations: "@sai_hash_offset(0)"
}
}
actions {
preamble {
id: 16777227
name: "ingress.hashing.compute_ecmp_hash_ipv4"
alias: "compute_ecmp_hash_ipv4"
annotations: "@sai_ecmp_hash(SAI_SWITCH_ATTR_ECMP_HASH_IPV4)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_SRC_IPV4)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_DST_IPV4)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_L4_SRC_PORT)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_L4_DST_PORT)"
}
}
actions {
preamble {
id: 16777228
name: "ingress.hashing.compute_ecmp_hash_ipv6"
alias: "compute_ecmp_hash_ipv6"
annotations: "@sai_ecmp_hash(SAI_SWITCH_ATTR_ECMP_HASH_IPV6)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_SRC_IPV6)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_DST_IPV6)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_L4_SRC_PORT)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_L4_DST_PORT)"
annotations: "@sai_native_hash_field(SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL)"
}
}
actions {
preamble {
id: 16777217
Expand Down Expand Up @@ -512,35 +446,6 @@ actions {
bitwidth: 48
}
}
actions {
preamble {
id: 16777235
name: "ingress.routing.mark_for_p2p_tunnel_encap"
alias: "mark_for_p2p_tunnel_encap"
}
params {
id: 1
name: "encap_src_ip"
annotations: "@format(IPV6_ADDRESS)"
bitwidth: 128
}
params {
id: 2
name: "encap_dst_ip"
annotations: "@format(IPV6_ADDRESS)"
annotations: "@refers_to(neighbor_table , neighbor_id)"
bitwidth: 128
}
params {
id: 3
name: "router_interface_id"
annotations: "@refers_to(neighbor_table , router_interface_id)"
annotations: "@refers_to(router_interface_table , router_interface_id)"
type_name {
name: "router_interface_id_t"
}
}
}
actions {
preamble {
id: 16777236
Expand Down Expand Up @@ -588,21 +493,6 @@ actions {
bitwidth: 128
}
}
actions {
preamble {
id: 16777234
name: "ingress.routing.set_p2p_tunnel_encap_nexthop"
alias: "set_p2p_tunnel_encap_nexthop"
}
params {
id: 1
name: "tunnel_id"
annotations: "@refers_to(tunnel_table , tunnel_id)"
type_name {
name: "tunnel_id_t"
}
}
}
actions {
preamble {
id: 16777221
Expand Down Expand Up @@ -778,8 +668,8 @@ action_profiles {
}
table_ids: 33554499
with_selector: true
size: 16128
max_group_size: 512
size: 65536
max_group_size: 256
}
direct_counters {
preamble {
Expand Down Expand Up @@ -887,15 +777,6 @@ type_info {
}
}
}
new_types {
key: "tunnel_id_t"
value {
translated_type {
sdn_string {
}
}
}
}
new_types {
key: "vrf_id_t"
value {
Expand Down

0 comments on commit 0221bad

Please sign in to comment.