NONRTRIC-955: Fix unit test 404 issue
Signed-off-by: DenisGNoonan <denis.noonan@est.tech>
Change-Id: Ib12d9a89b397d4912364ce5884983bf7589f1380
diff --git a/near-rt-ric-simulator/src/STD_2.0.0/main.py b/near-rt-ric-simulator/src/STD_2.0.0/main.py
index 3057169..c16b81e 100644
--- a/near-rt-ric-simulator/src/STD_2.0.0/main.py
+++ b/near-rt-ric-simulator/src/STD_2.0.0/main.py
@@ -17,7 +17,6 @@
#
import connexion
-import uvicorn
import json
import sys
import os
@@ -254,6 +253,7 @@
if isinstance(sys.argv[1], int):
port_number = sys.argv[1]
+app.add_api('ORAN_A1-p_V2.0.0_api.yaml')
+
if __name__ == '__main__':
- # Use Uvicorn to run the combined app
- uvicorn.run(app, host="127.0.0.1", port=port_number, log_level="info")
\ No newline at end of file
+ app.run(port=port_number, host="127.0.0.1")
\ No newline at end of file
diff --git a/near-rt-ric-simulator/src/STD_2.0.0/var_declaration.py b/near-rt-ric-simulator/src/STD_2.0.0/var_declaration.py
index ed93f34..390d3f4 100644
--- a/near-rt-ric-simulator/src/STD_2.0.0/var_declaration.py
+++ b/near-rt-ric-simulator/src/STD_2.0.0/var_declaration.py
@@ -15,18 +15,10 @@
# ============LICENSE_END=================================================
#
+import connexion
from maincommon import apipath
-from flask import Flask
-from connexion import FlaskApp
-flask_app = Flask(__name__)
-
-# Main app
-app = FlaskApp(__name__, specification_dir=apipath)
-app.add_api('ORAN_A1-p_V2.0.0_api.yaml')
-
-# Combine Connexion app with Flask app
-app.app = flask_app
+app = connexion.App(__name__, specification_dir=apipath)
policy_types={}
policy_instances = {}
diff --git a/tox.ini b/tox.ini
index ffbcb1b..18306b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,8 @@
pytest
coverage
pytest-cov
- connexion
+ connexion==2.14.2
+ Flask==2.2.5
setenv =
TESTS_BASE_PATH = {toxinidir}/near-rt-ric-simulator/tests