Skip to content
Closed
Changes from 3 commits
Commits
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
44 changes: 38 additions & 6 deletions sonic-syseepromd/scripts/syseepromd
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class DaemonSyseeprom(DaemonBase):

self.stop_event = threading.Event()
self.eeprom_util = None

self.eeprom = None

state_db = daemon_base.db_connect(swsscommon.STATE_DB)
self.eeprom_tbl = swsscommon.Table(state_db, EEPROM_TABLE_NAME)
self.eepromtbl_keys = []
Expand All @@ -55,19 +56,47 @@ class DaemonSyseeprom(DaemonBase):
logger.log_error("Failed to load eeprom utility: %s" % (str(e)), True)
sys.exit(ERR_EEPROMUTIL_LOAD)

def load_platform_api(self):
try:
import sonic_platform.platform
self.chassis = sonic_platform.platform.Platform().get_chassis()
self.eeprom = self.chassis.get_eeprom()
return self.eeprom is not None
except Exception as e:
logger.log_warning("Failed to load chassis due to {}".format(repr(e)))
return False

def _wrapper_read_eeprom(self):
if self.eeprom is not None:
try:
return self.eeprom.read_eeprom()
except NotImplementedError:
pass

return self.eeprom_util.read_eeprom()

def _wrapper_update_eeprom_db(self, eeprom):
if self.eeprom is not None:
try:
return self.eeprom.update_eeprom_db(eeprom)
except NotImplementedError:
pass

return self.eeprom_util.update_eeprom_db(eeprom)

def post_eeprom_to_db(self):
eeprom = self.eeprom_util.read_eeprom()
eeprom = self._wrapper_read_eeprom()
if eeprom is None :
logger.log_error("Failed to read eeprom")
return ERR_FAILED_EEPROM

err = self.eeprom_util.update_eeprom_db(eeprom)
err = self._wrapper_update_eeprom_db(eeprom)
if err:
logger.log_error("Failed to update eeprom info to database")
return ERR_FAILED_UPDATE_DB

self.eepromtbl_keys = self.eeprom_tbl.getKeys()

return POST_EEPROM_SUCCESS

def clear_db(self):
Expand Down Expand Up @@ -104,8 +133,11 @@ class DaemonSyseeprom(DaemonBase):
def run(self):
logger.log_info("Starting up...")

# Load platform-specific eepromutil class
self.load_eeprom_util()
# with new platform api supported, we should try loading it first
if not self.load_platform_api():
# Load platform-specific eepromutil class
# in case of loading new platform api failed
self.load_eeprom_util()

# Connect to STATE_DB and post syseeprom info to state DB
rc = self.post_eeprom_to_db()
Expand Down