Skip to content

Commit 6e8ec81

Browse files
jlevequesanthosh-kt
authored andcommitted
[Python] Migrate applications/scripts to import sonic-py-common package (sonic-net#5043)
As part of consolidating all common Python-based functionality into the new sonic-py-common package, this pull request: 1. Redirects all Python applications/scripts in sonic-buildimage repo which previously imported sonic_device_util or sonic_daemon_base to instead import sonic-py-common, which was added in sonic-net#5003 2. Replaces all calls to `sonic_device_util.get_platform_info()` to instead call `sonic_py_common.get_platform()` and removes any calls to `sonic_device_util.get_machine_info()` which are no longer necessary (i.e., those which were only used to pass the results to `sonic_device_util.get_platform_info()`. 3. Removes unused imports to the now-deprecated sonic-daemon-base package and sonic_device_util.py module This is the next step toward resolving sonic-net#4999 Also reverted my previous change in which device_info.get_platform() would first try obtaining the platform ID string from Config DB and fall back to gathering it from machine.conf upon failure because this function is called by sonic-cfggen before the data is in the DB, in which case, the db_connect() call will hang indefinitely, which was not the behavior I expected. As of now, the function will always reference machine.conf.
1 parent 50ce02b commit 6e8ec81

38 files changed

Lines changed: 92 additions & 75 deletions

File tree

device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/chassis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import json
1515
import syslog
1616
from sonic_platform_base.chassis_base import ChassisBase
17-
from sonic_daemon_base.daemon_base import Logger
17+
from sonic_py_common.logger import Logger
1818
from sonic_platform.fan import Fan
1919
from sonic_platform.psu import Psu
2020
from sonic_platform.component import Component

device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import os
99
import time
1010
import subprocess
11-
import sonic_device_util
1211
import syslog
1312
from ctypes import create_string_buffer
1413
from sonic_platform_base.sfp_base import SfpBase
@@ -18,7 +17,6 @@
1817
from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
1918
from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
2019
from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
21-
from sonic_daemon_base.daemon_base import Logger
2220
except ImportError as e:
2321
raise ImportError(str(e) + "- required module not found")
2422

device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import os
1212
import time
1313
import subprocess
14-
import sonic_device_util
1514
from ctypes import create_string_buffer
1615

1716
try:

device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
import os
44
import struct
55
import subprocess
6-
from sonic_daemon_base.daemon_base import DaemonBase
76
from mmap import *
87

8+
from sonic_py_common import device_info
9+
910
HOST_CHK_CMD = "docker > /dev/null 2>&1"
1011
EMPTY_STRING = ""
1112

1213

1314
class APIHelper():
1415

1516
def __init__(self):
16-
(self.platform, self.hwsku) = DaemonBase().get_platform_and_hwsku()
17+
(self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
1718

1819
def is_host(self):
1920
return os.system(HOST_CHK_CMD) == 0

device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import time
1212
import subprocess
13-
import sonic_device_util
1413
from ctypes import create_string_buffer
1514

1615
try:

device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import os
1212
import time
1313
import subprocess
14-
import sonic_device_util
1514
from ctypes import create_string_buffer
1615

1716
try:

device/juniper/x86_64-juniper_qfx5200-r0/plugins/qfx5200_sfp_init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import time
3636
import os.path
3737
import sfputil as jnpr_sfp
38-
from sonic_daemon_base.daemon_base import Logger
38+
from sonic_py_common.logger import Logger
3939
from pprint import pprint
4040

4141
SYSLOG_IDENTIFIER = "sfputil"

device/juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
4343
from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
4444
from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
45-
from sonic_daemon_base.daemon_base import Logger
45+
from sonic_py_common.logger import Logger
4646
from ctypes import create_string_buffer
4747

4848
except ImportError as e:

device/juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io
99
import string
1010
from ctypes import create_string_buffer
11-
from sonic_daemon_base.daemon_base import Logger
11+
from sonic_py_common.logger import Logger
1212
except ImportError, e:
1313
raise ImportError (str(e) + "- required module not found")
1414

device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cStringIO import StringIO
2222
from sonic_eeprom import eeprom_base
2323
from sonic_eeprom import eeprom_tlvinfo
24-
from sonic_device_util import get_machine_info
24+
from sonic_py_common.device_info import get_machine_info
2525
import subprocess
2626
except ImportError, e:
2727
raise ImportError (str(e) + "- required module not found")

0 commit comments

Comments
 (0)