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

[Platform][nokia]: python3-smbus package add with python3 and jinja fixes (#6416)

Browse Source 
fix platform driver breakage due to python3 upgrade and fix load minigraph errors with config load_minigraph -y

**- How I did it**
added python3-smbus to the pmon docker template since the previous was python2 specific 
fixed additional "ord" python2 specific code 
fixed the jinja templates used by qos reload - the template logic required data to be parsed 

**- How to verify it**
run "show platform XXX" commands and verify output
run "sudo config load_minigraph -y" and verify configuration 
run "show interfaces XXX" and verify output 

Co-authored-by: Carl Keene <keene@nokia.com>
This commit is contained in:
carl-nokia 2021-01-12 18:05:06 -05:00 committed by Guohan Lu
parent 9f89da15ba
commit d2f684b05c
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
View File

@ -6,3 +6,5 @@
{# Port configuration to cable length look-up table #}
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
{# Roles described in the minigraph #}
{}

3
device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
View File

@ -1 +1,2 @@
# this file empty temporarily until qos supported SAI Marvell
{# this file empty temporarily until qos supported SAI Marvell #}
{}

1
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -21,6 +21,7 @@ RUN apt-get update && \
librrd-dev \
rrdtool \
python-smbus \
python3-smbus \
ethtool \
dmidecode \
i2c-tools \

2
platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
View File

@ -210,7 +210,7 @@ class Sfp(SfpBase):
sysfsfile_eeprom.seek(offset)
raw = sysfsfile_eeprom.read(num_bytes)
for n in range(0, num_bytes):
eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
except Exception as e:
pass
finally:

2
platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
View File

@ -15,7 +15,7 @@ from sonic_py_common import logger
""" ioctl constants """
IO_READ = 0x80000000
IO_SIZE_INT = 0x00040000
IO_TYPE_WATCHDOG = ord('W') << 8
IO_TYPE_WATCHDOG = 'W' << 8
WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG