Refactor watchers

[pti/o2.git] / o2ims / service / watcher / pserver_watcher.py

diff --git a/o2ims/service/watcher/pserver_watcher.py b/o2ims/service/watcher/pserver_watcher.py
index 4e2f330..c4ac72c 100644 (file)
--- a/o2ims/service/watcher/pserver_watcher.py
+++ b/o2ims/service/watcher/pserver_watcher.py
@@ -13,8 +13,10 @@
 #  limitations under the License.\r
 \r
 from o2ims.service.client.base_client import BaseClient\r
-from o2ims.service.unit_of_work import AbstractUnitOfWork\r
+# from o2ims.service.unit_of_work import AbstractUnitOfWork\r
 from o2ims.service.watcher.resource_watcher import ResourceWatcher\r
+from o2ims.domain import commands\r
+from o2ims.service.messagebus import MessageBus\r
 \r
 from o2common.helper import o2logging\r
 logger = o2logging.get_logger(__name__)\r
@@ -22,8 +24,8 @@ logger = o2logging.get_logger(__name__)
 \r
 class PServerWatcher(ResourceWatcher):\r
     def __init__(self, client: BaseClient,\r
-                 uow: AbstractUnitOfWork) -> None:\r
-        super().__init__(client, uow)\r
+                 bus: MessageBus) -> None:\r
+        super().__init__(client, bus)\r
 \r
     def _targetname(self):\r
         return "pserver"\r
@@ -31,6 +33,7 @@ class PServerWatcher(ResourceWatcher):
     def _probe(self, parent: object = None):\r
         resourcepoolid = parent.id if parent else None\r
         newmodels = self._client.list(resourcepoolid=resourcepoolid)\r
-        for newmodel in newmodels:\r
-            super()._compare_and_update(newmodel)\r
-        return newmodels\r
+        # for newmodel in newmodels:\r
+        #     super()._compare_and_update(newmodel)\r
+        # return newmodels\r
+        return [commands.UpdatePserverCpu(m) for m in newmodels]\r