Skip to content

[fixbug]: Fix wrong table name for acl_out_table #2911

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 3 commits into from
Oct 11, 2023
Merged

[fixbug]: Fix wrong table name for acl_out_table #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0692f81
Fix wrong table name for acl_out_table
Pterosaur Sep 20, 2023
4173c1f
Merge branch 'master' into acl_out_table_name
Pterosaur Sep 21, 2023
ade5c69
Merge branch 'master' into acl_out_table_name
Pterosaur Oct 11, 2023
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
4 changes: 2 additions & 2 deletions orchagent/dash/dashaclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ void DashAclOrch::doTask(ConsumerBase &consumer)
const static TaskMap TaskMap = {
PbWorker<AclIn>::makeMemberTask(APP_DASH_ACL_IN_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclIn, this),
KeyOnlyWorker::makeMemberTask(APP_DASH_ACL_IN_TABLE_NAME, DEL_COMMAND, &DashAclOrch::taskRemoveDashAclIn, this),
PbWorker<AclOut>::makeMemberTask(APP_DASH_ACL_IN_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclOut, this),
KeyOnlyWorker::makeMemberTask(APP_DASH_ACL_IN_TABLE_NAME, DEL_COMMAND, &DashAclOrch::taskRemoveDashAclOut, this),
PbWorker<AclOut>::makeMemberTask(APP_DASH_ACL_OUT_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclOut, this),
KeyOnlyWorker::makeMemberTask(APP_DASH_ACL_OUT_TABLE_NAME, DEL_COMMAND, &DashAclOrch::taskRemoveDashAclOut, this),
PbWorker<AclGroup>::makeMemberTask(APP_DASH_ACL_GROUP_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclGroup, this),
KeyOnlyWorker::makeMemberTask(APP_DASH_ACL_GROUP_TABLE_NAME, DEL_COMMAND, &DashAclOrch::taskRemoveDashAclGroup, this),
PbWorker<AclRule>::makeMemberTask(APP_DASH_ACL_RULE_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclRule, this),
Expand Down
6 changes: 3 additions & 3 deletions tests/test_dash_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,13 @@ def test_empty_acl_group_binding(self, ctx):
Verifies behavior when binding ACL groups
"""
eni_key = ctx.asic_eni_table.get_keys()[0]
sai_stage = get_sai_stage(outbound=False, v4=True, stage_num=ACL_STAGE_1)
sai_stage = get_sai_stage(outbound=True, v4=True, stage_num=ACL_STAGE_1)

pb = AclGroup()
pb.ip_version = IpVersion.IP_VERSION_IPV4
ctx.create_acl_group(ACL_GROUP_1, pb)
acl_group_key = ctx.asic_dash_acl_group_table.wait_for_n_keys(num_keys=1)[0]
ctx.bind_acl_in(self.eni_name, ACL_STAGE_1, v4_group_id = ACL_GROUP_1)
ctx.bind_acl_out(self.eni_name, ACL_STAGE_1, v4_group_id = ACL_GROUP_1)
time.sleep(3)
# Binding should not happen yet because the ACL group is empty
assert sai_stage not in ctx.asic_eni_table[eni_key]
Expand Down Expand Up @@ -386,7 +386,7 @@ def test_empty_acl_group_binding(self, ctx):
ctx.asic_eni_table.wait_for_field_match(key=eni_key, expected_fields={sai_stage: acl_group_key})

# Unbinding should occur immediately
ctx.unbind_acl_in(self.eni_name, ACL_STAGE_1)
ctx.unbind_acl_out(self.eni_name, ACL_STAGE_1)
ctx.asic_eni_table.wait_for_field_match(key=eni_key, expected_fields={sai_stage: SAI_NULL_OID})

def test_acl_group_binding(self, ctx):
Expand Down