starlingx
/
update
Code Issues Proposed changes

Merge "Check to determine if a major release deploy is in progress."

This commit is contained in:
Zuul 2024-04-30 17:55:35 +00:00 committed by Gerrit Code Review
parent 4bf81b7374 4a535aaa11
commit 7b35b10606
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
software/software/software_controller.py
View File

@ -2730,9 +2730,9 @@ class PatchController(PatchService):
# Check if there is a major release deployment in progress
# and set agent request parameters accordingly
major_release = None
upgrade_in_progress = self.get_software_upgrade()
if upgrade_in_progress:
major_release = upgrade_in_progress["to_release"]
if self.check_upgrade_in_progress():
upgrade_release = self.get_software_upgrade()
major_release = upgrade_release["to_release"]
force = False
async_req = False
msg = "Running major release deployment, major_release=%s, force=%s, async_req=%s" % (
@ -3051,6 +3051,20 @@ class PatchController(PatchService):
"state": state
}
def check_upgrade_in_progress(self):
"""
Check if major release upgrade is in progress
"""
_upgrade_in_progress = False
upgrade_release = self._get_software_upgrade()
if not upgrade_release:
return _upgrade_in_progress
from_release = version.Version(upgrade_release["from_release"])
to_release = version.Version(upgrade_release["to_release"])
if (from_release.major != to_release.major) or (from_release.minor != to_release.minor):
_upgrade_in_progress = True
return _upgrade_in_progress
def get_software_upgrade(self):
return self._get_software_upgrade()