X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fbase.py;h=45967de6dee0d562c88e97a662b310984a63b5ab;hb=refs%2Fchanges%2F56%2F7056%2F1;hp=26c67daa295c1ccb969ce72ddc0a7969d5fc1261;hpb=bff814cb30e501eb1e54aecb8110a78d41e7bdb0;p=pti%2Fo2.git

diff --git a/o2ims/service/watcher/base.py b/o2ims/service/watcher/base.py
index 26c67da..45967de 100644
--- a/o2ims/service/watcher/base.py
+++ b/o2ims/service/watcher/base.py
@@ -14,78 +14,72 @@
 
 from o2ims.service.client.base_client import BaseClient
 from o2ims.domain.stx_object import StxGenericModel
-from o2ims.adapter.ocloud_repository import OcloudRepository
+from o2ims.service.unit_of_work import AbstractUnitOfWork
 
-
-class InvalidOcloudState(Exception):
-    pass
+import logging
+logger = logging.getLogger(__name__)
 
 
 class BaseWatcher(object):
-    def __init__(self, client: BaseClient) -> None:
+    def __init__(self, client: BaseClient,
+                 uow: AbstractUnitOfWork) -> None:
         super().__init__()
         self._client = client
+        self._uow = uow
 
     def targetname(self) -> str:
         return self._targetname()
 
-    def probe(self):
-        self._probe()
+    def probe(self, parent: object = None):
+        return self._probe(parent)
 
-    def _probe(self):
+    def _probe(self, parent: object = None):
         raise NotImplementedError
 
     def _targetname(self):
         raise NotImplementedError
 
-
-class OcloudWather(BaseWatcher):
-    def __init__(self, ocloud_client: BaseClient,
-                 repo: OcloudRepository) -> None:
-        super().__init__(ocloud_client)
-        self._repo = repo
-
-    def _targetname(self):
-        return "ocloud"
-
-    def _probe(self):
-        ocloudmodel = self._client.get(None)
-        if ocloudmodel:
-            self._compare_and_update(ocloudmodel)
-
-    def _compare_and_update(self, ocloudmodel: StxGenericModel) -> bool:
-        # localmodel = self._repo.get(ocloudmodel.id)
-        oclouds = self._repo.list()
-        if len(oclouds) > 1:
-            raise InvalidOcloudState("More than 1 ocloud is found")
-        if len(oclouds) == 0:
-            self._repo.add(ocloudmodel)
-        else:
-            localmodel = oclouds.pop()
-            if localmodel.is_outdated(ocloudmodel):
-                localmodel.update_by(ocloudmodel)
-                self._repo.update(localmodel)
-
-
-class DmsWatcher(BaseWatcher):
-    def __init__(self, client: BaseClient) -> None:
-        super().__init__(client)
-
-    def _targetname(self):
-        return "dms"
-
-
-class ResourcePoolWatcher(BaseWatcher):
-    def __init__(self) -> None:
+    def _compare_and_update(self, newmodel: StxGenericModel) -> bool:
+        with self._uow:
+            # localmodel = self._uow.stxobjects.get(ocloudmodel.id)
+            localmodel = self._uow.stxobjects.get(str(newmodel.id))
+            if not localmodel:
+                logger.info("add entry:" + newmodel.name)
+                self._uow.stxobjects.add(newmodel)
+            elif localmodel.is_outdated(newmodel):
+                logger.info("update entry:" + newmodel.name)
+                localmodel.update_by(newmodel)
+                self._uow.stxobjects.update(localmodel)
+            self._uow.commit()
+
+
+# node to organize watchers in tree hierachy
+class WatcherTree(object):
+    def __init__(self, watcher: BaseWatcher) -> None:
         super().__init__()
-
-    def _targetname(self):
-        return "ocloud"
-
-
-class ResourceWatcher(BaseWatcher):
-    def __init__(self) -> None:
-        super().__init__()
-
-    def _targetname(self):
-        return "resource"
+        self.watcher = watcher
+        self.children = {}
+
+    def addchild(self, watcher: BaseWatcher) -> object:
+        child = WatcherTree(watcher)
+        self.children[watcher.targetname()] = child
+        return child
+
+    def removechild(self, targetname: str) -> object:
+        return self.children.pop(targetname)
+
+    # probe all resources by parent, depth = 0 for indefinite recursive
+    def probe(self, parentresource=None, depth: int = 0):
+        logger.debug("probe resources with watcher: "
+                     + self.watcher.targetname())
+        childdepth = depth - 1 if depth > 0 else 0
+        resources = self.watcher.probe(parentresource)
+        logger.debug("probe returns " + str(len(resources)) + "resources")
+
+        if depth == 1:
+            # stop recursive
+            return
+
+        for res in resources:
+            for node in self.children:
+                node.probe(res, childdepth)