Skip to content

[platform/cel-dx010]: Add python3 installer for sonic_platform package #233

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

Merged
mudsut4ke merged 2 commits into from
Feb 3, 2021
Merged

[platform/cel-dx010]: Add python3 installer for sonic_platform package #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f3e03d
[platform/cel-dx010]: install python3 sonic-platform package
Feb 3, 2021
c039082
[device/cel-dx010]: fix invalid code in sonic_platform
Feb 3, 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
6 changes: 2 additions & 4 deletions device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,10 @@ def __get_sfp_info(self):
port_name = "Unknown"
sfp_type = "Unknown"

if self.port_num >= QSFP_PORT_START and self.port_num <= QSFP_TYPE:
if self.port_num >= QSFP_PORT_START and self.port_num <= QSFP_PORT_END:
sfp_type = QSFP_TYPE
port_name = "QSFP" + str(self.port_num - QSFP_PORT_START + 1)
elif self.port_num >= SFP_PORT_START and self.port_num <= SFP_PORT_END:
sfp_type = SFP_TYPE
port_name = "SFP" + str(self.port_num - SFP_PORT_START + 1)

return sfp_type, port_name

def __convert_string_to_num(self, value_str):
Expand Down
1 change: 1 addition & 0 deletions platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ dx010/scripts/fancontrol.sh etc/init.d
dx010/scripts/fancontrol.service lib/systemd/system
services/fancontrol/fancontrol usr/local/bin
dx010/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
dx010/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
services/platform_api/platform_api_mgnt.sh usr/local/bin
12 changes: 7 additions & 5 deletions platform/broadcom/sonic-platform-modules-cel/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ MODULE_DIRS:= dx010 haliburton silverstone seastone2
override_dh_auto_build:
(for mod in $(MODULE_DIRS); do \
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
cd $(MOD_SRC_DIR)/$${mod}; \
python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
cd $(MOD_SRC_DIR); \
if [ $$mod = "seastone2" ]; then \
cd services/platform_api; \
python2 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
fi \
python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
continue; \
fi; \
cd $(MOD_SRC_DIR)/$${mod}; \
python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
Copy link

@119064273 119064273 Feb 4, 2021

Choose a reason for hiding this comment

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

I don't know why we need setup both pyth2.7 and python3?

done)

override_dh_auto_install:
Expand Down
14 changes: 11 additions & 3 deletions platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@ PREV_REBOOT_CAUSE="/host/reboot-cause/"
DEVICE="/usr/share/sonic/device"
PLATFORM=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
FILES=$DEVICE/$PLATFORM/api_files
PY2_PACK=$DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl
PY3_PACK=$DEVICE/$PLATFORM/sonic_platform-1.0-py3-none-any.whl

install() {
# Install sonic-platform package
if [ -e $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl ]; then
pip install $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl
# Install python2.7 sonic-platform package
if [ -e $PY2_PACK ]; then
pip install $PY2_PACK
fi

# Install python3 sonic-platform package
if [ -e $PY3_PACK ]; then
pip3 install $PY3_PACK
fi

}

init() {
Expand Down