Add subscription and notification for resource changes; fix a bug while pserver node...

[pti/o2.git] / tests / integration / test_ocloud_view.py

diff --git a/tests/integration/test_ocloud_view.py b/tests/integration/test_ocloud_view.py
index 2fb7d73..510bf40 100644 (file)
--- a/tests/integration/test_ocloud_view.py
+++ b/tests/integration/test_ocloud_view.py
@@ -17,7 +17,7 @@ import pytest
 
 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: