Skip to content

Caclmgrd: port two commits from master to 202012 branch #8673

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
lguohan merged 1 commit into from
Sep 14, 2021
Merged

Caclmgrd: port two commits from master to 202012 branch #8673

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
18 changes: 9 additions & 9 deletions src/sonic-host-services/scripts/caclmgrd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,27 +378,27 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
execute = 1

if execute == 1:
self.run_commands([update_cmd])
subprocess.call(update_cmd, shell=True)
self.log_info("Update DHCP chain: {}".format(update_cmd))

def update_dhcp_acl(self, key, op, data):
if "status" not in data:
if "state" not in data:
self.log_warning("Unexpected update in MUX_CABLE_TABLE")
return

intf = key
status = data["status"]
state = data["state"]

if status == "active":
if state == "active":
self.update_dhcp_chain("delete", intf)
elif status == "standby":
elif state == "standby":
self.update_dhcp_chain("insert", intf)
elif status == "unknown":
elif state == "unknown":
self.update_dhcp_chain("delete", intf)
elif status == "error":
self.log_warning("Cable status shows error")
elif state == "error":
self.log_warning("Cable state shows error")
else:
self.log_warning("Unexpected cable status")
self.log_warning("Unexpected cable state")

def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
"""
Expand Down