From 7018cd73277f19a57d1930d78cbf154fd25a5edf Mon Sep 17 00:00:00 2001 From: wguy Date: Mon, 9 Dec 2024 10:04:00 -0800 Subject: [PATCH] Remove unused lifecycle parameters from perform_app_upload and perform_app_abort of kube_app methods Test plan: AIO-SX: PASS: system application-upload metrics-server.tgz PASS: system application-apply metrics-server, and system application-abort metrics-server PASS: Verify build success with "build-pkgs -c -p sysinv" Story: 2011242 Task: 51464 Change-Id: Icbb214d818b3a6e5aa9bb36d59a48174353572a8 Signed-off-by: wguy --- sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py | 3 +-- sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py | 6 ++---- sysinv/sysinv/sysinv/sysinv/conductor/manager.py | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py index d3f299a7fb..a0101ef9d7 100644 --- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py +++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py @@ -265,7 +265,6 @@ class KubeAppController(rest.RestController): pecan.request.rpcapi.perform_app_upload(pecan.request.context, new_app, tarfile_path, - lifecycle_hook_info=lifecycle_hook_info, images=images) return KubeApp.convert_with_links(new_app) @@ -430,7 +429,7 @@ class KubeAppController(rest.RestController): lifecycle_hook_info.mode = constants.APP_LIFECYCLE_MODE_MANUAL pecan.request.rpcapi.perform_app_abort(pecan.request.context, - db_app, lifecycle_hook_info=lifecycle_hook_info) + db_app) return KubeApp.convert_with_links(db_app) @cutils.synchronized(LOCK_NAME) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py index 3e23c6aa0f..6a63b1c010 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py @@ -2060,7 +2060,7 @@ class AppOperator(object): LOG.error("Application %s recover to version %s aborted!" % (old_app.name, old_app.version)) - def perform_app_upload(self, rpc_app, tarfile, lifecycle_hook_info_app_upload, images=False): + def perform_app_upload(self, rpc_app, tarfile, images=False): """Process application upload request This method validates the application manifest. If Helm charts are @@ -2070,7 +2070,6 @@ class AppOperator(object): :param rpc_app: application object in the RPC request :param tarfile: location of application tarfile - :param lifecycle_hook_info_app_upload: LifecycleHookInfo object :param images: save application images in the registry as part of app upload """ @@ -3252,7 +3251,7 @@ class AppOperator(object): app = AppOperator.Application(rpc_app) return app.active - def perform_app_abort(self, rpc_app, lifecycle_hook_info_app_abort): + def perform_app_abort(self, rpc_app): """Process application abort request This method retrieves the latest application status from the @@ -3262,7 +3261,6 @@ class AppOperator(object): next opportunity. :param rpc_app: application object in the RPC request - :param lifecycle_hook_info_app_abort: LifecycleHookInfo object """ diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py index 6cd3615b75..54ccd8bda0 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py @@ -17366,7 +17366,7 @@ class ConductorManager(service.PeriodicService): """ lifecycle_hook_info_app_upload.operation = constants.APP_UPLOAD_OP - self._app.perform_app_upload(rpc_app, tarfile, lifecycle_hook_info_app_upload, images) + self._app.perform_app_upload(rpc_app, tarfile, images) self._app.load_application_metadata_from_file(rpc_app) # Perform post upload operation actions @@ -17494,7 +17494,7 @@ class ConductorManager(service.PeriodicService): """ lifecycle_hook_info_app_abort.operation = constants.APP_ABORT_OP - return self._app.perform_app_abort(rpc_app, lifecycle_hook_info_app_abort) + return self._app.perform_app_abort(rpc_app) def perform_app_delete(self, context, rpc_app, lifecycle_hook_info_app_delete): """Handling of application delete request (via AppOperator)