matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix #8672

add two missing commits in caclmgrd: monitor state_db to update dhcp acl #8222 when porting to 202012 branch
This commit is contained in:
trzhang-msft 2021-09-13 23:59:08 -07:00 committed by GitHub
parent 67e38abe47
commit 4bdd31565f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sonic-host-services/scripts/caclmgrd
View File

@ -378,27 +378,27 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
execute = 1 execute = 1
if 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)) self.log_info("Update DHCP chain: {}".format(update_cmd))
def update_dhcp_acl(self, key, op, data): 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") self.log_warning("Unexpected update in MUX_CABLE_TABLE")
return return
intf = key intf = key
status = data["status"] state = data["state"]
if status == "active": if state == "active":
self.update_dhcp_chain("delete", intf) self.update_dhcp_chain("delete", intf)
elif status == "standby": elif state == "standby":
self.update_dhcp_chain("insert", intf) self.update_dhcp_chain("insert", intf)
elif status == "unknown": elif state == "unknown":
self.update_dhcp_chain("delete", intf) self.update_dhcp_chain("delete", intf)
elif status == "error": elif state == "error":
self.log_warning("Cable status shows error") self.log_warning("Cable state shows error")
else: else:
self.log_warning("Unexpected cable status") self.log_warning("Unexpected cable state")
def get_acl_rules_and_translate_to_iptables_commands(self, namespace): def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
""" """