Refactor check resource functions from odu_workflows to k8s
Change-Id: Ie5c13ad84dfeab47476b92e4ce64f772dd7af7ca
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/osm_lcm/odu_workflows.py b/osm_lcm/odu_workflows.py
index a563f37..dac29d2 100644
--- a/osm_lcm/odu_workflows.py
+++ b/osm_lcm/odu_workflows.py
@@ -35,10 +35,8 @@
# self._kubeconfig = kubeconfig # TODO: get it from config
self.gitops_config = config["gitops"]
self.logger.debug(f"Config: {self.gitops_config}")
- self._kubeconfig = self.gitops_config["mgmtcluster_kubeconfig"]
- self._odu_checkloop_kustomization_timeout = 900
- self._odu_checkloop_resource_timeout = 900
self._odu_checkloop_retry_time = 15
+ self._kubeconfig = self.gitops_config["mgmtcluster_kubeconfig"]
self._kubectl = kubectl.Kubectl(config_file=self._kubeconfig)
self._repo_base_url = self.gitops_config["git_base_url"]
self._repo_user = self.gitops_config["user"]
@@ -49,93 +47,72 @@
"create_cluster": {
"workflow_function": self.create_cluster,
"clean_function": self.clean_items_cluster_create,
- "check_resource_function": self.check_create_cluster,
},
"update_cluster": {
"workflow_function": self.update_cluster,
"clean_function": self.clean_items_cluster_update,
- "check_resource_function": self.check_update_cluster,
},
"delete_cluster": {
"workflow_function": self.delete_cluster,
- "check_resource_function": self.check_delete_cluster,
},
"register_cluster": {
"workflow_function": self.register_cluster,
"clean_function": self.clean_items_cluster_register,
- "check_resource_function": self.check_register_cluster,
},
"deregister_cluster": {
"workflow_function": self.deregister_cluster,
- "check_resource_function": self.check_deregister_cluster,
},
"create_profile": {
"workflow_function": self.create_profile,
- "check_resource_function": self.check_create_profile,
},
"delete_profile": {
"workflow_function": self.delete_profile,
- "check_resource_function": self.check_delete_profile,
},
"attach_profile_to_cluster": {
"workflow_function": self.attach_profile_to_cluster,
- "check_resource_function": self.check_attach_profile_to_cluster,
},
"detach_profile_from_cluster": {
"workflow_function": self.detach_profile_from_cluster,
- "check_resource_function": self.check_detach_profile_from_cluster,
},
"create_oka": {
"workflow_function": self.create_oka,
- "check_resource_function": self.check_create_oka,
},
"update_oka": {
"workflow_function": self.update_oka,
- "check_resource_function": self.check_update_oka,
},
"delete_oka": {
"workflow_function": self.delete_oka,
- "check_resource_function": self.check_delete_oka,
},
"create_ksus": {
"workflow_function": self.create_ksus,
"clean_function": self.clean_items_ksu_create,
- "check_resource_function": self.check_create_ksus,
},
"update_ksus": {
"workflow_function": self.update_ksus,
"clean_function": self.clean_items_ksu_update,
- "check_resource_function": self.check_update_ksus,
},
"delete_ksus": {
"workflow_function": self.delete_ksus,
- "check_resource_function": self.check_delete_ksus,
},
"clone_ksu": {
"workflow_function": self.clone_ksu,
- "check_resource_function": self.check_clone_ksu,
},
"move_ksu": {
"workflow_function": self.move_ksu,
- "check_resource_function": self.check_move_ksu,
},
"create_cloud_credentials": {
"workflow_function": self.create_cloud_credentials,
"clean_function": self.clean_items_cloud_credentials_create,
- "check_resource_function": self.check_create_cloud_credentials,
},
"update_cloud_credentials": {
"workflow_function": self.update_cloud_credentials,
"clean_function": self.clean_items_cloud_credentials_update,
- "check_resource_function": self.check_update_cloud_credentials,
},
"delete_cloud_credentials": {
"workflow_function": self.delete_cloud_credentials,
- "check_resource_function": self.check_delete_cloud_credentials,
},
"dummy_operation": {
"workflow_function": self.dummy_operation,
- "check_resource_function": self.check_dummy_operation,
},
}
@@ -152,9 +129,6 @@
delete_cloud_credentials,
clean_items_cloud_credentials_create,
clean_items_cloud_credentials_update,
- check_create_cloud_credentials,
- check_update_cloud_credentials,
- check_delete_cloud_credentials,
)
from osm_lcm.odu_libs.cluster_mgmt import (
create_cluster,
@@ -165,11 +139,6 @@
clean_items_cluster_create,
clean_items_cluster_update,
clean_items_cluster_register,
- check_create_cluster,
- check_update_cluster,
- check_delete_cluster,
- check_register_cluster,
- check_deregister_cluster,
get_cluster_credentials,
)
from osm_lcm.odu_libs.ksu import (
@@ -180,34 +149,21 @@
move_ksu,
clean_items_ksu_create,
clean_items_ksu_update,
- check_create_ksus,
- check_update_ksus,
- check_delete_ksus,
- check_clone_ksu,
- check_move_ksu,
)
from osm_lcm.odu_libs.oka import (
create_oka,
update_oka,
delete_oka,
- check_create_oka,
- check_update_oka,
- check_delete_oka,
)
from osm_lcm.odu_libs.profiles import (
create_profile,
delete_profile,
attach_profile_to_cluster,
detach_profile_from_cluster,
- check_create_profile,
- check_delete_profile,
- check_attach_profile_to_cluster,
- check_detach_profile_from_cluster,
)
from osm_lcm.odu_libs.workflows import (
check_workflow_status,
readiness_loop,
- common_check_list,
)
from osm_lcm.odu_libs.render import (
render_jinja_template,
@@ -239,18 +195,6 @@
self.logger.info(f"Operation {op_id}. Params: {op_params}. Content: {content}")
return content["workflow_name"]
- async def check_resource_status(self, key, op_id, op_params, content):
- self.logger.info(
- f"Check resource status. Key: {key}. Operation: {op_id}. Params: {op_params}. Content: {content}"
- )
- check_resource_function = self._workflows[key]["check_resource_function"]
- self.logger.info("check_resource function : {}".format(check_resource_function))
- return await check_resource_function(op_id, op_params, content)
-
- async def check_dummy_operation(self, op_id, op_params, content):
- self.logger.info(f"Operation {op_id}. Params: {op_params}. Content: {content}")
- return True, "OK"
-
async def clean_items(self, items):
# Delete secrets
for secret in items.get("secrets", []):