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

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

diff --git a/tests/integration/test_ocloud_repository.py b/tests/integration/test_ocloud_repository.py
index 1adef04..df91d29 100644 (file)
--- a/tests/integration/test_ocloud_repository.py
+++ b/tests/integration/test_ocloud_repository.py
@@ -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")
 
@@ -63,47 +63,47 @@ def test_get_ocloud(sqlite_session_factory):
     assert ocloud2 != ocloud1 and ocloud2.oCloudId == ocloud1.oCloudId
 
 
-def test_add_ocloud_with_dms(sqlite_session_factory):
-    session = sqlite_session_factory()
-    repo = repository.OcloudSqlAlchemyRepository(session)
-    ocloud1 = setup_ocloud()
-    dmsid = str(uuid.uuid4())
-    dms = ocloud.DeploymentManager(
-        dmsid, "k8s1", ocloud1.oCloudId, config.get_api_url()+"/k8s1")
-    ocloud1.addDeploymentManager(dms)
-    repo.add(ocloud1)
-    session.flush()
-    # seperate session to confirm ocloud is updated into repo
-    session2 = sqlite_session_factory()
-    repo2 = repository.OcloudSqlAlchemyRepository(session2)
-    ocloud2 = repo2.get(ocloud1.oCloudId)
-    assert ocloud2 is not None
-    assert ocloud2 != ocloud1 and ocloud2.oCloudId == ocloud1.oCloudId
-    assert len(ocloud2.deploymentManagers) == 1
-
-
-def test_update_ocloud_with_dms(sqlite_session_factory):
-    session = sqlite_session_factory()
-    repo = repository.OcloudSqlAlchemyRepository(session)
-    ocloud1 = setup_ocloud()
-    repo.add(ocloud1)
-    session.flush()
-    dmsid = str(uuid.uuid4())
-    dms = ocloud.DeploymentManager(
-        dmsid, "k8s1", ocloud1.oCloudId, config.get_api_url()+"/k8s1")
-    ocloud1.addDeploymentManager(dms)
-    repo.update(ocloud1)
-    # repo.update(ocloud1.oCloudId, {"deploymentManagers":
-    # ocloud1.deploymentManagers})
-    session.flush()
-
-    # seperate session to confirm ocloud is updated into repo
-    session2 = sqlite_session_factory()
-    repo2 = repository.OcloudSqlAlchemyRepository(session2)
-    ocloud2 = repo2.get(ocloud1.oCloudId)
-    assert ocloud2 is not None
-    assert ocloud2 != ocloud1 and ocloud2.oCloudId == ocloud1.oCloudId
-    assert len(ocloud2.deploymentManagers) == 1
+# def test_add_ocloud_with_dms(sqlite_session_factory):
+#     session = sqlite_session_factory()
+#     repo = repository.OcloudSqlAlchemyRepository(session)
+#     ocloud1 = setup_ocloud()
+#     dmsid = str(uuid.uuid4())
+#     dms = ocloud.DeploymentManager(
+#         dmsid, "k8s1", ocloud1.oCloudId, config.get_api_url()+"/k8s1")
+#     ocloud1.addDeploymentManager(dms)
+#     repo.add(ocloud1)
+#     session.flush()
+#     # seperate session to confirm ocloud is updated into repo
+#     session2 = sqlite_session_factory()
+#     repo2 = repository.OcloudSqlAlchemyRepository(session2)
+#     ocloud2 = repo2.get(ocloud1.oCloudId)
+#     assert ocloud2 is not None
+#     assert ocloud2 != ocloud1 and ocloud2.oCloudId == ocloud1.oCloudId
+#     assert len(ocloud2.deploymentManagers) == 1
+
+
+# def test_update_ocloud_with_dms(sqlite_session_factory):
+#     session = sqlite_session_factory()
+#     repo = repository.OcloudSqlAlchemyRepository(session)
+#     ocloud1 = setup_ocloud()
+#     repo.add(ocloud1)
+#     session.flush()
+#     dmsid = str(uuid.uuid4())
+#     dms = ocloud.DeploymentManager(
+#         dmsid, "k8s1", ocloud1.oCloudId, config.get_api_url()+"/k8s1")
+#     ocloud1.addDeploymentManager(dms)
+#     repo.update(ocloud1)
+#     # repo.update(ocloud1.oCloudId, {"deploymentManagers":
+#     # ocloud1.deploymentManagers})
+#     session.flush()
+
+#     # seperate session to confirm ocloud is updated into repo
+#     session2 = sqlite_session_factory()
+#     repo2 = repository.OcloudSqlAlchemyRepository(session2)
+#     ocloud2 = repo2.get(ocloud1.oCloudId)
+#     assert ocloud2 is not None
+#     assert ocloud2 != ocloud1 and ocloud2.oCloudId == ocloud1.oCloudId
+#     assert len(ocloud2.deploymentManagers) == 1
 
 
 def test_add_resource_type(sqlite_session_factory):
@@ -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