Skip to content

Commit

Permalink
[ha] Fix action param ha_set_id annotation (sonic-net#615)
Browse files Browse the repository at this point in the history
Correct annotation tag typo (SalVal -> SaiVal) for action param
`ha_set_id`. It generates correct type of `ha_set_id` in ha spec
dash_ha.yaml and then in SAI header `saiexperimentaldashha.h`. In the
end it fixes the issue
opencomputeproject/SAI#2057.
  • Loading branch information
jimmyzhai authored Aug 19, 2024
1 parent 173f1c7 commit 932720b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions dash-pipeline/SAI/specs/dash_ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,15 @@ sai_apis:
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_HA_SCOPE_ATTR_HA_SET_ID
description: Action parameter HA set id
type: sai_uint16_t
type: sai_object_id_t
attr_value_field: u16
default: '0'
default: SAI_NULL_OBJECT_ID
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
allow_null: false
object_name: SAI_OBJECT_TYPE_HA_SET
allow_null: true
valid_only: null
is_vlan: true
is_vlan: false
deprecated: false
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_HA_SCOPE_ATTR_DASH_HA_ROLE
Expand Down
2 changes: 1 addition & 1 deletion dash-pipeline/bmv2/stages/ha.p4
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ control ha_stage(inout headers_t hdr,
// HA scope:
//
action set_ha_scope_attr(
@SalVal[type="sai_object_id_t"] bit<16> ha_set_id,
@SaiVal[type="sai_object_id_t"] bit<16> ha_set_id,
@SaiVal[type="sai_dash_ha_role_t"] dash_ha_role_t dash_ha_role,
@SaiVal[isreadonly="true"] bit<32> flow_version,
bit<1> flow_reconcile_requested,
Expand Down

0 comments on commit 932720b

Please sign in to comment.