X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fadapter%2Funit_of_work.py;h=000d181f404e80ef7bf2905029b8818315d9c5ff;hb=6c304dfab28ffd1bbe69b9ada3d11e8fbbde014b;hp=2a8663d703600f828c3eeec11399b3fa8a2bb7c5;hpb=84867b76a65efc4e9add52c86eae7e451c4a038d;p=pti%2Fo2.git

diff --git a/o2app/adapter/unit_of_work.py b/o2app/adapter/unit_of_work.py
index 2a8663d..000d181 100644
--- a/o2app/adapter/unit_of_work.py
+++ b/o2app/adapter/unit_of_work.py
@@ -24,6 +24,9 @@ from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2ims.adapter import ocloud_repository
 from o2dms.adapter import dms_repository
 
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
+
 DEFAULT_SESSION_FACTORY = sessionmaker(
     bind=create_engine(
         config.get_postgres_uri(),
@@ -48,10 +51,16 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
             .ResourceSqlAlchemyRepository(self.session)
         self.subscriptions = ocloud_repository\
             .SubscriptionSqlAlchemyRepository(self.session)
+        self.configurations = ocloud_repository\
+            .ConfigurationSqlAlchemyRepository(self.session)
         self.deployment_managers = ocloud_repository\
             .DeploymentManagerSqlAlchemyRepository(self.session)
         self.nfdeployment_descs = dms_repository\
             .NfDeploymentDescSqlAlchemyRepository(self.session)
+        self.nfdeployments = dms_repository\
+            .NfDeploymentSqlAlchemyRepository(self.session)
+        self.ocloudvresources = dms_repository\
+            .NfOCloudVResourceSqlAlchemyRepository(self.session)
         return super().__enter__()
 
     def __exit__(self, *args):
@@ -66,20 +75,33 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
 
     def _collect_new_events(self):
         for entry in self.oclouds.seen:
-            while entry.events:
+            # while hasattr(entry, 'events') and len(entry.events) > 0:
+            while entry.events is not None and len(entry.events) > 0:
                 yield entry.events.pop(0)
         for entry in self.resource_pools.seen:
-            while entry.events:
+            while entry.events is not None and len(entry.events) > 0:
                 yield entry.events.pop(0)
         for entry in self.resources.seen:
-            while entry.events:
+            while entry.events is not None and len(entry.events) > 0:
                 yield entry.events.pop(0)
         for entry in self.resource_types.seen:
-            while entry.events:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
                 yield entry.events.pop(0)
         for entry in self.deployment_managers.seen:
-            while entry.events:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
+                yield entry.events.pop(0)
+        for entry in self.subscriptions.seen:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
+                yield entry.events.pop(0)
+        for entry in self.configurations.seen:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
                 yield entry.events.pop(0)
         for entry in self.nfdeployment_descs.seen:
-            while entry.events:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
+                yield entry.events.pop(0)
+        for entry in self.nfdeployments.seen:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
+                yield entry.events.pop(0)
+        for entry in self.ocloudvresources.seen:
+            while hasattr(entry, 'events') and len(entry.events) > 0:
                 yield entry.events.pop(0)