1 files changed, 5 insertions, 76 deletions
diff --git a/sdv/docker/sdvstate/internal/validator/airship/pod_health_check.py b/sdv/docker/sdvstate/internal/validator/airship/pod_health_check.py
index 0093ffc..ab38f84 100644
--- a/sdv/docker/sdvstate/internal/validator/airship/pod_health_check.py
+++ b/sdv/docker/sdvstate/internal/validator/airship/pod_health_check.py
@@ -17,15 +17,12 @@
 Pod Health Checks
 """
 
-
-
 import logging
 
+from internal import checks
+from internal import store_result
 from tools.kube_utils import kube_api
 from tools.conf import settings
-from tools.result_api import rfile
-
-from .store_result import store_result
 
 
 
@@ -33,79 +30,11 @@ def pod_health_check():
     """
     Check health of all pods and get logs of failed pods
     """
+    logger = logging.getLogger(__name__)
     api = kube_api()
     namespace_list = settings.getValue('airship_namespace_list')
 
-    result = {'category':  'platform',
-              'case_name': 'pod_health_check',
-              'criteria':  'pass',
-              'details': []
-             }
-
-    for namespace in namespace_list:
-        pod_list = api.list_namespaced_pod(namespace)
-        for pod in pod_list.items:
-            pod_stats = pod_status(pod)
-            if pod_stats['criteria'] == 'fail':
-                pod_stats['logs'] = get_logs(pod)
-                result['criteria'] = 'fail'
-            result['details'].append(pod_stats)
-
-
-    store_result(result)
-    return result
-
-
-
-def pod_status(pod):
-    """
-    Check health of a pod and returns it's status as result
-    """
-    result = {'criteria': 'pass',
-              'name': pod.metadata.name,
-              'namespace': pod.metadata.namespace,
-              'node': pod.spec.node_name}
-
-    if pod.status.container_statuses is None:
-        result['criteria'] = 'fail'
-        result['pod_details'] = rfile(str(pod))
-    else:
-        for container in pod.status.container_statuses:
-            if container.state.running is not None:
-                status = 'Running'
-            if container.state.terminated is not None:
-                status = container.state.terminated.reason
-            if container.state.waiting is not None:
-                status = container.state.waiting.reason
+    result = checks.pod_health_check(logger, api, namespace_list)
 
-            if status not in ('Running', 'Completed'):
-                result['criteria'] = 'fail'
-                result['pod_details'] = rfile(str(pod))
-
-    info = f'[Health: {result["criteria"]}] Name: {result["name"]}, '
-    info = info + f'Namespace: {result["namespace"]}, Node: {result["node"]}'
-
-    logger = logging.getLogger(__name__)
-    logger.debug(info)
+    store_result(logger, result)
     return result
-
-
-def get_logs(pod):
-    """
-    Collects logs of all containers in ``pod``
-    """
-    api = kube_api()
-    logs = []
-    if pod.status.container_statuses is not None:
-        for container in pod.status.container_statuses:
-            con = {'container': container.name}
-            if container.state.waiting is not None and \
-               container.state.waiting.reason == 'PodInitializing':
-                log = 'Not found, status: waiting, reason: PodInitializing'
-            else:
-                log = api.read_namespaced_pod_log(name=pod.metadata.name,
-                                                  namespace=pod.metadata.namespace,
-                                                  container=container.name)
-            con['log'] = rfile(log)
-            logs.append(con)
-    return logs