From 0692f81f3e965fefa15d1e85be00fa756e97ee38 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Wed, 20 Sep 2023 18:00:30 +0800 Subject: [PATCH] Fix wrong table name for acl_out_table Signed-off-by: Ze Gan --- orchagent/dash/dashaclorch.cpp | 4 ++-- tests/test_dash_acl.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/orchagent/dash/dashaclorch.cpp b/orchagent/dash/dashaclorch.cpp index 31022dc4a4..8e86f5997d 100644 --- a/orchagent/dash/dashaclorch.cpp +++ b/orchagent/dash/dashaclorch.cpp @@ -97,8 +97,8 @@ void DashAclOrch::doTask(ConsumerBase &consumer) const static TaskMap TaskMap = { PbWorker::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::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::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::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::makeMemberTask(APP_DASH_ACL_RULE_TABLE_NAME, SET_COMMAND, &DashAclOrch::taskUpdateDashAclRule, this), diff --git a/tests/test_dash_acl.py b/tests/test_dash_acl.py index a0cc1b2ccf..2cad36971e 100644 --- a/tests/test_dash_acl.py +++ b/tests/test_dash_acl.py @@ -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] @@ -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):