Move registration API to configuration

[pti/o2.git] / o2app / adapter / unit_of_work.py

diff --git a/o2app/adapter/unit_of_work.py b/o2app/adapter/unit_of_work.py
index 6fd4ae2..000d181 100644 (file)
--- a/o2app/adapter/unit_of_work.py
+++ b/o2app/adapter/unit_of_work.py
@@ -51,6 +51,8 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
             .ResourceSqlAlchemyRepository(self.session)\r
         self.subscriptions = ocloud_repository\\r
             .SubscriptionSqlAlchemyRepository(self.session)\r
+        self.configurations = ocloud_repository\\r
+            .ConfigurationSqlAlchemyRepository(self.session)\r
         self.deployment_managers = ocloud_repository\\r
             .DeploymentManagerSqlAlchemyRepository(self.session)\r
         self.nfdeployment_descs = dms_repository\\r
@@ -73,13 +75,14 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
 \r
     def _collect_new_events(self):\r
         for entry in self.oclouds.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            # while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resource_pools.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resources.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resource_types.seen:\r
             while hasattr(entry, 'events') and len(entry.events) > 0:\r
@@ -87,6 +90,12 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
         for entry in self.deployment_managers.seen:\r
             while hasattr(entry, 'events') and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
+        for entry in self.subscriptions.seen:\r
+            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+                yield entry.events.pop(0)\r
+        for entry in self.configurations.seen:\r
+            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+                yield entry.events.pop(0)\r
         for entry in self.nfdeployment_descs.seen:\r
             while hasattr(entry, 'events') and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r