diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py index 1a6855b85d89..026421d0b22e 100644 --- a/src/sonic-py-common/sonic_py_common/device_info.py +++ b/src/sonic-py-common/sonic_py_common/device_info.py @@ -39,46 +39,6 @@ CHASSIS_INFO_MODEL_FIELD = 'model' CHASSIS_INFO_REV_FIELD = 'revision' -# Get hardware information -def get_platform_info(): - """ - This function is used to get the HW info helper function - """ - from .multi_asic import get_num_asics - - hw_info_dict = {} - - version_info = get_sonic_version_info() - - hw_info_dict['platform'] = get_platform() - hw_info_dict['hwsku'] = get_hwsku() - hw_info_dict['asic_type'] = version_info['asic_type'] - hw_info_dict['asic_count'] = get_num_asics() - - return hw_info_dict - - -def get_chassis_info(): - """ - This function is used to get the Chassis serial / model / rev number - """ - - chassis_info_dict = {} - - try: - # Init statedb connection - db = SonicV2Connector() - db.connect(db.STATE_DB) - table = CHASSIS_INFO_TABLE.format(1) - - chassis_info_dict['serial'] = db.get(db.STATE_DB, table, CHASSIS_INFO_SERIAL_FIELD) - chassis_info_dict['model'] = db.get(db.STATE_DB, table, CHASSIS_INFO_MODEL_FIELD) - chassis_info_dict['revision'] = db.get(db.STATE_DB, table, CHASSIS_INFO_REV_FIELD) - except: - pass - - return chassis_info_dict - def get_localhost_info(field): try: @@ -350,6 +310,47 @@ def get_sonic_version_file(): return SONIC_VERSION_YAML_PATH + +# Get hardware information +def get_platform_info(): + """ + This function is used to get the HW info helper function + """ + from .multi_asic import get_num_asics + + hw_info_dict = {} + + version_info = get_sonic_version_info() + + hw_info_dict['platform'] = get_platform() + hw_info_dict['hwsku'] = get_hwsku() + hw_info_dict['asic_type'] = version_info['asic_type'] + hw_info_dict['asic_count'] = get_num_asics() + + return hw_info_dict + + +def get_chassis_info(): + """ + This function is used to get the Chassis serial / model / rev number + """ + + chassis_info_dict = {} + + try: + # Init statedb connection + db = SonicV2Connector() + db.connect(db.STATE_DB) + table = CHASSIS_INFO_TABLE.format(1) + + chassis_info_dict['serial'] = db.get(db.STATE_DB, table, CHASSIS_INFO_SERIAL_FIELD) + chassis_info_dict['model'] = db.get(db.STATE_DB, table, CHASSIS_INFO_MODEL_FIELD) + chassis_info_dict['revision'] = db.get(db.STATE_DB, table, CHASSIS_INFO_REV_FIELD) + except: + pass + + return chassis_info_dict + # # Multi-NPU functionality #