Skip to content
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

Jump to bottom

[LLDP][T2] Advertise Chassis Hostname when present. #19076

Merged
merged 8 commits into from
May 29, 2024
Merged

[LLDP][T2] Advertise Chassis Hostname when present. #19076

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c5ed3a
Update init_cfg.json.j2 to handle global scope for lldp feature
abdosi Apr 26, 2024
d17cde2
Merge branch 'sonic-net:master' into master
abdosi May 24, 2024
109e194
Update lldp.service.j2
abdosi May 24, 2024
6635f04
Revert "Update init_cfg.json.j2 to handle global scope for lldp feature"
abdosi May 25, 2024
5b11785
Revert "Update lldp.service.j2"
abdosi May 25, 2024
6545569
For Chassis Adverstise chassis hostname if present.
abdosi May 25, 2024
4fa405c
Revert "For Chassis Adverstise chassis hostname if present."
abdosi May 25, 2024
b80b20e
Update LLDP hostname for Chassis hostanme if present.
abdosi May 25, 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
5 changes: 4 additions & 1 deletion dockers/docker-lldp/lldpmgrd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,10 @@ class LldpManager(daemon_base.DaemonBase):
if not op in ["SET", "DEL"]:
return
self.log_info("Device Config Opcode: {} Dict {} Key {}".format(op, device_dict, key))
hostname = device_dict.get("hostname")
try:
hostname = device_dict["chassis_hostname"]
except:
hostname = device_dict.get("hostname")
if not self.hostname == hostname:
self.log_info("Hostname changed old {0}, new {1}".format(self.hostname, hostname))
self.update_hostname(hostname)
Expand Down
Loading