starlingx/app-rook-ceph
Code Issues Proposed changes

Merge "Update references to appframework lifecycle constants."

Browse Source
This commit is contained in:
Zuul
2025-01-28 16:11:36 +00:00
committed by Gerrit Code Review
parent 518b3f0d41 3acc9b878d
commit ed4de419de
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python3-k8sapp-rook-ceph/k8sapp_rook_ceph/k8sapp_rook_ceph/lifecycle/lifecycle_rook_ceph.py
View File

@@ -52,40 +52,40 @@ class RookCephAppLifecycleOperator(base.AppLifecycleOperator):
""" """
# Fluxcd request # Fluxcd request
if hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_FLUXCD_REQUEST: if hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_FLUXCD_REQUEST:
if (hook_info.operation == constants.APP_REMOVE_OP and if (hook_info.operation == constants.APP_REMOVE_OP and
hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE): hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE):
return self.pre_remove(app_op, context) return self.pre_remove(app_op, context)
# Resources # 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: if hook_info.operation == constants.APP_APPLY_OP:
if hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE: if hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return self.pre_apply(app, app_op, hook_info) return self.pre_apply(app, app_op, hook_info)
elif (hook_info.operation == constants.APP_REMOVE_OP and 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) return lifecycle_utils.delete_local_registry_secrets(app_op, app, hook_info)
# Operation # Operation
elif hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_OPERATION: elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_OPERATION:
# Update ceph-rook backend task to app status and ceph-rook backend state # Update ceph-rook backend task to app status and ceph-rook backend state
self.update_backend(app, app_op) self.update_backend(app, app_op)
if hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: if hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST:
if hook_info.operation == constants.APP_APPLY_OP: if hook_info.operation == constants.APP_APPLY_OP:
return self.post_apply(app, app_op, hook_info, context) return self.post_apply(app, app_op, hook_info, context)
elif hook_info.operation == constants.APP_REMOVE_OP: elif hook_info.operation == constants.APP_REMOVE_OP:
return self.post_remove(app, app_op) return self.post_remove(app, app_op)
# Semantic Check # Semantic Check
elif hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_SEMANTIC_CHECK: elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_SEMANTIC_CHECK:
# Check if the operation is supported with no force argument # Check if the operation is supported with no force argument
self.common_semantic_checks(conductor_obj, app, hook_info) self.common_semantic_checks(conductor_obj, app, hook_info)
if (hook_info.operation == constants.APP_EVALUATE_REAPPLY_OP or if (hook_info.operation == constants.APP_EVALUATE_REAPPLY_OP or
(hook_info.operation == constants.APP_APPLY_OP and (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_semantic_checks(app, app_op) return self.pre_apply_semantic_checks(app, app_op)
elif (hook_info.operation == constants.APP_REMOVE_OP and elif (hook_info.operation == constants.APP_REMOVE_OP and
hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE): hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE):
return self.pre_remove_semantic_checks(app_op) return self.pre_remove_semantic_checks(app_op)
# Use the default behaviour for other hooks # Use the default behaviour for other hooks