From 3c9a5af60a9010f5c0fda7ac305f8d26e6ccf058 Mon Sep 17 00:00:00 2001 From: ningmengcao060634 <2431132264@qq.com> Date: Fri, 23 Oct 2020 16:17:04 +0800 Subject: [PATCH] 1.add bmc-console log filter 2.delete import sonic fwmgr module 3 modify platform name of shamu and jaws --- .../get_fw_version.py | 53 +++++++++++++++++++ .../plugins/fwmgrutil.py | 12 ++--- .../get_fw_version.py | 53 +++++++++++++++++++ .../plugins/fwmgrutil.py | 12 ++--- .../get_fw_version.py | 53 +++++++++++++++++++ .../plugins/fwmgrutil.py | 10 ++-- .../rsyslog/rsyslog.d/00-sonic.conf | 7 +++ 7 files changed, 183 insertions(+), 17 deletions(-) create mode 100644 device/alibaba/x86_64-alibaba_as14-128h-cl-r0/get_fw_version.py create mode 100644 device/alibaba/x86_64-alibaba_as14-40d-cl-r0/get_fw_version.py create mode 100644 device/alibaba/x86_64-alibaba_as24-128d-cl-r0/get_fw_version.py diff --git a/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/get_fw_version.py b/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/get_fw_version.py new file mode 100644 index 000000000000..739696fe26cc --- /dev/null +++ b/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/get_fw_version.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +try: + import imp + import os +except ImportError, e: + raise ImportError (str(e) + " - required module not find!") + +FWMGR_PY_PATH = "/usr/share/sonic/device/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py" +FWMGR_MODULE_NAME = "fwmgrutil" +FWMGR_CLASS_NAME = "FwMgrUtil" + +def get_all_versions(): + try: + module = imp.load_source(FWMGR_MODULE_NAME, FWMGR_PY_PATH) + except IOError as e: + print("load module %s failed, ERR: %s" % (FWMGR_MODULE_NAME, str(e))) + return -1 + + try: + fwmgrutil_class = getattr(module, FWMGR_CLASS_NAME) + fwmgrutil = fwmgrutil_class() + except AttributeError as e: + print("instantiate class %s failed, ERR: %s " % (FWMGR_CLASS_NAME, str(e))) + return -2 + + version_str = "" + version_str = fwmgrutil.get_bmc_version() + print("bmc_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_cpld_version() + print("cpld_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_bios_version() + print("bios_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_onie_version() + print("onie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_pcie_version() + print("pcie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_fpga_version() + print("fpga_version: %s " % (version_str) ) + + return 0 + +if __name__ == '__main__': + get_all_versions() diff --git a/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/plugins/fwmgrutil.py index 0c11a548aad0..690fbec009a3 100644 --- a/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as14-128h-cl-r0/plugins/fwmgrutil.py @@ -12,18 +12,18 @@ import ast from datetime import datetime -try: - from sonic_fwmgr.fwgmr_base import FwMgrUtilBase -except ImportError as e: - raise ImportError("%s - required module not found" % str(e)) +#try: +# from sonic_fwmgr.fwgmr_base import FwMgrUtilBase +#except ImportError as e: +# raise ImportError("%s - required module not found" % str(e)) -class FwMgrUtil(FwMgrUtilBase): +class FwMgrUtil(): BMC_REQ_BASE_URI = "http://240.1.1.1:8080/api" ONIE_CFG_FILE = "/host/machine.conf" def __init__(self): - self.platform_name = "AS1348f8h" + self.platform_name = "AS14128H" self.bmc_info_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/info"]) self.bmc_nextboot_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/nextboot"]) self.bmc_reboot_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/reboot"]) diff --git a/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/get_fw_version.py b/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/get_fw_version.py new file mode 100644 index 000000000000..739696fe26cc --- /dev/null +++ b/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/get_fw_version.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +try: + import imp + import os +except ImportError, e: + raise ImportError (str(e) + " - required module not find!") + +FWMGR_PY_PATH = "/usr/share/sonic/device/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py" +FWMGR_MODULE_NAME = "fwmgrutil" +FWMGR_CLASS_NAME = "FwMgrUtil" + +def get_all_versions(): + try: + module = imp.load_source(FWMGR_MODULE_NAME, FWMGR_PY_PATH) + except IOError as e: + print("load module %s failed, ERR: %s" % (FWMGR_MODULE_NAME, str(e))) + return -1 + + try: + fwmgrutil_class = getattr(module, FWMGR_CLASS_NAME) + fwmgrutil = fwmgrutil_class() + except AttributeError as e: + print("instantiate class %s failed, ERR: %s " % (FWMGR_CLASS_NAME, str(e))) + return -2 + + version_str = "" + version_str = fwmgrutil.get_bmc_version() + print("bmc_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_cpld_version() + print("cpld_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_bios_version() + print("bios_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_onie_version() + print("onie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_pcie_version() + print("pcie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_fpga_version() + print("fpga_version: %s " % (version_str) ) + + return 0 + +if __name__ == '__main__': + get_all_versions() diff --git a/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py index 2376ff7bbf8c..36f18c045ff9 100644 --- a/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py @@ -12,18 +12,18 @@ import ast from datetime import datetime -try: - from sonic_fwmgr.fwgmr_base import FwMgrUtilBase -except ImportError as e: - raise ImportError("%s - required module not found" % str(e)) +#try: +# from sonic_fwmgr.fwgmr_base import FwMgrUtilBase +#except ImportError as e: +# raise ImportError("%s - required module not found" % str(e)) -class FwMgrUtil(FwMgrUtilBase): +class FwMgrUtil(): BMC_REQ_BASE_URI = "http://240.1.1.1:8080/api" ONIE_CFG_FILE = "/host/machine.conf" def __init__(self): - self.platform_name = "AS1348f8h" + self.platform_name = "AS1440D" self.bmc_info_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/info"]) self.bmc_nextboot_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/nextboot"]) self.bmc_reboot_uri = "/".join([self.BMC_REQ_BASE_URI, "bmc/reboot"]) diff --git a/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/get_fw_version.py b/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/get_fw_version.py new file mode 100644 index 000000000000..739696fe26cc --- /dev/null +++ b/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/get_fw_version.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +try: + import imp + import os +except ImportError, e: + raise ImportError (str(e) + " - required module not find!") + +FWMGR_PY_PATH = "/usr/share/sonic/device/x86_64-alibaba_as14-40d-cl-r0/plugins/fwmgrutil.py" +FWMGR_MODULE_NAME = "fwmgrutil" +FWMGR_CLASS_NAME = "FwMgrUtil" + +def get_all_versions(): + try: + module = imp.load_source(FWMGR_MODULE_NAME, FWMGR_PY_PATH) + except IOError as e: + print("load module %s failed, ERR: %s" % (FWMGR_MODULE_NAME, str(e))) + return -1 + + try: + fwmgrutil_class = getattr(module, FWMGR_CLASS_NAME) + fwmgrutil = fwmgrutil_class() + except AttributeError as e: + print("instantiate class %s failed, ERR: %s " % (FWMGR_CLASS_NAME, str(e))) + return -2 + + version_str = "" + version_str = fwmgrutil.get_bmc_version() + print("bmc_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_cpld_version() + print("cpld_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_bios_version() + print("bios_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_onie_version() + print("onie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_pcie_version() + print("pcie_version: %s " % (version_str) ) + + version_str = "" + version_str = fwmgrutil.get_fpga_version() + print("fpga_version: %s " % (version_str) ) + + return 0 + +if __name__ == '__main__': + get_all_versions() diff --git a/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/plugins/fwmgrutil.py index 81628f93deaf..f8003928361c 100644 --- a/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as24-128d-cl-r0/plugins/fwmgrutil.py @@ -12,13 +12,13 @@ import ast from datetime import datetime -try: - from sonic_fwmgr.fwgmr_base import FwMgrUtilBase -except ImportError as e: - raise ImportError("%s - required module not found" % str(e)) +#try: +# from sonic_fwmgr.fwgmr_base import FwMgrUtilBase +#except ImportError as e: +# raise ImportError("%s - required module not found" % str(e)) -class FwMgrUtil(FwMgrUtilBase): +class FwMgrUtil(): BMC_REQ_BASE_URI = "http://240.1.1.1:8080/api" ONIE_CFG_FILE = "/host/machine.conf" diff --git a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf index 455fe89fd2bf..2d431d47c292 100644 --- a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf +++ b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf @@ -25,3 +25,10 @@ if $msg startswith " telemetry" or ($msg startswith " dialout" )then { /var/log/telemetry.log stop } + +## bmc_console log +if $syslogtag contains "bmc#console" then { + /var/log/bmc-console.log + stop +} +