From 528a158bd40004b70d0d013535565dc09fada0e8 Mon Sep 17 00:00:00 2001 From: Edson Dias Date: Fri, 3 Jan 2025 10:14:32 -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 oidc app. Story: 2011242 Task: 51598 Depends-on: https://review.opendev.org/c/starlingx/config/+/936252 Change-Id: Icce48e7421c61f0d30c89d1d72fe4aa5dc36d164 Signed-off-by: Edson Dias --- .../k8sapp_oidc/k8sapp_oidc/lifecycle/lifecycle_oidc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python3-k8sapp-oidc/k8sapp_oidc/k8sapp_oidc/lifecycle/lifecycle_oidc.py b/python3-k8sapp-oidc/k8sapp_oidc/k8sapp_oidc/lifecycle/lifecycle_oidc.py index 54f3cc5..58cd841 100644 --- a/python3-k8sapp-oidc/k8sapp_oidc/k8sapp_oidc/lifecycle/lifecycle_oidc.py +++ b/python3-k8sapp-oidc/k8sapp_oidc/k8sapp_oidc/lifecycle/lifecycle_oidc.py @@ -13,8 +13,10 @@ from oslo_log import log as logging from sysinv.common import constants from sysinv.helm import lifecycle_base as base from sysinv.helm import common +from sysinv.helm.lifecycle_constants import LifecycleConstants from sysinv.db import api as dbapi + LOG = logging.getLogger(__name__) OVERRIDES_REQUIRED_MSG = "Overrides for all helm charts are required to apply \ OIDC. Refer to 'Set up OIDC Auth Applications' guide to configure the \ @@ -27,9 +29,9 @@ class OidcAppLifecycleOperator(base.AppLifecycleOperator): """Perform lifecycle actions for an operation""" - if hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_RESOURCE: + if 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 self.pre_apply(app_op, app, hook_info) super(OidcAppLifecycleOperator, self).app_lifecycle_actions(