From 2aef951769ae7fab6f36a81134f484b0b7e389a1 Mon Sep 17 00:00:00 2001 From: Edson Dias Date: Thu, 2 Jan 2025 10:02:21 -0300 Subject: [PATCH] Update references to appframework lifecycle constants. The application framework lifecycle constants were split into two files, sysinv/helm/lifecycle_constants.py and sysinv/common/constants.py. Aiming to facilitate the split of the application framework into a separate application in the future, the review: https://review.opendev.org/c/starlingx/config/+/936252 moved the lifecycle variables to helm/lifecycle_contants file. This commit updates all references that pointed to the lifecycles constants at sysinv/common/constants.py file, changing them to point to the new variables in sysinv/helm/lifecycle_contants.py Test plan: PASS: build-pkgs && build-image PASS: AIO-SX fresh install PASS: Upload, apply, remove, delete, update and upgrade snmp app. Story: 2011242 Task: 51569 Depends-on: https://review.opendev.org/c/starlingx/config/+/936252 Change-Id: Ia60def75ae16bba4bc59d30e9de058908e12823d Signed-off-by: Edson Dias --- .../k8sapp_snmp/lifecycle/lifecycle_snmp.py | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py index f034608..e527936 100644 --- a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py +++ b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py @@ -12,6 +12,8 @@ from oslo_log import log as logging from sysinv.common import constants from sysinv.helm import lifecycle_base as base from sysinv.helm import lifecycle_utils as lifecycle_utils +from sysinv.helm.lifecycle_constants import LifecycleConstants + LOG = logging.getLogger(__name__) @@ -28,30 +30,30 @@ class SnmpAppLifecycleOperator(base.AppLifecycleOperator): """ # Operation - if hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_OPERATION: + if hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_OPERATION: if hook_info.operation == constants.APP_APPLY_OP: - if hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: + if hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST: return self.post_apply(context, conductor_obj, hook_info) elif hook_info.operation == constants.APP_REMOVE_OP: - if hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: + if hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST: return self.post_remove(context, conductor_obj, hook_info) # Rbd - elif hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_RBD: + elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_RBD: if hook_info.operation == constants.APP_APPLY_OP and \ - hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE: + hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE: return lifecycle_utils.create_rbd_provisioner_secrets(app_op, app, hook_info) elif hook_info.operation == constants.APP_REMOVE_OP and \ - hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: + hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST: return lifecycle_utils.delete_rbd_provisioner_secrets(app_op, app, hook_info) # Resources - elif hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_RESOURCE: + elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_RESOURCE: if hook_info.operation == constants.APP_APPLY_OP and \ - hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE: + hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE: return lifecycle_utils.create_local_registry_secrets(app_op, app, hook_info) elif hook_info.operation == constants.APP_REMOVE_OP and \ - hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: + hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST: return lifecycle_utils.delete_local_registry_secrets(app_op, app, hook_info) # Use the default behaviour for other hooks