X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Fintegration%2Ftest_ocloud_view.py;h=510bf40e82d29b342941bcc2830611fd39d33c1f;hb=9625c5b766377f641d9641471f10dd491a61447f;hp=e295a94e2c1a5d4b7c293f1da7f567112300108d;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git diff --git a/tests/integration/test_ocloud_view.py b/tests/integration/test_ocloud_view.py index e295a94..510bf40 100644 --- a/tests/integration/test_ocloud_view.py +++ b/tests/integration/test_ocloud_view.py @@ -15,9 +15,9 @@ import uuid import pytest -from o2ims import config +from o2common.config import config from o2ims.views import ocloud_view -from o2ims.domain import ocloud +from o2ims.domain import ocloud, subscription_obj from o2ims.domain import resource_type as rt @@ -132,7 +132,7 @@ def test_view_resources(sqlite_uow): resource_type_id1 = str(uuid.uuid4()) resource_pool_id1 = str(uuid.uuid4()) resource1 = ocloud.Resource( - resource_id1, resource_type_id1, resource_pool_id1) + resource_id1, resource_type_id1, resource_pool_id1, 'resource1') with sqlite_uow as uow: uow.resources.add(resource1) uow.commit() @@ -146,7 +146,7 @@ def test_view_resource_one(sqlite_uow): resource_type_id1 = str(uuid.uuid4()) resource_pool_id1 = str(uuid.uuid4()) resource1 = ocloud.Resource( - resource_id1, resource_type_id1, resource_pool_id1) + resource_id1, resource_type_id1, resource_pool_id1, 'resource1') # Query return None resource_res = ocloud_view.resource_one(resource_id1, sqlite_uow) @@ -200,7 +200,7 @@ def test_view_deployment_manager_one(sqlite_uow): def test_view_subscriptions(sqlite_uow): subscription_id1 = str(uuid.uuid4()) - subscription1 = ocloud.Subscription( + subscription1 = subscription_obj.Subscription( subscription_id1, "https://callback/uri/write/here") with sqlite_uow as uow: uow.subscriptions.add(subscription1) @@ -214,7 +214,7 @@ def test_view_subscriptions(sqlite_uow): def test_view_subscription_one(sqlite_uow): subscription_id1 = str(uuid.uuid4()) - subscription1 = ocloud.Subscription( + subscription1 = subscription_obj.Subscription( subscription_id1, "https://callback/uri/write/here") # Query return None @@ -235,7 +235,7 @@ def test_view_subscription_one(sqlite_uow): def test_view_subscription_delete(sqlite_uow): subscription_id1 = str(uuid.uuid4()) - subscription1 = ocloud.Subscription( + subscription1 = subscription_obj.Subscription( subscription_id1, "https://callback/uri/write/here") with sqlite_uow as uow: