Remove lldp as default service for Chassis #13115
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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", "database"] | ||
|
|
||
| def __init__(self, ansible_adhoc, hostname, duthosts, topo_type): | ||
| """ Initializing a MultiAsicSonicHost. | ||
|
|
@@ -64,13 +64,16 @@ def critical_services_tracking_list(self): | |
| """ | ||
| service_list = [] | ||
| active_asics = self.asics | ||
| if self.sonichost.is_supervisor_node(): | ||
| self._DEFAULT_SERVICES.append("lldp") | ||
|
Contributor
There was a problem hiding this comment. based on this condition, lldp will not be added in DEFAULT_SERVICES for VS supervisor, is that right? |
||
| 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'] | ||
|
|
@@ -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") | ||
|
Contributor
There was a problem hiding this comment. do we need this append here?
Contributor
Author
There was a problem hiding this comment. Yes . LLDP will be added as Default Service for Supervisor and Fixed Platoforms (else is for Fixed platforms) For Modular chassis LLDP will not be added to Default Service List which means for LC we will not add as per our requirement.
Contributor
Author
There was a problem hiding this comment. Am I missing something?
Contributor
There was a problem hiding this comment. got it, misunderstood the condition logic here. |
||
|
|
||
| for asic in active_asics: | ||
| service_list += asic.get_critical_services() | ||
| self.sonichost.reset_critical_services_tracking_list(service_list) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/sonic-net/sonic-mgmt/blob/master/tests/common/devices/sonic.py#L43
and line #53 may also need to be fixed. Please check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not needed here. lldp still applies to Default asic service list