Skip to content

[action] [PR:3841] [ssw][ha] set SAI_HA_SCOPE_ATTR_ADMIN_STATE #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Sep 11, 2025
Merged

[action] [PR:3841] [ssw][ha] set SAI_HA_SCOPE_ATTR_ADMIN_STATE #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion orchagent/dash/dashhaorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,12 @@ bool DashHaOrch::addHaScopeEntry(const std::string &key, const dash::ha_scope::H
repeated_message = false;
}

if (ha_scope_it->second.metadata.disabled() != entry.disabled())
{
success = success && setHaScopeDisabled(key, entry.disabled());
repeated_message = false;
}

if (repeated_message)
{
SWSS_LOG_WARN("HA Scope entry already exists for %s", key.c_str());
Expand Down Expand Up @@ -435,6 +441,11 @@ bool DashHaOrch::addHaScopeEntry(const std::string &key, const dash::ha_scope::H
ha_role_attr.value.u16 = to_sai(entry.ha_role());
ha_scope_attrs.push_back(ha_role_attr);

sai_attribute_t disabled_attr = {};
disabled_attr.id = SAI_HA_SCOPE_ATTR_ADMIN_STATE;
disabled_attr.value.booldata = !entry.disabled();
ha_scope_attrs.push_back(disabled_attr);

if (entry.has_vip_v4() && entry.vip_v4().has_ipv4())
{
sai_ip_address_t sai_vip_v4 = {};
Expand Down Expand Up @@ -638,6 +649,35 @@ bool DashHaOrch::setHaScopeActivateRoleRequest(const std::string &key)
return true;
}

bool DashHaOrch::setHaScopeDisabled(const std::string &key, bool disabled)
{
SWSS_LOG_ENTER();

sai_object_id_t ha_scope_id = m_ha_scope_entries[key].ha_scope_id;

sai_attribute_t ha_scope_attr;
ha_scope_attr.id = SAI_HA_SCOPE_ATTR_ADMIN_STATE;
ha_scope_attr.value.booldata = !disabled;

sai_status_t status = sai_dash_ha_api->set_ha_scope_attribute(ha_scope_id,
&ha_scope_attr);

if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set HA Scope admin state to %d in SAI for %s", disabled, key.c_str());
task_process_status handle_status = handleSaiSetStatus((sai_api_t) SAI_API_DASH_HA, status);
if (handle_status != task_success)
{
return parseHandleSaiStatusFailure(handle_status);
}
}

m_ha_scope_entries[key].metadata.set_disabled(disabled);
SWSS_LOG_NOTICE("Set HA Scope admin state for %s to %d", key.c_str(), !disabled);

return true;
}

bool DashHaOrch::setEniHaScopeId(const sai_object_id_t eni_id, const sai_object_id_t ha_scope_id)
{
SWSS_LOG_ENTER();
Expand Down Expand Up @@ -708,6 +748,12 @@ void DashHaOrch::doTaskHaScopeTable(ConsumerBase &consumer)
{
dash::ha_scope::HaScope entry;

auto existing_it = m_ha_scope_entries.find(key);
if (existing_it != m_ha_scope_entries.end())
{
// Start with existing entry to preserve unmodified fields
entry.CopyFrom(existing_it->second.metadata);
}

/*
* For HA internal tables, kfv format was used instead of serialized pb objects in the end.
Expand Down Expand Up @@ -1066,4 +1112,4 @@ bool DashHaOrch::convertKfvToHaScopePb(const std::vector<FieldValueTuple> &kfv,
}
}
return true;
}
}
1 change: 1 addition & 0 deletions orchagent/dash/dashhaorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class DashHaOrch : public ZmqOrch
bool setHaScopeHaRole(const std::string &key, const dash::ha_scope::HaScope &entry);
bool setHaScopeFlowReconcileRequest(const std::string &key);
bool setHaScopeActivateRoleRequest(const std::string &key);
bool setHaScopeDisabled(const std::string &key, bool disabled);
bool setEniHaScopeId(const sai_object_id_t eni_id, const sai_object_id_t ha_scope_id);
bool register_ha_set_notifier();
bool register_ha_scope_notifier();
Expand Down
18 changes: 12 additions & 6 deletions tests/mock_tests/dashhaorch_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ namespace dashhaorch_ut
{"ha_role", "dead"},
{"ha_set_id", "HA_SET_1"},
{"vip_v4", "10.0.0.1"},
{"vip_v6", "3:2::1:0"}
{"vip_v6", "3:2::1:0"},
{"disabled", "true"}
}
}
}
Expand Down Expand Up @@ -312,7 +313,8 @@ namespace dashhaorch_ut
SET_COMMAND,
{
{"version", "1"},
{"ha_role", role}
{"ha_role", role},
{"disabled", "false"}
}
}
}
Expand Down Expand Up @@ -715,11 +717,13 @@ namespace dashhaorch_ut
CreateHaScope();

EXPECT_EQ(to_sai(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.ha_role()), SAI_DASH_HA_ROLE_DEAD);
EXPECT_TRUE(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.disabled());

SetHaScopeHaRole();
HaScopeEvent(SAI_HA_SCOPE_EVENT_STATE_CHANGED,
SAI_DASH_HA_ROLE_ACTIVE, SAI_DASH_HA_STATE_ACTIVE);
EXPECT_EQ(to_sai(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.ha_role()), SAI_DASH_HA_ROLE_ACTIVE);
EXPECT_FALSE(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.disabled());

SetHaScopeHaRole("");
HaScopeEvent(SAI_HA_SCOPE_EVENT_STATE_CHANGED,
Expand Down Expand Up @@ -788,8 +792,7 @@ namespace dashhaorch_ut
EXPECT_EQ(to_sai(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.ha_role()), SAI_DASH_HA_ROLE_SWITCHING_TO_ACTIVE);

EXPECT_CALL(*mock_sai_dash_ha_api, set_ha_scope_attribute)
.Times(2) // Set ha_role and activate_role_requested
.WillRepeatedly(Return(SAI_STATUS_SUCCESS));
.Times(2); // Set ha_role and activate_role_requested

SetHaScopeActivateRoleRequest();

Expand All @@ -810,12 +813,15 @@ namespace dashhaorch_ut
HaScopeEvent(SAI_HA_SCOPE_EVENT_FLOW_RECONCILE_NEEDED,
SAI_DASH_HA_ROLE_ACTIVE, SAI_DASH_HA_STATE_ACTIVE);

EXPECT_TRUE(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.disabled());

EXPECT_CALL(*mock_sai_dash_ha_api, set_ha_scope_attribute)
.Times(1)
.WillOnce(Return(SAI_STATUS_SUCCESS));
.Times(1);

SetHaScopeFlowReconcileRequest();

EXPECT_TRUE(m_dashHaOrch->getHaScopeEntries().find("HA_SET_1")->second.metadata.disabled());

RemoveHaScope();
RemoveHaSet();
}
Expand Down
Loading