Update version number in container-tag for F Maintenance Release

[sim/a1-interface.git] / near-rt-ric-simulator / src / OSC_2.1.0 / main.py

diff --git a/near-rt-ric-simulator/src/OSC_2.1.0/main.py b/near-rt-ric-simulator/src/OSC_2.1.0/main.py
index 1bc6128..18bc03b 100644 (file)
--- a/near-rt-ric-simulator/src/OSC_2.1.0/main.py
+++ b/near-rt-ric-simulator/src/OSC_2.1.0/main.py
@@ -1,5 +1,5 @@
 #  ============LICENSE_START===============================================
 #  ============LICENSE_START===============================================

-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2021 Nordix Foundation. All rights reserved.

 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.


@@ -24,20 +24,24 @@ import requests
 from pathlib import Path
 from flask import Flask, escape, request, Response, jsonify
 from jsonschema import validate
 from pathlib import Path
 from flask import Flask, escape, request, Response, jsonify
 from jsonschema import validate

-from var_declaration import policy_instances, policy_types, policy_status, policy_fingerprint, forced_settings, hosts_set
-from maincommon import *
+from var_declaration import policy_instances, policy_types, policy_status, policy_fingerprint, forced_settings, hosts_set, app
+from maincommon import check_apipath, apipath, get_supported_interfaces_response, extract_host_name

 from time import sleep
 
 from time import sleep
 

+#Constants
+TEXT_PLAIN='text/plain'

 
 check_apipath()
 
 
 check_apipath()
 

-app = connexion.FlaskApp(__name__, specification_dir=apipath)
+# app is created in var_declarations
+
+import payload_logging   # app var need to be initialized

 
 #Check alive function
 @app.route('/', methods=['GET'])
 def test():
 
 
 #Check alive function
 @app.route('/', methods=['GET'])
 def test():
 

-    return Response("OK", 200, mimetype='text/plain')
+    return Response("OK", 200, mimetype=TEXT_PLAIN)

 
 @app.route('/ip', methods=['GET'])
 def get_ip():
 
 @app.route('/ip', methods=['GET'])
 def get_ip():


@@ -64,7 +68,7 @@ def deleteinstances():
   forced_settings['code']=None
   forced_settings['delay']=None
   policy_fingerprint.clear()
   forced_settings['code']=None
   forced_settings['delay']=None
   policy_fingerprint.clear()

-  return Response("All policy instances deleted", 200, mimetype='text/plain')
+  return Response("All policy instances deleted", 200, mimetype=TEXT_PLAIN)

 
 #Delete all - all reset
 @app.route('/deleteall', methods=['POST'])
 
 #Delete all - all reset
 @app.route('/deleteall', methods=['POST'])


@@ -76,59 +80,59 @@ def deleteall():
   forced_settings['code']=None
   forced_settings['delay']=None
   policy_fingerprint.clear()
   forced_settings['code']=None
   forced_settings['delay']=None
   policy_fingerprint.clear()

-  return Response("All policy instances and types deleted", 200, mimetype='text/plain')
+  return Response("All policy instances and types deleted", 200, mimetype=TEXT_PLAIN)

 
 #Load a policy type
 @app.route('/policytype', methods=['PUT'])
 def policytype():
 
 
 #Load a policy type
 @app.route('/policytype', methods=['PUT'])
 def policytype():
 

-  policyTypeId=request.args.get('id')
-  if (policyTypeId is None):
-    return Response('Parameter <id> missing in request', status=400, mimetype='text/plain')
+  policy_type_id=request.args.get('id')
+  if (policy_type_id is None):
+    return Response('Parameter <id> missing in request', status=400, mimetype=TEXT_PLAIN)

   try:
   try:

-    val=int(policyTypeId)
-  except:
-    return Response("The policy type id is not an int", 400, mimetype='text/plain')
+    int(policy_type_id)
+  except Exception:
+    return Response("The policy type id is not an int", 400, mimetype=TEXT_PLAIN)

   try:
     data = request.data
     data = json.loads(data)
   try:
     data = request.data
     data = json.loads(data)

-  except:
-    return Response("The policy type is corrupt or missing", 400, mimetype='text/plain')
+  except Exception:
+    return Response("The policy type is corrupt or missing", 400, mimetype=TEXT_PLAIN)

 
   if ('name' not in data.keys() or 'description' not in data.keys() or 'policy_type_id' not in data.keys() or'create_schema' not in data.keys()):
 
   if ('name' not in data.keys() or 'description' not in data.keys() or 'policy_type_id' not in data.keys() or'create_schema' not in data.keys()):

-    return Response("The policy type missing atributes", 400, mimetype='text/plain')
+    return Response("The policy type missing atributes", 400, mimetype=TEXT_PLAIN)

 
   retcode=201
 
   retcode=201

-  if (policyTypeId in policy_types.keys()):
+  if (policy_type_id in policy_types.keys()):

     retcode=200
     retcode=200

-    if (len(policy_instances[policyTypeId]) > 0):
-      return Response("The policy type already exists and instances exists", 400, mimetype='text/plain')
+    if (len(policy_instances[policy_type_id]) > 0):
+      return Response("The policy type already exists and instances exists", 400, mimetype=TEXT_PLAIN)

 
 

-  policy_types[policyTypeId]=data
-  policy_instances[policyTypeId]={}
-  return Response("Policy type " + policyTypeId + " is OK.", retcode, mimetype='text/plain')
+  policy_types[policy_type_id]=data
+  policy_instances[policy_type_id]={}
+  return Response("Policy type " + policy_type_id + " is OK.", retcode, mimetype=TEXT_PLAIN)

 
 #Delete a policy type
 @app.route('/policytype', methods=['DELETE'])
 def del_policytype():
 
 
 #Delete a policy type
 @app.route('/policytype', methods=['DELETE'])
 def del_policytype():
 

-  policyTypeId=request.args.get('id')
-  if (policyTypeId is None):
-    return Response('Parameter <id> missing in request', status=400, mimetype='text/plain')
+  policy_type_id=request.args.get('id')
+  if (policy_type_id is None):
+    return Response('Parameter <id> missing in request', status=400, mimetype=TEXT_PLAIN)

   try:
   try:

-    val=int(policyTypeId)
-  except:
-    return Response("The policy type id is not an int", 400, mimetype='text/plain')
+    int(policy_type_id)
+  except Exception:
+    return Response("The policy type id is not an int", 400, mimetype=TEXT_PLAIN)

 
 

-  if (policyTypeId in policy_types.keys()):
-    if (len(policy_instances[policyTypeId]) > 0):
-      return Response("The policy type already exists and instances exists", 400, mimetype='text/plain')
+  if (policy_type_id in policy_types.keys()):
+    if (len(policy_instances[policy_type_id]) > 0):
+      return Response("The policy type already exists and instances exists", 400, mimetype=TEXT_PLAIN)

 
 

-    del policy_types[policyTypeId]
-    del policy_instances[policyTypeId]
-    return Response("Policy type " + policyTypeId + " is OK.", 204, mimetype='text/plain')
+    del policy_types[policy_type_id]
+    del policy_instances[policy_type_id]
+    return Response("Policy type " + policy_type_id + " is OK.", 204, mimetype=TEXT_PLAIN)

 
 

-  return Response("Policy type " + policyTypeId + " not found.", 204, mimetype='text/plain')
+  return Response("Policy type " + policy_type_id + " not found.", 204, mimetype=TEXT_PLAIN)

 
 
 # Get all policy type ids
 
 
 # Get all policy type ids


@@ -144,9 +148,9 @@ def forceresponse():
 
   try:
     forced_settings['code']=int(request.args.get('code'))
 
   try:
     forced_settings['code']=int(request.args.get('code'))

-  except:
+  except Exception:

     forced_settings['code']=None
     forced_settings['code']=None

-  return Response("Force response code: " + str(forced_settings['code']) + " set for one single A1 response", 200, mimetype='text/plain')
+  return Response("Force response code: " + str(forced_settings['code']) + " set for one single A1 response", 200, mimetype=TEXT_PLAIN)

 
 #Set force delay response, in seconds, for all A1 responses
 #/froceesponse?delay=<seconds>
 
 #Set force delay response, in seconds, for all A1 responses
 #/froceesponse?delay=<seconds>


@@ -155,9 +159,9 @@ def forcedelay():
 
   try:
     forced_settings['delay']=int(request.args.get('delay'))
 
   try:
     forced_settings['delay']=int(request.args.get('delay'))

-  except:
+  except Exception:

     forced_settings['delay']=None
     forced_settings['delay']=None

-  return Response("Force delay: " + str(forced_settings['delay']) + " sec set for all A1 responses", 200, mimetype='text/plain')
+  return Response("Force delay: " + str(forced_settings['delay']) + " sec set for all A1 responses", 200, mimetype=TEXT_PLAIN)

 
 
 #Set status and reason
 
 
 #Set status and reason


@@ -165,53 +169,56 @@ def forcedelay():
 @app.route('/status', methods=['PUT'])
 def setstatus():
 
 @app.route('/status', methods=['PUT'])
 def setstatus():
 

-  policyId=request.args.get('policyid')
-  if (policyId is None):
-    return Response('Parameter <policyid> missing in request', status=400, mimetype='text/plain')
+  policy_id=request.args.get('policyid')
+  if (policy_id is None):
+    return Response('Parameter <policyid> missing in request', status=400, mimetype=TEXT_PLAIN)

 
 

-  if policyId not in policy_status.keys():
-    return Response('Policyid: '+policyId+' not found.', status=404, mimetype='text/plain')
+  if policy_id not in policy_status.keys():
+    return Response('Policyid: '+policy_id+' not found.', status=404, mimetype=TEXT_PLAIN)

   status=request.args.get('status')
   if (status is None):
   status=request.args.get('status')
   if (status is None):

-    return Response('Parameter <status> missing in request', status=400, mimetype='text/plain')
-  policy_status[policyId]["instance_status"]=status
+    return Response('Parameter <status> missing in request', status=400, mimetype=TEXT_PLAIN)
+  policy_status[policy_id]["instance_status"]=status

   msg = "Status set to "+status
   deleted_policy=request.args.get('deleted')
   if (deleted_policy is not None):
   msg = "Status set to "+status
   deleted_policy=request.args.get('deleted')
   if (deleted_policy is not None):

-    policy_status[policyId]["has_been_deleted"]=deleted_policy
+    policy_status[policy_id]["has_been_deleted"]=deleted_policy

     msg = msg + " and has_been_deleted set to "+deleted_policy
   created_at = request.args.get('created_at')
   if (created_at is not None):
     msg = msg + " and has_been_deleted set to "+deleted_policy
   created_at = request.args.get('created_at')
   if (created_at is not None):

-    policy_status[policyId]["created_at"]=created_at
+    policy_status[policy_id]["created_at"]=created_at

     msg = msg + " and created_at set to "+created_at
     msg = msg + " and created_at set to "+created_at

-  msg=msg + " for policy: " + policyId
-  return Response(msg, 200, mimetype='text/plain')
+  msg=msg + " for policy: " + policy_id
+  return Response(msg, 200, mimetype=TEXT_PLAIN)

 
 
 #Metrics function
 #Get a named counter
 @app.route('/counter/<string:countername>', methods=['GET'])
 
 
 #Metrics function
 #Get a named counter
 @app.route('/counter/<string:countername>', methods=['GET'])

-def getCounter(countername):
+def getcounter(countername):

 
   if (countername == "num_instances"):
 
   if (countername == "num_instances"):

-    return Response(str(len(policy_fingerprint)), 200, mimetype='text/plain')
+    return Response(str(len(policy_fingerprint)), 200, mimetype=TEXT_PLAIN)

   elif (countername == "num_types"):
   elif (countername == "num_types"):

-    return Response(str(len(policy_instances)),200, mimetype='text/plain')
+    return Response(str(len(policy_instances)),200, mimetype=TEXT_PLAIN)

   elif (countername == "interface"):
     p=Path(os.getcwd())
     pp=p.parts
   elif (countername == "interface"):
     p=Path(os.getcwd())
     pp=p.parts

-    return Response(str(pp[len(pp)-1]),200, mimetype='text/plain')
+    return Response(str(pp[len(pp)-1]),200, mimetype=TEXT_PLAIN)

   elif (countername == "remote_hosts"):
     hosts=",".join(hosts_set)
     return str(hosts),200
   elif (countername == "remote_hosts"):
     hosts=",".join(hosts_set)
     return str(hosts),200

+  elif (countername == "datadelivery"):
+    return Response(str(0),200, mimetype=TEXT_PLAIN)

   else:
   else:

-    return Response("Counter name: "+countername+" not found.",404, mimetype='text/plain')
+    return Response("Counter name: "+countername+" not found.",404, mimetype=TEXT_PLAIN)

 
 port_number = 2222
 
 port_number = 2222

-if len(sys.argv) >= 2:
+if len(sys.argv) >= 2 :

   if isinstance(sys.argv[1], int):
     port_number = sys.argv[1]
 
 app.add_api('openapi.yaml')
 
   if isinstance(sys.argv[1], int):
     port_number = sys.argv[1]
 
 app.add_api('openapi.yaml')
 

-app.run(port=port_number, host="127.0.0.1", threaded=False)
\ No newline at end of file
+if __name__ == '__main__':
+  app.run(port=port_number, host="127.0.0.1", threaded=False)
\ No newline at end of file