matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

configure lldp when the port exists

Browse Source 
On some platform, portstate might be unknown as it might not
be supported by the driver.

Signed-off-by: Guohan Lu <gulv@microsoft.com>
This commit is contained in:
Guohan Lu 2019-02-12 09:48:05 +00:00 committed by Ying Xie
parent bab38e4310
commit 6f2274ad0d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dockers/docker-lldp-sv2/lldpmgrd
View File

@ -73,17 +73,12 @@ def signal_handler(sig, frame):
# ========================== Helpers ================================== # ========================== Helpers ==================================
def is_port_up(port_name): def is_port_exist(port_name):
filename = "/sys/class/net/%s/operstate" % port_name filename = "/sys/class/net/%s/ifindex" % port_name
if not os.path.exists(filename): if not os.path.exists(filename):
return False return False
with open(filename) as fp:
state = fp.read()
if 'up' in state:
return True return True
else:
return False
# ============================== Classes ============================== # ============================== Classes ==============================
@ -159,8 +154,8 @@ class LldpManager(object):
to_delete = [] to_delete = []
for (port_name, cmd) in self.pending_cmds.iteritems(): for (port_name, cmd) in self.pending_cmds.iteritems():
if not is_port_up(port_name): if not is_port_exist(port_name):
# it doesn't make any sense to configure lldpd if the target port is unavailable # it doesn't make any sense to configure lldpd if the target port does not exist
# let's postpone the command for the next iteration # let's postpone the command for the next iteration
continue continue