X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=a1%2Fcontroller.py;fp=a1%2Fcontroller.py;h=6f21830ec58dcd8fb976df0d1671c8a061d6e5d6;hb=0a3f67614eed2f39b3caaadfeaf6375ecf11172d;hp=75d84563202c4252a016da0b8aa31965770d36e7;hpb=50487bf719884e6a339b48ee5971d757837287b2;p=ric-plt%2Fa1.git

diff --git a/a1/controller.py b/a1/controller.py
index 75d8456..6f21830 100644
--- a/a1/controller.py
+++ b/a1/controller.py
@@ -142,14 +142,7 @@ def get_policy_instance_status(policy_type_id, policy_instance_id):
         3. "NOT IN EFFECT" otherwise (no statuses, or none are OK but not all are deleted)
     """
 
-    def get_status_handler():
-        vector = data.get_policy_instance_statuses(policy_type_id, policy_instance_id)
-        for i in vector:
-            if i == "OK":
-                return "IN EFFECT", 200
-        return "NOT IN EFFECT", 200
-
-    return _try_func_return(get_status_handler)
+    return _try_func_return(lambda: data.get_policy_instance_status(policy_type_id, policy_instance_id))
 
 
 def create_or_replace_policy_instance(policy_type_id, policy_instance_id):
@@ -188,8 +181,9 @@ def delete_policy_instance(policy_type_id, policy_instance_id):
     def delete_instance_handler():
         """
         here we send out the DELETEs but we don't delete the instance until a GET is called where we check the statuses
+        We also set the status as deleted which would be reflected in a GET to ../status (before the DELETE completes)
         """
-        data.instance_is_valid(policy_type_id, policy_instance_id)
+        data.delete_policy_instance(policy_type_id, policy_instance_id)
 
         # send rmr (best effort)
         body = _gen_body_to_handler("DELETE", policy_type_id, policy_instance_id)