Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jan 12, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a50d5f7
[platform][nokia]: fixes to jinja templates qos reload placeholder
Jan 11, 2021
9cea082
[platform][nokia]: add required python3 smbus package plus fix
Jan 11, 2021
8638ada
[platform][nokia]: address the proper location of comments jinja file
Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 1 deletion device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# this file empty temporarily until qos supported SAI Marvell
{# this file empty temporarily until qos supported SAI Marvell #}
{}
1 change: 1 addition & 0 deletions dockers/docker-platform-monitor/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN apt-get update && \
librrd-dev \
rrdtool \
python-smbus \
python3-smbus \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed by the Nokia sonic-platform package? If so , I would prefer that you add it in the install_requires list of your setup.py file. This way it will get installed along with your package, and will not be installed if not needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is needed by the Nokia sonic-platform package and we see Arista using it also btw. I attempted adding to install_requires list of setup.py file as you suggested, but it appears that mechanism is at runtime install time and did not work. See error below:
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0xb5731730>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/python3-smbus/
Build time install solution is preferred I think - putting the package in our debian another way - still working on alternatives other than the current Arista method multiple debians

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@carl-nokia: Ah yes. The vendor's sonic-platform package gets installed in the PMon container at runtime, thus you are correct, my suggestion will not work. I am OK with this solution for now. Sorry to trouble you.

ethtool \
dmidecode \
i2c-tools
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
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:
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
""" 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

Expand Down