fix BMC update failed from slave

SONIC-DEV · Jul 24, 2019 · adcf58a · adcf58a
1 parent fc9f359
commit adcf58a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py
@@ -268,7 +268,8 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             flash = fw_extra_str if fw_extra_str in [
                 "master", "slave", "both"] else "both"
             if fw_extra_str == "pingpong":
-                flash = "master" if current_bmc == "slave" else "slave"
+                # flash = "master" if current_bmc == "slave" else "slave"
+                flash = "slave"
             json_data["flash"] = flash
 
             # Install BMC
@@ -290,6 +291,7 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             r = requests.post(self.bmc_info_url, json=json_data)
             if r.status_code == 200 and 'success' in r.json().get('result'):
                 if fw_extra_str == "pingpong":
+                    flash = "master" if current_bmc == "slave" else "slave"
                     self.__update_fw_upgrade_logger(
                         "bmc_upgrade", "switch to boot from %s" % flash)
                     self.set_bmc_boot_flash(flash)

diff --git a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py
@@ -268,7 +268,8 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             flash = fw_extra_str if fw_extra_str in [
                 "master", "slave", "both"] else "both"
             if fw_extra_str == "pingpong":
-                flash = "master" if current_bmc == "slave" else "slave"
+                #flash = "master" if current_bmc == "slave" else "slave"
+                flash = "slave"
             json_data["flash"] = flash
 
             # Install BMC
@@ -290,6 +291,7 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             r = requests.post(self.bmc_info_url, json=json_data)
             if r.status_code == 200 and 'success' in r.json().get('result'):
                 if fw_extra_str == "pingpong":
+                    flash = "master" if current_bmc == "slave" else "slave"
                     self.__update_fw_upgrade_logger(
                         "bmc_upgrade", "switch to boot from %s" % flash)
                     self.set_bmc_boot_flash(flash)

diff --git a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py
@@ -268,7 +268,8 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             flash = fw_extra_str if fw_extra_str in [
                 "master", "slave", "both"] else "both"
             if fw_extra_str == "pingpong":
-                flash = "master" if current_bmc == "slave" else "slave"
+                #flash = "master" if current_bmc == "slave" else "slave"
+                flash = "slave"
             json_data["flash"] = flash
 
             # Install BMC
@@ -290,6 +291,7 @@ def firmware_upgrade(self, fw_type, fw_path, fw_extra=None):
             r = requests.post(self.bmc_info_url, json=json_data)
             if r.status_code == 200 and 'success' in r.json().get('result'):
                 if fw_extra_str == "pingpong":
+                    flash = "master" if current_bmc == "slave" else "slave"
                     self.__update_fw_upgrade_logger(
                         "bmc_upgrade", "switch to boot from %s" % flash)
                     self.set_bmc_boot_flash(flash)