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

[tunnel_pkt_handler]: Skip nonexistent intfs (#12424)

Browse Source 
- Skip the interface status check if the interface does not exist. In the future, when the interface is created/comes up this check will be triggered again.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
This commit is contained in:
Lawrence Lee 2022-10-20 09:29:57 -07:00 committed by Ying Xie
parent 8a72000909
commit d9768be475
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dockers/docker-orchagent/tunnel_packet_handler.py
View File

@ -16,6 +16,7 @@ from swsssdk import ConfigDBConnector, SonicV2Connector
from sonic_py_common import logger as log from sonic_py_common import logger as log
from pyroute2 import IPRoute from pyroute2 import IPRoute
from pyroute2.netlink.exceptions import NetlinkError
from scapy.layers.inet import IP from scapy.layers.inet import IP
from scapy.layers.inet6 import IPv6 from scapy.layers.inet6 import IPv6
from scapy.sendrecv import AsyncSniffer from scapy.sendrecv import AsyncSniffer
@ -115,7 +116,14 @@ class TunnelPacketHandler(object):
portchannel_intf_names = [name for name, _ in self.portchannel_intfs] portchannel_intf_names = [name for name, _ in self.portchannel_intfs]
link_statuses = [] link_statuses = []
for intf in portchannel_intf_names: for intf in portchannel_intf_names:
try:
status = self.netlink_api.link("get", ifname=intf) status = self.netlink_api.link("get", ifname=intf)
except NetlinkError:
# Continue if we find a non-existent interface since we don't
# need to listen on it while it's down/not created. Once it comes up,
# we will get another netlink message which will trigger this check again
logger.log_notice("Skipping non-existent interface {}".format(intf))
continue
link_statuses.append(status[0]) link_statuses.append(status[0])
up_portchannels = [] up_portchannels = []