NONRTRIC-955: Add uvicorn, fix for appl/json

[sim/a1-interface.git] / near-rt-ric-simulator / src / STD_2.0.0 / a1.py

diff --git a/near-rt-ric-simulator/src/STD_2.0.0/a1.py b/near-rt-ric-simulator/src/STD_2.0.0/a1.py
index e70a8ed..9b68a6c 100755 (executable)
--- a/near-rt-ric-simulator/src/STD_2.0.0/a1.py
+++ b/near-rt-ric-simulator/src/STD_2.0.0/a1.py
@@ -25,13 +25,14 @@ import time
 import requests
 
 from connexion import NoContent
-from flask import Flask, escape, request, Response, make_response
+from flask import Flask, request, Response
 from jsonschema import validate
 from var_declaration import policy_instances, policy_types, policy_status, callbacks, forced_settings, policy_fingerprint, hosts_set
 from utils import calcFingerprint
 from maincommon import check_apipath, apipath, get_supported_interfaces_response, extract_host_name, is_duplicate_check
+from models.enforceStatus import EnforceStatus
 
-#Constsants
+# Constants
 APPL_JSON='application/json'
 APPL_PROB_JSON='application/problem+json'
 
@@ -47,7 +48,7 @@ def get_all_policy_types():
     return r
 
   res = list(policy_types.keys())
-  return (res, 200)
+  return Response(json.dumps(res), 200, mimetype=APPL_JSON)
 
 # API Function: Get a policy type
 def get_policy_type(policyTypeId):
@@ -79,7 +80,8 @@ def get_all_policy_identities(policyTypeId):
     pjson=create_problem_json(None, "The policy type does not exist.", 404, None, policy_type_id)
     return Response(json.dumps(pjson), 404, mimetype=APPL_PROB_JSON)
 
-  return (list(policy_instances[policy_type_id].keys()), 200)
+  res = list(policy_instances[policy_type_id].keys())
+  return Response(json.dumps(res), 200, mimetype=APPL_JSON)
 
 # API Function: Create or update a policy
 def put_policy(policyTypeId, policyId):
@@ -139,8 +141,8 @@ def put_policy(policyTypeId, policyId):
       pjson=create_error_response(resp)
       return Response(json.dumps(pjson), 500, mimetype=APPL_PROB_JSON)
 
-  #Callout hooks for external server
-  #When it fails, break and return 419 HTTP status code
+  # Callout hooks for external server
+  # When it fails, break and return HTTP status code 500
   if (EXT_SRV_URL is not None):
     resp = callout_external_server(policy_id, data, 'PUT')
     if (resp != retcode):
@@ -152,16 +154,14 @@ def put_policy(policyTypeId, policyId):
 
   policy_fingerprint[fp]=policy_id
 
-  noti=request.args.get('notificationDestination')
-  callbacks[policy_id]=noti
+  noti = request.args.get('notificationDestination')
+  callbacks[policy_id] = noti
 
   policy_instances[policy_type_id][policy_id]=data
 
   if (policy_types[policy_type_id]['statusSchema'] is not None):
-    ps = {}
-    ps["enforceStatus"] = ""
-    ps["enforceReason"] = ""
-    policy_status[policy_id] = ps
+    enforceStatus = EnforceStatus("NOT_ENFORCED", "OTHER_REASON")
+    policy_status[policy_id] = enforceStatus.to_dict()
 
   if (retcode == 200):
     return Response(json.dumps(data), 200, mimetype=APPL_JSON)
@@ -217,8 +217,8 @@ def delete_policy(policyTypeId, policyId):
       pjson=create_error_response(resp)
       return Response(json.dumps(pjson), 500, mimetype=APPL_PROB_JSON)
 
-  #Callout hooks for external server
-  #When it fails, break and return 419 HTTP status code
+  # Callout hooks for external server
+  # When it fails, break and return HTTP status code 500
   if (EXT_SRV_URL is not None):
     resp = callout_external_server(policy_id, None, 'DELETE')
     if (resp != 204):