From 9fcdcca947fda8eba24b126160b5e3570bf53dd4 Mon Sep 17 00:00:00 2001 From: Edson Dias Date: Thu, 2 Jan 2025 15:40:00 -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 node-feature-discovery. Story: 2011242 Task: 51583 Depends-on: https://review.opendev.org/c/starlingx/config/+/936252 Change-Id: I685aa7a207cbdbd9f43de9a50a6398be112ac0e5 Signed-off-by: Edson Dias --- .../lifecycle/lifecycle_node_feature_discovery.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python3-k8sapp-node-feature-discovery/k8sapp_node_feature_discovery/k8sapp_node_feature_discovery/lifecycle/lifecycle_node_feature_discovery.py b/python3-k8sapp-node-feature-discovery/k8sapp_node_feature_discovery/k8sapp_node_feature_discovery/lifecycle/lifecycle_node_feature_discovery.py index 6dbdc7b..147f812 100644 --- a/python3-k8sapp-node-feature-discovery/k8sapp_node_feature_discovery/k8sapp_node_feature_discovery/lifecycle/lifecycle_node_feature_discovery.py +++ b/python3-k8sapp-node-feature-discovery/k8sapp_node_feature_discovery/k8sapp_node_feature_discovery/lifecycle/lifecycle_node_feature_discovery.py @@ -13,6 +13,7 @@ from sysinv.common import constants from sysinv.common import kubernetes from sysinv.common import utils as cutils from sysinv.helm import lifecycle_base as base +from sysinv.helm.lifecycle_constants import LifecycleConstants from k8sapp_node_feature_discovery.common import constants as app_constants @@ -31,11 +32,11 @@ class NodeFeatureDiscoveryAppLifecycleOperator(base.AppLifecycleOperator): :param hook_info: LifecycleHookInfo object """ - 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_REMOVE_OP: - if hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE: + if hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE: return self.pre_remove(app, app_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(app, app_op) super(NodeFeatureDiscoveryAppLifecycleOperator, self).app_lifecycle_actions(