starlingx/config
Code Issues Proposed changes

Merge "Add api to query an upgrade is in progress"

Browse Source
This commit is contained in:
Zuul 2022-03-01 15:10:00 +00:00 committed by Gerrit Code Review
commit 0781b817d9
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysinv/sysinv/sysinv/sysinv/api/config.py
View File

@ -33,5 +33,6 @@ app = {
'/v1/ihosts/[a-z0-9\-]+/icpus/platform_cpu_list', '/v1/ihosts/[a-z0-9\-]+/icpus/platform_cpu_list',
'/v1/ihosts/[a-z0-9\-]+/icpus/vswitch_cpu_list', '/v1/ihosts/[a-z0-9\-]+/icpus/vswitch_cpu_list',
'/v1/upgrade/[a-zA-Z0-9\-]+/in_upgrade', '/v1/upgrade/[a-zA-Z0-9\-]+/in_upgrade',
'/v1/upgrade/[a-zA-Z0-9\-]+/upgrade_in_progress',
] ]
} }

18
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py
View File

@ -124,6 +124,7 @@ class UpgradeController(rest.RestController):
_custom_actions = { _custom_actions = {
'check_reinstall': ['GET'], 'check_reinstall': ['GET'],
'in_upgrade': ['GET'], 'in_upgrade': ['GET'],
'upgrade_in_progress': ['GET'],
} }
def __init__(self, parent=None, **kwargs): def __init__(self, parent=None, **kwargs):
@ -449,3 +450,20 @@ class UpgradeController(rest.RestController):
except exception.NotFound: except exception.NotFound:
return False return False
return True return True
@wsme_pecan.wsexpose(wtypes.text, six.text_type)
def upgrade_in_progress(self, uuid):
# uuid is added here for potential future use
try:
upgrade = pecan.request.dbapi.software_upgrade_get_one()
# upgrade in progress only when upgrade starts and not abort
if upgrade.state and upgrade.state not in [
constants.UPGRADE_ABORTING_ROLLBACK,
constants.UPGRADE_ABORTING,
constants.UPGRADE_ABORT_COMPLETING]:
return True
except exception.NotFound:
return False
return False