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

[sflow] Clean-up sFlow container and port_index_mapper.py script (#5846)

Browse Source 
* Fix some spelling error and add addition check in port_index_mapper.py script.
* Remove unneeded pyroute2 python module from sFlow container

Signed-off-by: Garrick He <garrick_he@dell.com>
This commit is contained in:
Garrick He 2020-11-07 20:23:01 -08:00 committed by GitHub
parent 23b0e07d48
commit 9fda295cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockers/docker-sflow/Dockerfile.j2
View File

@ -12,9 +12,6 @@ RUN apt-get update && \
dmidecode \
libmnl0=1.0.4-2
RUN pip install \
pyroute2==0.5.3
{% if docker_sflow_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_sflow_debs.split(' '), "/debs/") }}

12
dockers/docker-sflow/port_index_mapper.py
View File

@ -28,12 +28,12 @@ class PortIndexMapper(object):
self.state_db = SonicV2Connector(host='127.0.0.1', decode_responses=True)
self.state_db.connect(self.state_db.STATE_DB, False)
self.sel = swsscommon.Select()
self.tlbs = [swsscommon.SubscriberStateTable(self.appl_db, t)
self.tbls = [swsscommon.SubscriberStateTable(self.appl_db, t)
for t in tbl_lst]
self.cur_interfaces = {}
for t in self.tlbs:
for t in self.tbls:
self.sel.addSelectable(t)
def set_port_index_table_entry(self, key, index, ifindex):
@ -69,11 +69,12 @@ class PortIndexMapper(object):
while True:
(state, c) = self.sel.select(SELECT_TIMEOUT_MS)
if state == swsscommon.Select.OBJECT:
for t in self.tlbs:
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:
@ -86,9 +87,10 @@ class PortIndexMapper(object):
while True:
(state, c) = self.sel.select(SELECT_TIMEOUT_MS)
if state == swsscommon.Select.OBJECT:
for t in self.tlbs:
for t in self.tbls:
(key, op, cfvs) = t.pop()
if key and key != 'PortInitDone':
if (key and key != 'PortInitDone' and
key != 'PortConfigDone'):
self.update_db(key, op)
else:
break