Skip to content

[action] [PR:13115] Remove lldp as default service for Chassis #13248

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
mssonicbld merged 1 commit into from
Jun 13, 2024
+14 −8
Merged

[action] [PR:13115] Remove lldp as default service for Chassis #13248

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
22 changes: 14 additions & 8 deletions tests/common/devices/multi_asic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class MultiAsicSonicHost(object):
So, even a single asic pizza box is represented as a MultiAsicSonicHost with 1 SonicAsic.
"""

_DEFAULT_SERVICES = ["pmon", "snmp", "lldp", "database"]
_DEFAULT_SERVICES = ["pmon", "snmp", "database"]

def __init__(self, ansible_adhoc, hostname, duthosts, topo_type):
""" Initializing a MultiAsicSonicHost.
Expand Down Expand Up @@ -64,13 +64,16 @@ def critical_services_tracking_list(self):
"""
service_list = []
active_asics = self.asics
if self.sonichost.is_supervisor_node() and self.get_facts()['asic_type'] != 'vs':
active_asics = []
sonic_db_cli_out = self.command("sonic-db-cli CHASSIS_STATE_DB keys \"CHASSIS_FABRIC_ASIC_TABLE|asic*\"")
for a_asic_line in sonic_db_cli_out["stdout_lines"]:
a_asic_name = a_asic_line.split("|")[1]
a_asic_instance = self.asic_instance_from_namespace(namespace=a_asic_name)
active_asics.append(a_asic_instance)
if self.sonichost.is_supervisor_node():
self._DEFAULT_SERVICES.append("lldp")
if self.get_facts()['asic_type'] != 'vs':
active_asics = []
sonic_db_cli_out = \
self.command("sonic-db-cli CHASSIS_STATE_DB keys \"CHASSIS_FABRIC_ASIC_TABLE|asic*\"")
for a_asic_line in sonic_db_cli_out["stdout_lines"]:
a_asic_name = a_asic_line.split("|")[1]
a_asic_instance = self.asic_instance_from_namespace(namespace=a_asic_name)
active_asics.append(a_asic_instance)
service_list += self._DEFAULT_SERVICES

config_facts = self.config_facts(host=self.hostname, source="running")['ansible_facts']
Expand All @@ -94,6 +97,9 @@ def critical_services_tracking_list(self):
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
if config_facts['FEATURE'][service]['state'] == "disabled":
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
else:
self._DEFAULT_SERVICES.append("lldp")

for asic in active_asics:
service_list += asic.get_critical_services()
self.sonichost.reset_critical_services_tracking_list(service_list)
Expand Down