Skip to content

Exclude disabled/missing features on non-modulars as well in critical_services_tracking_list #19353

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
abdosi merged 1 commit into from
Jul 16, 2025
Merged

Exclude disabled/missing features on non-modulars as well in critical_services_tracking_list #19353

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
26 changes: 14 additions & 12 deletions tests/common/devices/multi_asic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,20 @@ def critical_services_tracking_list(self):
if "dhcp_server" in config_facts["FEATURE"] and config_facts["FEATURE"]["dhcp_server"]["state"] == "enabled":
service_list.append("dhcp_server")

if self.get_facts().get("modular_chassis"):
# Update the asic service based on feature table state and asic flag
for service in list(self.sonichost.DEFAULT_ASIC_SERVICES):
if service == 'teamd' and config_facts['DEVICE_METADATA']['localhost'].get('switch_type', '') == 'dpu':
logger.info("Removing teamd from default services for switch_type DPU")
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
continue
if config_facts['FEATURE'][service]['has_per_asic_scope'] == "False":
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
if config_facts['FEATURE'][service]['state'] == "disabled":
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
else:
# Update the asic service based on feature table state and asic flag
for service in list(self.sonichost.DEFAULT_ASIC_SERVICES):
if service == 'teamd' and config_facts['DEVICE_METADATA']['localhost'].get('switch_type', '') == 'dpu':
logger.info("Removing teamd from default services for switch_type DPU")
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
continue
if service not in config_facts['FEATURE']:
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
continue
if config_facts['FEATURE'][service]['has_per_asic_scope'] == "False":
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
if config_facts['FEATURE'][service]['state'] == "disabled":
self.sonichost.DEFAULT_ASIC_SERVICES.remove(service)
if not self.get_facts().get("modular_chassis"):
service_list.append("lldp")

for asic in active_asics:
Expand Down
Loading