Skip to content

Commit

Permalink
[voq/inband]Code review comments fix - 2
Browse files Browse the repository at this point in the history
Signed-off-by: vedganes <vedavinayagam.ganesan@nokia.com>

(1) Based on review comments Recyle port HLD
(sonic-net/SONiC#742) the inband port name prefix is
changed from Inband to "Ethernet-IB" similar to what we have for
Ethernet-BP (Ethernet-Backplane) in multi-asic design. Changes are done
in interface.py to handle this changed name
(2) Code review comments fix for lldpmgrd
  • Loading branch information
vedganes committed Feb 17, 2021
1 parent d9e446f commit b513a1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions dockers/docker-lldp/lldpmgrd
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ try:

from sonic_py_common import daemon_base
from swsscommon import swsscommon
from sonic_py_common.interface import inband_prefix
except ImportError as err:
raise ImportError("%s - required module not found" % str(err))

Expand Down Expand Up @@ -94,9 +95,9 @@ class LldpManager(daemon_base.DaemonBase):
"""
port_desc = None

# Skip port name prefixed with "Inband". These are recycle ports exposed in PORT_TABLE for
# Skip inband interface prefixes. These are recycle ports exposed in PORT_TABLE for
# asic-to-asic communication in VOQ based chassis system. We do not configure LLDP on these.
if 'Inband' in port_name:
if port_name.startswith(inband_prefix()):
return

# Retrieve all entires for this port from the Port table
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-py-common/sonic_py_common/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Vlan": "Vlan",
"Loopback": "Loopback",
"Ethernet-Backplane": "Ethernet-BP",
"Inband": "Inband"
"Ethernet-Inband": "Ethernet-IB"
}

VLAN_SUB_INTERFACE_SEPARATOR = '.'
Expand Down Expand Up @@ -53,7 +53,7 @@ def inband_prefix():
"""
Retrieves the SONIC recycle port inband interface name prefix.
"""
return SONIC_INTERFACE_PREFIXES["Inband"]
return SONIC_INTERFACE_PREFIXES["Ethernet-Inband"]

def get_interface_table_name(interface_name):
"""Get table name by interface_name prefix
Expand Down

0 comments on commit b513a1e

Please sign in to comment.