Skip to content

[dash] fix ENI admin state update #3081

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
prsunny merged 4 commits into from
Apr 10, 2024
Merged

[dash] fix ENI admin state update #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2b92b2
[dash] fix ENI admin state update
Yakiv-Huryk Mar 18, 2024
9319dac
[dash] add vstest for ENI admin state update
Yakiv-Huryk Mar 25, 2024
e76b690
Merge branch 'master' into eni-admin-fix
Yakiv-Huryk Apr 2, 2024
fd4fdee
Merge branch 'master' into eni-admin-fix
dgsudharsan Apr 6, 2024
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
6 changes: 4 additions & 2 deletions orchagent/dash/dashorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,11 @@ bool DashOrch::setEniAdminState(const string& eni, const EniEntry& entry)
{
SWSS_LOG_ENTER();

bool eni_enable = entry.metadata.admin_state() == dash::eni::State::STATE_ENABLED;

sai_attribute_t eni_attr;
eni_attr.id = SAI_ENI_ATTR_ADMIN_STATE;
eni_attr.value.booldata = entry.metadata.admin_state();
eni_attr.value.booldata = eni_enable;

sai_status_t status = sai_dash_eni_api->set_eni_attribute(eni_entries_[eni].eni_id,
&eni_attr);
Expand All @@ -293,7 +295,7 @@ bool DashOrch::setEniAdminState(const string& eni, const EniEntry& entry)
}
}
eni_entries_[eni].metadata.set_admin_state(entry.metadata.admin_state());
SWSS_LOG_NOTICE("Set ENI %s admin state to %s", eni.c_str(), entry.metadata.admin_state() ? "UP" : "DOWN");
SWSS_LOG_NOTICE("Set ENI %s admin state to %s", eni.c_str(), eni_enable ? "UP" : "DOWN");

return true;
}
Expand Down
11 changes: 11 additions & 0 deletions tests/test_dash_vnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,17 @@ def test_eni(self, dvs):
for fv in fvs.items():
if fv[0] == "SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ATTR_ENI_ID":
assert fv[1] == str(self.eni_oid)

# test admin state update
pb.admin_state = State.STATE_DISABLED
dashobj.create_eni(self.mac_string, {"pb": pb.SerializeToString()})
time.sleep(3)
enis = dashobj.asic_eni_table.get_keys()
assert len(enis) == 1
assert enis[0] == self.eni_oid
eni_attrs = dashobj.asic_eni_table[self.eni_oid]
assert eni_attrs["SAI_ENI_ATTR_ADMIN_STATE"] == "false"

return dashobj

def test_vnet_map(self, dvs):
Expand Down