Merge "Merge branch 'development'"

[ric-plt/a1.git] / a1 / controller.py

diff --git a/a1/controller.py b/a1/controller.py
index 7db18a0..1022320 100644 (file)
--- a/a1/controller.py
+++ b/a1/controller.py
@@ -22,11 +22,11 @@ from flask import Response
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 import connexion
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 import connexion

-from a1 import get_module_logger
+from mdclogpy import Logger

 from a1 import a1rmr, exceptions, data
 
 
 from a1 import a1rmr, exceptions, data
 
 

-logger = get_module_logger(__name__)
+mdc_logger = Logger(name=__name__)

 
 
 def _try_func_return(func):
 
 
 def _try_func_return(func):


@@ -35,15 +35,13 @@ def _try_func_return(func):
     """
     try:
         return func()
     """
     try:
         return func()

-    except (ValidationError, exceptions.PolicyTypeAlreadyExists) as exc:
-        logger.exception(exc)
+    except (ValidationError, exceptions.PolicyTypeAlreadyExists, exceptions.CantDeleteNonEmptyType):

         return "", 400
         return "", 400

-    except (exceptions.PolicyTypeNotFound, exceptions.PolicyInstanceNotFound) as exc:
-        logger.exception(exc)
+    except (exceptions.PolicyTypeNotFound, exceptions.PolicyInstanceNotFound):

         return "", 404
     except BaseException as exc:
         # catch all, should never happen...
         return "", 404
     except BaseException as exc:
         # catch all, should never happen...

-        logger.exception(exc)
+        mdc_logger.exception(exc)

         return Response(status=500)
 
 
         return Response(status=500)
 
 


@@ -65,9 +63,14 @@ def _gen_body_to_handler(operation, policy_type_id, policy_instance_id, payload=
 def get_healthcheck():
     """
     Handles healthcheck GET
 def get_healthcheck():
     """
     Handles healthcheck GET

-    Currently, this basically checks the server is alive.a1rmr
+    Currently, this checks:
+    1. whether the a1 webserver is up (if it isn't, this won't even be called, so even entering this function confirms it is)
+    2. checks whether the rmr thread is running and has completed a loop recently
+    TODO: make "seconds" to pass in a configurable parameter?

     """
     """

-    return "", 200
+    if a1rmr.healthcheck_rmr_thread():
+        return "", 200
+    return "rmr thread is unhealthy", 500

 
 
 # Policy types
 
 
 # Policy types


@@ -104,8 +107,12 @@ def delete_policy_type(policy_type_id):
     """
     Handles DELETE /a1-p/policytypes/policy_type_id
     """
     """
     Handles DELETE /a1-p/policytypes/policy_type_id
     """

-    logger.error(policy_type_id)
-    return "", 501
+
+    def delete_policy_type_handler():
+        data.delete_policy_type(policy_type_id)
+        return "", 204
+
+    return _try_func_return(delete_policy_type_handler)

 
 
 # Policy instances
 
 
 # Policy instances


@@ -115,31 +122,14 @@ def get_all_instances_for_type(policy_type_id):
     """
     Handles GET /a1-p/policytypes/policy_type_id/policies
     """
     """
     Handles GET /a1-p/policytypes/policy_type_id/policies
     """

-
-    def get_all_instance_handler():
-        # try to clean up instances for this type
-        for policy_instance_id in data.get_instance_list(policy_type_id):
-            data.delete_policy_instance_if_applicable(policy_type_id, policy_instance_id)
-
-        # re-fetch this list as it may have changed
-        return data.get_instance_list(policy_type_id), 200
-
-    return _try_func_return(get_all_instance_handler)
+    return _try_func_return(lambda: data.get_instance_list(policy_type_id))

 
 
 def get_policy_instance(policy_type_id, policy_instance_id):
     """
     Handles GET /a1-p/policytypes/polidyid/policies/policy_instance_id
     """
 
 
 def get_policy_instance(policy_type_id, policy_instance_id):
     """
     Handles GET /a1-p/policytypes/polidyid/policies/policy_instance_id
     """

-
-    def get_instance_handler():
-        # delete if applicable (will raise if not applicable to begin with)
-        data.delete_policy_instance_if_applicable(policy_type_id, policy_instance_id)
-
-        # raise 404 now that we may have deleted, or get the instance otherwise
-        return data.get_policy_instance(policy_type_id, policy_instance_id), 200
-
-    return _try_func_return(get_instance_handler)
+    return _try_func_return(lambda: data.get_policy_instance(policy_type_id, policy_instance_id))

 
 
 def get_policy_instance_status(policy_type_id, policy_instance_id):
 
 
 def get_policy_instance_status(policy_type_id, policy_instance_id):


@@ -152,17 +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)
     """
 
         3. "NOT IN EFFECT" otherwise (no statuses, or none are OK but not all are deleted)
     """
 

-    def get_status_handler():
-        # delete if applicable (will raise if not applicable to begin with)
-        data.delete_policy_instance_if_applicable(policy_type_id, policy_instance_id)
-
-        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):
 
 
 def create_or_replace_policy_instance(policy_type_id, policy_instance_id):


@@ -186,7 +166,7 @@ def create_or_replace_policy_instance(policy_type_id, policy_instance_id):
 
         # send rmr (best effort)
         body = _gen_body_to_handler("CREATE", policy_type_id, policy_instance_id, payload=instance)
 
         # send rmr (best effort)
         body = _gen_body_to_handler("CREATE", policy_type_id, policy_instance_id, payload=instance)

-        a1rmr.send(json.dumps(body), message_type=policy_type_id)
+        a1rmr.queue_work({"payload": json.dumps(body), "ptid": policy_type_id})

 
         return "", 202
 
 
         return "", 202
 


@@ -201,10 +181,13 @@ 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
     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.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)
         # send rmr (best effort)
         body = _gen_body_to_handler("DELETE", policy_type_id, policy_instance_id)

-        a1rmr.send(json.dumps(body), message_type=policy_type_id)
+        a1rmr.queue_work({"payload": json.dumps(body), "ptid": policy_type_id})

 
         return "", 202
 
 
         return "", 202