Skip to content
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

Jump to bottom

[device/alibaba]: fix cpld name and bmc reboot issue #142

Merged
merged 1 commit into from
Mar 19, 2020
Merged

[device/alibaba]: fix cpld name and bmc reboot issue #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 7 additions & 14 deletions device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

__author__ = 'Wirut G.<wgetbumr@celestica.com>'
__license__ = "GPL"
__version__ = "0.2.0"
__version__ = "0.2.1"
__status__ = "Development"

import subprocess
Expand Down Expand Up @@ -314,16 +314,9 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
self.__update_fw_upgrade_logger(
"bmc_upgrade", "switch to boot from %s" % flash)
self.set_bmc_boot_flash(flash)
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
else:
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
reboot_dict = {}
reboot_dict["reboot"] = "yes"
r = requests.post(self.bmc_info_url, json=reboot_dict)
self.__update_fw_upgrade_logger("bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
last_fw_upgrade[3] = "DONE"
else:
self.__update_fw_upgrade_logger(
Expand Down Expand Up @@ -754,8 +747,8 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
self.__update_fw_upgrade_logger(
"fw_refresh", "start firmware refresh")

cpld_list = [x.lower() for x in cpld_list] if cpld_list else []
fpga_list = [x.lower() for x in fpga_list] if fpga_list else []
cpld_list = [x.upper() for x in cpld_list] if cpld_list else []
fpga_list = [x.upper() for x in fpga_list] if fpga_list else []
refresh_list = cpld_list + fpga_list
fw_path_list = str(fw_extra).split(':')
refresh_img_list = ["none" for i in range(len(refresh_list))]
Expand All @@ -766,7 +759,7 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
return False

for idx in range(0, len(refresh_list)):
if refresh_list[idx] in ["fan_cpld", "base_cpld"]:
if refresh_list[idx] in ["FAN_CPLD", "BASE_CPLD"]:
if not self.upload_file_bmc(fw_path_list[idx]):
self.__update_fw_upgrade_logger(
"cpld_refresh", "fail, message=Unable to upload refresh image to BMC")
Expand Down
21 changes: 7 additions & 14 deletions device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

__author__ = 'Wirut G.<wgetbumr@celestica.com>'
__license__ = "GPL"
__version__ = "0.2.0"
__version__ = "0.2.1"
__status__ = "Development"

import subprocess
Expand Down Expand Up @@ -314,16 +314,9 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
self.__update_fw_upgrade_logger(
"bmc_upgrade", "switch to boot from %s" % flash)
self.set_bmc_boot_flash(flash)
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
else:
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
reboot_dict = {}
reboot_dict["reboot"] = "yes"
r = requests.post(self.bmc_info_url, json=reboot_dict)
self.__update_fw_upgrade_logger("bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
last_fw_upgrade[3] = "DONE"
else:
self.__update_fw_upgrade_logger(
Expand Down Expand Up @@ -754,8 +747,8 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
self.__update_fw_upgrade_logger(
"fw_refresh", "start firmware refresh")

cpld_list = [x.lower() for x in cpld_list] if cpld_list else []
fpga_list = [x.lower() for x in fpga_list] if fpga_list else []
cpld_list = [x.upper() for x in cpld_list] if cpld_list else []
fpga_list = [x.upper() for x in fpga_list] if fpga_list else []
refresh_list = cpld_list + fpga_list
fw_path_list = str(fw_extra).split(':')
refresh_img_list = ["none" for i in range(len(refresh_list))]
Expand All @@ -766,7 +759,7 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
return False

for idx in range(0, len(refresh_list)):
if refresh_list[idx] in ["fan_cpld", "base_cpld"]:
if refresh_list[idx] in ["FAN_CPLD", "BASE_CPLD"]:
if not self.upload_file_bmc(fw_path_list[idx]):
self.__update_fw_upgrade_logger(
"cpld_refresh", "fail, message=Unable to upload refresh image to BMC")
Expand Down
21 changes: 7 additions & 14 deletions device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

__author__ = 'Wirut G.<wgetbumr@celestica.com>'
__license__ = "GPL"
__version__ = "0.2.0"
__version__ = "0.2.1"
__status__ = "Development"

import subprocess
Expand Down Expand Up @@ -314,16 +314,9 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
self.__update_fw_upgrade_logger(
"bmc_upgrade", "switch to boot from %s" % flash)
self.set_bmc_boot_flash(flash)
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
else:
self.__update_fw_upgrade_logger(
"bmc_upgrade", "reboot BMC")
reboot_dict = {}
reboot_dict["reboot"] = "yes"
r = requests.post(self.bmc_info_url, json=reboot_dict)
self.__update_fw_upgrade_logger("bmc_upgrade", "reboot BMC")
if not self.reboot_bmc():
return False
last_fw_upgrade[3] = "DONE"
else:
self.__update_fw_upgrade_logger(
Expand Down Expand Up @@ -754,8 +747,8 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
self.__update_fw_upgrade_logger(
"fw_refresh", "start firmware refresh")

cpld_list = [x.lower() for x in cpld_list] if cpld_list else []
fpga_list = [x.lower() for x in fpga_list] if fpga_list else []
cpld_list = [x.upper() for x in cpld_list] if cpld_list else []
fpga_list = [x.upper() for x in fpga_list] if fpga_list else []
refresh_list = cpld_list + fpga_list
fw_path_list = str(fw_extra).split(':')
refresh_img_list = ["none" for i in range(len(refresh_list))]
Expand All @@ -766,7 +759,7 @@ def firmware_refresh(self, fpga_list, cpld_list, fw_extra=None):
return False

for idx in range(0, len(refresh_list)):
if refresh_list[idx] in ["fan_cpld", "base_cpld"]:
if refresh_list[idx] in ["FAN_CPLD", "BASE_CPLD"]:
if not self.upload_file_bmc(fw_path_list[idx]):
self.__update_fw_upgrade_logger(
"cpld_refresh", "fail, message=Unable to upload refresh image to BMC")
Expand Down