X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fconftest.py;h=60f3d2e9cbb93f6ecb79ca77fcd12bccfca5bbdc;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=1ab714d3fb4e707dba0bbcc911bceae1df0a2122;hpb=38646c684a13536146ecf16a35e6e33d614b29e9;p=pti%2Fo2.git

diff --git a/tests/conftest.py b/tests/conftest.py
index 1ab714d..60f3d2e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,17 +8,21 @@ import pytest
 import redis
 import requests
 from flask import Flask
+from flask_restx import Api
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, clear_mappers
 from tenacity import retry, stop_after_delay
 from unittest.mock import MagicMock
 
-from o2ims import config
+from o2common.config import config
+
 from o2ims.adapter.orm import metadata, start_o2ims_mappers
-from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers
-from o2ims.adapter import unit_of_work
-from o2ims.views.ocloud_route import configure_routes
-from o2ims.bootstrap import bootstrap
+# from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers
+
+from o2app.adapter import unit_of_work
+from o2ims.views.ocloud_route import configure_namespace
+
+from o2app.bootstrap import bootstrap
 
 
 @pytest.fixture
@@ -33,8 +37,9 @@ def mock_flask_uow(mock_uow):
     session, uow = mock_uow
     app = Flask(__name__)
     # app.config["TESTING"] = True
+    api = Api(app)
     bus = bootstrap(False, uow)
-    configure_routes(app, bus)
+    configure_namespace(api, bus)
     client = app.test_client()
     return session, client
 
@@ -70,15 +75,16 @@ def sqlite_uow(sqlite_session_factory):
 def sqlite_flask_uow(sqlite_uow):
     app = Flask(__name__)
     # app.config["TESTING"] = True
+    api = Api(app)
     bus = bootstrap(False, sqlite_uow)
-    configure_routes(app, bus)
+    configure_namespace(api, bus)
     yield app.test_client()
 
 
 @pytest.fixture
 def mappers():
     start_o2ims_mappers()
-    start_o2ims_stx_mappers()
+    # start_o2ims_stx_mappers()
     yield
     clear_mappers()
 
@@ -128,8 +134,9 @@ def postgres_uow(postgres_session_factory):
 @pytest.fixture
 def postgres_flask_uow(postgres_uow):
     app = Flask(__name__)
+    api = Api(app)
     bus = bootstrap(False, postgres_uow)
-    configure_routes(app, bus)
+    configure_namespace(api, bus)
     yield app.test_client()