Add subscription and notification for resource changes; fix a bug while pserver node...
[pti/o2.git] / tests / integration / test_ocloud_repository.py
index 75800a3..df91d29 100644 (file)
@@ -17,8 +17,8 @@ import pytest
 
 from o2ims.domain import resource_type as rt
 from o2ims.adapter import ocloud_repository as repository
-from o2ims.domain import ocloud
-from o2ims import config
+from o2ims.domain import ocloud, subscription_obj
+from o2common.config import config
 
 pytestmark = pytest.mark.usefixtures("mappers")
 
@@ -137,7 +137,7 @@ def test_add_resource(sqlite_session_factory):
     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')
     repo.add(resource1)
     assert repo.get(resource_id1) == resource1
 
@@ -158,7 +158,7 @@ def test_add_subscription(sqlite_session_factory):
     session = sqlite_session_factory()
     repo = repository.SubscriptionSqlAlchemyRepository(session)
     subscription_id1 = str(uuid.uuid4())
-    subscription1 = ocloud.Subscription(
+    subscription1 = subscription_obj.Subscription(
         subscription_id1, "https://callback/uri/write/here")
     repo.add(subscription1)
     assert repo.get(subscription_id1) == subscription1