starlingx
/
config
Code Issues Proposed changes

Force remove or delete application 

Adding the functionality of using the flag -f or --force with
system application-remove or system application-delete

Story: 2007960
Task: 42016
Signed-off-by: Suvro Ghosh <suvrojeet.ghosh@windriver.com>
Depends-On: Ia1017b7eff0d9bd73b6448f2c4790f7e2b89c828
Change-Id: If68d66d799addcd996da4b146d092c855b455aa3
This commit is contained in:
Suvro Ghosh 2021-03-05 10:40:14 -05:00 committed by Suvro Ghosh
parent fa1622ef5f
commit b3b28f56e8
5 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysinv/cgts-client/cgts-client/cgtsclient/v1/app.py
View File

@ -61,12 +61,13 @@ class AppManager(base.Manager):
resp, body = self.api.json_request('POST', self._path() + "/update", body=data)
return self.resource_class(self, body)
def remove(self, app_name):
def remove(self, app_name, force):
"""Uninstall the specified application
:param name: app_name
:param force: True/False - cli flag/argument
"""
return self._update(self._path(app_name) + '?directive=remove',
return self._update(self._path(app_name) + '?directive=remove&force=' + str(force),
{'values': {}})
def abort(self, app_name):
@ -77,12 +78,13 @@ class AppManager(base.Manager):
return self._update(self._path(app_name) + '?directive=abort',
{'values': {}})
def delete(self, app_name):
def delete(self, app_name, force):
"""Delete application data
:param name: app_name
:param force: True/False - cli flag/argument
"""
return self._delete(self._path(app_name))
return self._delete(self._path(app_name) + '?force=' + str(force))
def _find_app(cc, app_name):

12
sysinv/cgts-client/cgts-client/cgtsclient/v1/app_shell.py
View File

@ -162,10 +162,14 @@ def do_application_apply(cc, args):
@utils.arg('name', metavar='<app name>',
help='Name of the application to be uninstalled')
@utils.arg('-f', '--force',
action='store_true',
default=False,
help="Force a remove operation")
def do_application_remove(cc, args):
"""Uninstall the application"""
try:
response = cc.app.remove(args.name)
response = cc.app.remove(args.name, args.force)
_print_application_show(response)
_print_reminder_msg(args.name)
except exc.HTTPNotFound:
@ -188,10 +192,14 @@ def do_application_abort(cc, args):
@utils.arg('name', metavar='<application name>',
help='Name of the application to be deleted')
@utils.arg('-f', '--force',
action='store_true',
default=False,
help="Force a delete operation")
def do_application_delete(cc, args):
"""Remove the uninstalled application from the system"""
try:
cc.app.delete(args.name)
cc.app.delete(args.name, args.force)
print('Application %s deleted.' % args.name)
except exc.HTTPNotFound:
raise exc.CommandError('Application not found: %s' % args.name)

22
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py
View File

@ -241,8 +241,8 @@ class KubeAppController(rest.RestController):
return KubeApp.convert_with_links(new_app)
@cutils.synchronized(LOCK_NAME)
@wsme_pecan.wsexpose(KubeApp, wtypes.text, wtypes.text, wtypes.text)
def patch(self, name, directive, values):
@wsme_pecan.wsexpose(KubeApp, wtypes.text, wtypes.text, wtypes.text, wtypes.text)
def patch(self, name, directive, values, force=None):
"""Install/update the specified application
:param name: application name
@ -332,6 +332,13 @@ class KubeAppController(rest.RestController):
constants.APP_LIFECYCLE_TYPE_SEMANTIC_CHECK,
constants.APP_LIFECYCLE_TIMING_PRE,
constants.APP_REMOVE_OP)
# Converting string to boolean
if force == 'True':
force = True
else:
force = False
lifecycle_hook_info.extra = {constants.APP_LIFECYCLE_FORCE_OPERATION: force}
self._app_lifecycle_actions(db_app,
lifecycle_hook_info)
except rpc_common.RemoteError as e:
@ -490,8 +497,8 @@ class KubeAppController(rest.RestController):
return KubeApp.convert_with_links(target_app)
@cutils.synchronized(LOCK_NAME)
@wsme_pecan.wsexpose(None, wtypes.text, status_code=204)
def delete(self, name):
@wsme_pecan.wsexpose(None, wtypes.text, wtypes.text, status_code=204)
def delete(self, name, force=None):
"""Delete the application with the given name
:param name: application name
@ -516,6 +523,13 @@ class KubeAppController(rest.RestController):
constants.APP_LIFECYCLE_TYPE_SEMANTIC_CHECK,
constants.APP_LIFECYCLE_TIMING_PRE,
constants.APP_DELETE_OP)
# Converting string to boolean
if force == 'True':
force = True
else:
force = False
lifecycle_hook_info.extra = {constants.APP_LIFECYCLE_FORCE_OPERATION: force}
self._app_lifecycle_actions(db_app,
lifecycle_hook_info)
except rpc_common.RemoteError as e:

2
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -1589,7 +1589,7 @@ APP_LIFECYCLE_TYPE_ARMADA_REQUEST = 'armada-request'
APP_LIFECYCLE_MODE_MANUAL = 'manual'
APP_LIFECYCLE_MODE_AUTO = 'auto'
APP_LIFECYCLE_FORCE_OPERATION = 'force'
# Application metadata constants
APP_METADATA_MAINTAIN_USER_OVERRIDES = 'maintain_user_overrides'

5
sysinv/sysinv/sysinv/sysinv/helm/lifecycle_base.py
View File

@ -45,8 +45,9 @@ class AppLifecycleOperator(object):
# hook and raise exception.LifecycleSemanticCheckException
pass
# Check if operation is a delete or remove operation
elif hook_info.operation == constants.APP_DELETE_OP or \
hook_info.operation == constants.APP_REMOVE_OP:
elif (hook_info.operation in [constants.APP_DELETE_OP,
constants.APP_REMOVE_OP]) and \
not hook_info.extra['force']:
try:
# Store the forbidden operations in a list
forbidden = conductor_obj.apps_metadata[