X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=blobdiff_plain;f=smo-install%2Ftest%2Fpythonsdk%2Fsrc%2Forantests%2Foran_tests%2Fconftest.py;fp=smo-install%2Ftest%2Fpythonsdk%2Fsrc%2Forantests%2Foran_tests%2Fconftest.py;h=48314d5d804f2a7fc5212150d55dbab79550e7c0;hp=9723a6d3b7abb047822a4ce8acf5f1fce48f05f3;hb=a54a96ba117b4b30c8f88e88f973ea18ddd8687c;hpb=bc6231f7d4d44ab5f269683c42eb90c2ce4ec9a6

diff --git a/smo-install/test/pythonsdk/src/orantests/oran_tests/conftest.py b/smo-install/test/pythonsdk/src/orantests/oran_tests/conftest.py
index 9723a6d3..48314d5d 100644
--- a/smo-install/test/pythonsdk/src/orantests/oran_tests/conftest.py
+++ b/smo-install/test/pythonsdk/src/orantests/oran_tests/conftest.py
@@ -25,18 +25,13 @@
 import logging
 import logging.config
 import os
-from requests import RequestException
 from onapsdk.configuration import settings
-from onapsdk.exceptions import ConnectionFailed, APIError
 from waiting import wait
-from urllib3.exceptions import NewConnectionError
-from oransdk.dmaap.dmaap import OranDmaap
-from oransdk.policy.clamp import ClampToscaTemplate
-from oransdk.policy.policy import OranPolicy
-from oransdk.sdnc.sdnc import OranSdnc
+from oransdk.utils.healthcheck import HealthCheck
 from smo.smo import Smo
 from smo.network_simulators import NetworkSimulators
 
+
 # Set working dir as python script location
 abspath = os.path.abspath(__file__)
 dname = os.path.dirname(abspath)
@@ -47,62 +42,19 @@ logger = logging.getLogger("Test Session setup")
 
 network_sims = NetworkSimulators("./resources")
 smo = Smo()
-clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH)
-dmaap = OranDmaap()
-sdnc = OranSdnc()
-policy = OranPolicy()
-
-def policy_component_ready():
-    """Check if components are ready."""
-    logger.info("Verify policy components are ready")
-    try:
-        policy_ready = {"api_ready": False, "pap_ready": False, "apex_ready": False}
-    except (RequestException, NewConnectionError, ConnectionFailed, APIError) as e:
-        logger.error(e)
-        return False
-    policy_status = policy.get_components_status(settings.POLICY_BASICAUTH)
-    if (policy_status["api"]["healthy"] and not policy_ready["api_ready"]):
-        logger.info("Policy Api is ready")
-        policy_ready["api_ready"] = True
-    if (policy_status["pap"]["healthy"] and not policy_ready["pap_ready"]):
-        logger.info("Policy Pap is ready")
-        policy_ready["pap_ready"] = True
-    if (len(policy_status["pdps"]["apex"]) > 0 and policy_status["pdps"]["apex"][0]["healthy"] == "HEALTHY" and not policy_ready["apex_ready"]):
-        logger.info("Policy Apex is ready")
-        policy_ready["apex_ready"] = True
-    return policy_ready["api_ready"] and policy_ready["pap_ready"] and policy_ready["apex_ready"]
-
-def sdnc_component_ready():
-    """Check if SDNC component is ready."""
-    logger.info("Verify sdnc component is ready")
-
-    try:
-        response = OranSdnc.get_events(settings.SDNC_BASICAUTH, "test")
-    except (RequestException, NewConnectionError, ConnectionFailed, APIError) as e:
-        logger.error(e)
-        return False
-    return response.status_code == 200
-
-def clamp_component_ready():
-    """Check if Clamp component is ready."""
-    logger.info("Verify Clamp component is ready")
-    try:
-        response = clamp.get_template_instance()
-    except (RequestException, NewConnectionError, ConnectionFailed, APIError) as e:
-        logger.error(e)
-        return False
-    return response["automationCompositionList"] is not None
 
 ###### Entry points of PYTEST Session
 def pytest_sessionstart():
     """Pytest calls it when starting a test session."""
     logger.info("Check and wait for SMO to be running")
     smo.wait_for_smo_to_be_running()
-    logger.info("Check and for for SDNC to be running")
-    wait(lambda: policy_component_ready(), sleep_seconds=settings.POLICY_CHECK_RETRY, timeout_seconds=settings.POLICY_CHECK_TIMEOUT, waiting_for="Policy to be ready")
-    wait(lambda: sdnc_component_ready(), sleep_seconds=settings.SDNC_CHECK_RETRY, timeout_seconds=settings.SDNC_CHECK_TIMEOUT, waiting_for="SDNC to be ready")
-    # disable for now, until policy/clamp issue has been fixed
-    wait(lambda: clamp_component_ready(), sleep_seconds=settings.CLAMP_CHECK_RETRY, timeout_seconds=settings.CLAMP_CHECK_TIMEOUT, waiting_for="Clamp to be ready")
+
+    logger.info("Check and wait for for Policy to be running")
+    wait(lambda: HealthCheck.policy_component_ready(), sleep_seconds=settings.POLICY_CHECK_RETRY, timeout_seconds=settings.POLICY_CHECK_TIMEOUT, waiting_for="Policy to be ready")
+    logger.info("Check and wait for for SDNC to be running")
+    wait(lambda: HealthCheck.sdnc_component_ready(), sleep_seconds=settings.SDNC_CHECK_RETRY, timeout_seconds=settings.SDNC_CHECK_TIMEOUT, waiting_for="SDNC to be ready")
+    logger.info("Check and wait for for Clamp to be running")
+    wait(lambda: HealthCheck.clamp_component_ready(), sleep_seconds=settings.CLAMP_CHECK_RETRY, timeout_seconds=settings.CLAMP_CHECK_TIMEOUT, waiting_for="Clamp to be ready")
 
     ## Just kill any simulators that could already be runnin
     network_sims.stop_network_simulators()