Bring latest jakarta fixes

[it/dep.git] / smo-install / test / pythonsdk / src / orantests / test_cl_apex.py

diff --git a/smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py b/smo-install/test/pythonsdk/src/orantests/test_cl_apex.py
similarity index 89%
rename from smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py
rename to smo-install/test/pythonsdk/src/orantests/test_cl_apex.py
index 3a575db..c881e10 100644 (file)
--- a/smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py
+++ b/smo-install/test/pythonsdk/src/orantests/test_cl_apex.py
@@ -55,6 +55,7 @@ clcommissioning_utils = ClCommissioningUtils()
 network_simulators = NetworkSimulators("./resources")
 clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH)
 policy = OranPolicy()
+usecase_name = "apex_usecase"
 
 @pytest.fixture(scope="module", autouse=True)
 def setup_simulators():
@@ -73,7 +74,7 @@ def setup_simulators():
     ### Cleanup code
     yield
     # Finish and delete the cl instance
-    clcommissioning_utils.clean_instance()
+    clcommissioning_utils.clean_instance(usecase_name)
 
     try:
         policy.undeploy_policy("operational.apex.linkmonitor", "1.0.0", settings.POLICY_BASICAUTH)
@@ -97,7 +98,7 @@ def verify_apex_policy_created():
     """
     logger.info("Verify Apex policy is deployed")
     policy_status_list = policy.get_policy_status(settings.POLICY_BASICAUTH)
-
+    logger.info("policy_list: %s", policy_status_list)
     for status in policy_status_list:
         logger.info("the status %s,%s,%s,%s:", status["policy"]["name"], status["policy"]["version"], status["deploy"], status["state"])
         if (status["policy"]["name"] == "operational.apex.linkmonitor" and status["policy"]["version"] == "1.0.0" and status["deploy"] and status["state"] == "SUCCESS"):
@@ -115,8 +116,9 @@ def send_dmaap_event():
 def test_cl_apex():
     """The Closed Loop O-RU Fronthaul Recovery usecase Apex version."""
     logger.info("Upload tosca to commissioning")
-    tosca_template = jinja_env().get_template("commission_apex.json.j2").render(dmaapGroup=settings.DMAAP_CL_GROUP, dmaapUser=settings.DMAAP_CL_USER)
-    assert clcommissioning_utils.create_instance(tosca_template) is True
+    commissioning_payload = jinja_env().get_template("commission_apex.json.j2").render(dmaapGroup=settings.DMAAP_CL_GROUP, dmaapUser=settings.DMAAP_CL_USER)
+    instance_payload = jinja_env().get_template("create_instance_apex.json.j2").render(dmaapGroup=settings.DMAAP_CL_GROUP, dmaapUser=settings.DMAAP_CL_USER, instanceName=usecase_name)
+    assert clcommissioning_utils.create_instance(usecase_name, commissioning_payload, instance_payload) is True
 
     sdnc = OranSdnc()
     status = sdnc.get_odu_oru_status("o-du-1122", "rrm-pol-2", settings.SDNC_BASICAUTH)