eb99648a4e
catch system error and log as warning level instead of
error level in case interface was already deleted
Signed-off-by: Gokulnath-Raja <Gokulnath_R@dell.com>
132 lines
4.2 KiB
Python
Executable File
132 lines
4.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import signal
|
|
import sys
|
|
import traceback
|
|
from sonic_py_common.logger import Logger
|
|
from socket import if_nametoindex
|
|
from sonic_py_common import port_util
|
|
from swsscommon import swsscommon
|
|
|
|
SYSLOG_IDENTIFIER = 'port_index_mapper'
|
|
|
|
# Global logger instance
|
|
logger = Logger(SYSLOG_IDENTIFIER)
|
|
logger.set_min_log_priority_info()
|
|
|
|
|
|
class PortIndexMapper(object):
|
|
|
|
def __init__(self):
|
|
REDIS_TIMEOUT_MS = 0
|
|
# Update this list to support more interfaces
|
|
tbl_lst = [swsscommon.STATE_PORT_TABLE_NAME,
|
|
swsscommon.STATE_VLAN_TABLE_NAME]
|
|
self.appl_db = swsscommon.DBConnector("STATE_DB",
|
|
REDIS_TIMEOUT_MS,
|
|
True)
|
|
|
|
self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1', decode_responses=True)
|
|
self.state_db.connect(self.state_db.STATE_DB, False)
|
|
self.sel = swsscommon.Select()
|
|
self.tbls = [swsscommon.SubscriberStateTable(self.appl_db, t)
|
|
for t in tbl_lst]
|
|
|
|
self.cur_interfaces = {}
|
|
|
|
for t in self.tbls:
|
|
self.sel.addSelectable(t)
|
|
|
|
def set_port_index_table_entry(self, key, index, ifindex):
|
|
self.state_db.set(self.state_db.STATE_DB, key, 'index', index)
|
|
self.state_db.set(self.state_db.STATE_DB, key, 'ifindex', ifindex)
|
|
|
|
def update_db(self, ifname, op):
|
|
index = port_util.get_index_from_str(ifname)
|
|
if op == 'SET' and index is None:
|
|
return
|
|
|
|
# catch system error and log as warning level instead of
|
|
# error level in case interface was already deleted
|
|
ifindex = None
|
|
try:
|
|
ifindex = if_nametoindex(ifname)
|
|
except OSError as e:
|
|
logger.log_warning("%s" % str(e))
|
|
|
|
if op == 'SET' and ifindex is None:
|
|
return
|
|
|
|
# Check if ifname already exist or if index/ifindex changed due to
|
|
# syncd restart
|
|
if (ifname in self.cur_interfaces and
|
|
self.cur_interfaces[ifname] == (index, ifindex)):
|
|
return
|
|
|
|
_hash = '{}|{}'.format('PORT_INDEX_TABLE', ifname)
|
|
|
|
if op == 'SET':
|
|
self.cur_interfaces[ifname] = (index, ifindex)
|
|
self.set_port_index_table_entry(_hash, str(index), str(ifindex))
|
|
elif op == 'DEL':
|
|
del self.cur_interfaces[ifname]
|
|
self.state_db.delete(self.state_db.STATE_DB, _hash)
|
|
|
|
def listen(self):
|
|
SELECT_TIMEOUT_MS = -1 # Infinite wait
|
|
|
|
while True:
|
|
(state, c) = self.sel.select(SELECT_TIMEOUT_MS)
|
|
if state == swsscommon.Select.OBJECT:
|
|
for t in self.tbls:
|
|
(key, op, cfvs) = t.pop()
|
|
if op == 'DEL' and key in self.cur_interfaces:
|
|
self.update_db(key, op)
|
|
elif (op == 'SET' and key != 'PortInitDone' and
|
|
key != 'PortConfigDone' and
|
|
key not in self.cur_interfaces):
|
|
self.update_db(key, op)
|
|
elif state == swsscomm.Select.ERROR:
|
|
logger.log_error("Receieved error from select()")
|
|
break
|
|
|
|
def populate(self):
|
|
SELECT_TIMEOUT_MS = 0
|
|
|
|
while True:
|
|
(state, c) = self.sel.select(SELECT_TIMEOUT_MS)
|
|
if state == swsscommon.Select.OBJECT:
|
|
for t in self.tbls:
|
|
(key, op, cfvs) = t.pop()
|
|
if (key and key != 'PortInitDone' and
|
|
key != 'PortConfigDone'):
|
|
self.update_db(key, op)
|
|
else:
|
|
break
|
|
|
|
|
|
def signal_handler(signum, frame):
|
|
logger.log_notice("got signal {}".format(signum))
|
|
sys.exit(0)
|
|
|
|
|
|
def main():
|
|
port_mapper = PortIndexMapper()
|
|
port_mapper.populate()
|
|
port_mapper.listen()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
rc = 0
|
|
try:
|
|
signal.signal(signal.SIGTERM, signal_handler)
|
|
signal.signal(signal.SIGINT, signal_handler)
|
|
main()
|
|
except Exception as e:
|
|
tb = sys.exc_info()[2]
|
|
traceback.print_tb(tb)
|
|
logger.log_error("%s" % str(e))
|
|
rc = -1
|
|
finally:
|
|
sys.exit(rc)
|