From: garciadeblas Date: Sat, 8 Feb 2025 09:42:08 +0000 (+0100) Subject: Increase timeout for cluster scale operation and use string comparison X-Git-Tag: v18.0.0~35 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=65cd98987a6d5332b361d6c425aa615998d1ff7f;p=osm%2FLCM.git Increase timeout for cluster scale operation and use string comparison Change-Id: I512177a4ae7be04bd52677a89861b4558478b76d Signed-off-by: garciadeblas --- diff --git a/osm_lcm/k8s.py b/osm_lcm/k8s.py index 67173e7f..b5a1f9ec 100644 --- a/osm_lcm/k8s.py +++ b/osm_lcm/k8s.py @@ -1286,7 +1286,7 @@ class ClusterLcm(GitOpsLcm): "jsonpath_filter": "status.atProvider.defaultNodePool[0].nodeCount", "value": f"{op_params['node_count']}", }, - "timeout": self._checkloop_resource_timeout * 2, + "timeout": self._checkloop_resource_timeout * 3, "enable": True, "resourceState": "IN_PROGRESS.RESOURCE_READY.NODE_COUNT.CLUSTER", } diff --git a/osm_lcm/odu_libs/workflows.py b/osm_lcm/odu_libs/workflows.py index 651d0d96..eeface4a 100644 --- a/osm_lcm/odu_libs/workflows.py +++ b/osm_lcm/odu_libs/workflows.py @@ -148,7 +148,7 @@ async def readiness_loop( jsonpath_expr = parse(condition["jsonpath_filter"]) match = jsonpath_expr.find(generic_object) if match: - value = match[0].value + value = str(match[0].value) condition_function = condition.get( "function", lambda x, y: x == y )